airship
/
airshipctl
Code Issues Proposed changes

Merge "Upgrade Kubernetes from 1.19.14 to 1.21.2"

This commit is contained in:
Zuul 2021-11-01 18:24:06 +00:00 committed by Gerrit Code Review
parent 5050c327c0 a384b4e46d
commit b20403332b
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,7 +18,7 @@ else
GOBIN = $(shell go env GOBIN 2> /dev/null)
endif
# Produce CRDs that work back to Kubernetes 1.16
# Produce CRDs that work back to Kubernetes 1.21.2
CRD_OPTIONS ?= crd:crdVersions=v1
TOOLBINDIR := tools/bin
@ -83,7 +83,7 @@ DOCS_DIR ?= docs
# document validation options
UNAME != uname
export KIND_URL ?= https://kind.sigs.k8s.io/dl/v0.8.1/kind-$(UNAME)-amd64
KUBECTL_VERSION ?= v1.18.6
KUBECTL_VERSION ?= v1.21.2
export KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
.PHONY: depend

6
manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
View File

@ -81,7 +81,7 @@ spec:
init_images:
image: quay.io/airshipit/ipa-wallaby:latest
qcow_bundle:
image: quay.io/airshipit/qcow-bundle:k8s-1.19-latest-ubuntu_focal
image: quay.io/airshipit/qcow-bundle:k8s-1.21-latest-ubuntu_focal
dnsmasq:
image: quay.io/metal3-io/ironic:capm3-v0.5.0
mariadb:
@ -152,9 +152,9 @@ spec:
image_builder:
image_builder:
image_builder:
image: quay.io/airshipit/image-builder:k8s-1.19-latest-ubuntu_focal
image: quay.io/airshipit/image-builder:k8s-1.21-latest-ubuntu_focal
kubernetes: v1.19.14
kubernetes: v1.21.2
image_repositories:
cni:

2
manifests/function/airshipctl-schemas/airshipit.org_phaseplans.yaml
View File

@ -67,7 +67,7 @@ spec:
type: array
kubernetesVersion:
description: KubernetesVersion is the version of Kubernetes to validate
against (default "1.18.6").
against (default "1.21.2").
type: string
schemaLocation:
description: SchemaLocation is the base URL from which to search for

2
manifests/function/airshipctl-schemas/airshipit.org_phases.yaml
View File

@ -94,7 +94,7 @@ spec:
type: array
kubernetesVersion:
description: KubernetesVersion is the version of Kubernetes to
validate against (default "1.18.6").
validate against (default "1.21.2").
type: string
schemaLocation:
description: SchemaLocation is the base URL from which to search

2
manifests/function/ironic-deployment/v0.5.0/ironic_qcow_image_patch.yaml
View File

@ -21,7 +21,7 @@ spec:
- sh
- -c
- "cp /qcows/*.qcow2 /qcows/*.qcow2.md5sum /shared/html/images/"
image: "quay.io/airshipit/qcow-bundle:k8s-1.19-latest-ubuntu_focal"
image: "quay.io/airshipit/qcow-bundle:k8s-1.21-latest-ubuntu_focal"
imagePullPolicy: Always
volumeMounts:
- mountPath: "/shared"

2
manifests/function/k8scontrol-capd/controlplane.yaml
View File

@ -36,4 +36,4 @@ spec:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs: {eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'}
version: "v1.18.6"
version: "v1.21.2"

2
manifests/function/k8scontrol/controlplane.yaml
View File

@ -4,7 +4,7 @@ metadata:
name: cluster-controlplane
spec:
replicas: 1
version: v1.19.14
version: v1.21.2
machineTemplate:
infrastructureRef:
kind: Metal3MachineTemplate

2
manifests/function/workers-capd/workers.yaml
View File

@ -32,7 +32,7 @@ spec:
template:
spec:
clusterName: "target-cluster"
version: "v1.18.6"
version: "v1.21.2"
bootstrap:
configRef:
name: "target-cluster-md-0"

2
manifests/function/workers-capm3/machinedeployment.yaml
View File

@ -16,7 +16,7 @@ spec:
cluster.x-k8s.io/cluster-name: target-cluster
spec:
clusterName: target-cluster
version: v1.19.14
version: v1.21.2
bootstrap:
configRef:
name: worker-1

2
manifests/function/workers-capz/v0.4.8/workers.yaml
View File

@ -20,7 +20,7 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AzureMachineTemplate
name: target-cluster-md-0
version: v1.18.6
version: v1.21.2
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AzureMachineTemplate

2
tools/deployment/01_install_kubectl.sh
View File

@ -14,7 +14,7 @@
set -xe
: ${KUBE_VERSION:="v1.19.1"}
: ${KUBE_VERSION:="v1.21.2"}
# Install kubectl
URL="https://storage.googleapis.com"