airship/airshipctl
Code Issues Proposed changes

Merge "Upgrade Kubernetes from 1.19.14 to 1.21.2"

Browse Source
This commit is contained in:
Zuul 2021-11-01 18:24:06 +00:00 committed by Gerrit Code Review
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) GOBIN = $(shell go env GOBIN 2> /dev/null)
endif 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 CRD_OPTIONS ?= crd:crdVersions=v1
TOOLBINDIR := tools/bin TOOLBINDIR := tools/bin
@ -83,7 +83,7 @@ DOCS_DIR ?= docs
# document validation options # document validation options
UNAME != uname UNAME != uname
export KIND_URL ?= https://kind.sigs.k8s.io/dl/v0.8.1/kind-$(UNAME)-amd64 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 export KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
.PHONY: depend .PHONY: depend

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

@ -81,7 +81,7 @@ spec:
init_images: init_images:
image: quay.io/airshipit/ipa-wallaby:latest image: quay.io/airshipit/ipa-wallaby:latest
qcow_bundle: 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: dnsmasq:
image: quay.io/metal3-io/ironic:capm3-v0.5.0 image: quay.io/metal3-io/ironic:capm3-v0.5.0
mariadb: mariadb:
@ -152,9 +152,9 @@ spec:
image_builder: image_builder:
image_builder: 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: image_repositories:
cni: cni:

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

@ -67,7 +67,7 @@ spec:
type: array type: array
kubernetesVersion: kubernetesVersion:
description: KubernetesVersion is the version of Kubernetes to validate description: KubernetesVersion is the version of Kubernetes to validate
against (default "1.18.6"). against (default "1.21.2").
type: string type: string
schemaLocation: schemaLocation:
description: SchemaLocation is the base URL from which to search for 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 type: array
kubernetesVersion: kubernetesVersion:
description: KubernetesVersion is the version of Kubernetes to description: KubernetesVersion is the version of Kubernetes to
validate against (default "1.18.6"). validate against (default "1.21.2").
type: string type: string
schemaLocation: schemaLocation:
description: SchemaLocation is the base URL from which to search 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 - sh
- -c - -c
- "cp /qcows/*.qcow2 /qcows/*.qcow2.md5sum /shared/html/images/" - "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 imagePullPolicy: Always
volumeMounts: volumeMounts:
- mountPath: "/shared" - mountPath: "/shared"

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

@ -36,4 +36,4 @@ spec:
nodeRegistration: nodeRegistration:
criSocket: /var/run/containerd/containerd.sock criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs: {eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'} 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 name: cluster-controlplane
spec: spec:
replicas: 1 replicas: 1
version: v1.19.14 version: v1.21.2
machineTemplate: machineTemplate:
infrastructureRef: infrastructureRef:
kind: Metal3MachineTemplate kind: Metal3MachineTemplate

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

@ -32,7 +32,7 @@ spec:
template: template:
spec: spec:
clusterName: "target-cluster" clusterName: "target-cluster"
version: "v1.18.6" version: "v1.21.2"
bootstrap: bootstrap:
configRef: configRef:
name: "target-cluster-md-0" 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 cluster.x-k8s.io/cluster-name: target-cluster
spec: spec:
clusterName: target-cluster clusterName: target-cluster
version: v1.19.14 version: v1.21.2
bootstrap: bootstrap:
configRef: configRef:
name: worker-1 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 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AzureMachineTemplate kind: AzureMachineTemplate
name: target-cluster-md-0 name: target-cluster-md-0
version: v1.18.6 version: v1.21.2
--- ---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AzureMachineTemplate kind: AzureMachineTemplate

2
tools/deployment/01_install_kubectl.sh
View File

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