diff --git a/Makefile b/Makefile index fff083dd0..80c18622f 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml index d56055523..d0b5ce628 100644 --- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml +++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml @@ -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: diff --git a/manifests/function/airshipctl-schemas/airshipit.org_phaseplans.yaml b/manifests/function/airshipctl-schemas/airshipit.org_phaseplans.yaml index dd73463ff..4596c080b 100644 --- a/manifests/function/airshipctl-schemas/airshipit.org_phaseplans.yaml +++ b/manifests/function/airshipctl-schemas/airshipit.org_phaseplans.yaml @@ -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 diff --git a/manifests/function/airshipctl-schemas/airshipit.org_phases.yaml b/manifests/function/airshipctl-schemas/airshipit.org_phases.yaml index c952cfb39..c509936cc 100644 --- a/manifests/function/airshipctl-schemas/airshipit.org_phases.yaml +++ b/manifests/function/airshipctl-schemas/airshipit.org_phases.yaml @@ -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 diff --git a/manifests/function/ironic-deployment/v0.5.0/ironic_qcow_image_patch.yaml b/manifests/function/ironic-deployment/v0.5.0/ironic_qcow_image_patch.yaml index b4178cb52..9c31df8e4 100644 --- a/manifests/function/ironic-deployment/v0.5.0/ironic_qcow_image_patch.yaml +++ b/manifests/function/ironic-deployment/v0.5.0/ironic_qcow_image_patch.yaml @@ -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" diff --git a/manifests/function/k8scontrol-capd/controlplane.yaml b/manifests/function/k8scontrol-capd/controlplane.yaml index 479536691..11bd5b411 100644 --- a/manifests/function/k8scontrol-capd/controlplane.yaml +++ b/manifests/function/k8scontrol-capd/controlplane.yaml @@ -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" diff --git a/manifests/function/k8scontrol/controlplane.yaml b/manifests/function/k8scontrol/controlplane.yaml index 6352f53bf..71e43c1a5 100644 --- a/manifests/function/k8scontrol/controlplane.yaml +++ b/manifests/function/k8scontrol/controlplane.yaml @@ -4,7 +4,7 @@ metadata: name: cluster-controlplane spec: replicas: 1 - version: v1.19.14 + version: v1.21.2 machineTemplate: infrastructureRef: kind: Metal3MachineTemplate diff --git a/manifests/function/workers-capd/workers.yaml b/manifests/function/workers-capd/workers.yaml index 33f4f03b6..a3aa5b069 100644 --- a/manifests/function/workers-capd/workers.yaml +++ b/manifests/function/workers-capd/workers.yaml @@ -31,7 +31,7 @@ spec: template: spec: clusterName: "target-cluster" - version: "v1.18.6" + version: "v1.21.2" bootstrap: configRef: name: "target-cluster-md-0" diff --git a/manifests/function/workers-capm3/machinedeployment.yaml b/manifests/function/workers-capm3/machinedeployment.yaml index 194b333d7..15dbfe58d 100644 --- a/manifests/function/workers-capm3/machinedeployment.yaml +++ b/manifests/function/workers-capm3/machinedeployment.yaml @@ -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 diff --git a/manifests/function/workers-capz/v0.4.8/workers.yaml b/manifests/function/workers-capz/v0.4.8/workers.yaml index 11aa8b303..4bc8cba5e 100644 --- a/manifests/function/workers-capz/v0.4.8/workers.yaml +++ b/manifests/function/workers-capz/v0.4.8/workers.yaml @@ -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 diff --git a/tools/deployment/01_install_kubectl.sh b/tools/deployment/01_install_kubectl.sh index 65159d705..9e2c18237 100755 --- a/tools/deployment/01_install_kubectl.sh +++ b/tools/deployment/01_install_kubectl.sh @@ -14,7 +14,7 @@ set -xe -: ${KUBE_VERSION:="v1.19.1"} +: ${KUBE_VERSION:="v1.21.2"} # Install kubectl URL="https://storage.googleapis.com"