Upgrade Kubernetes from 1.19.14 to 1.21.2
This upgrades Kubernetes version in airshipctl to v1.21.2 Depends on https://review.opendev.org/c/airship/image-builder/+/812013/ https: //github.com/airshipit/airshipctl/issues/589 Change-Id: I30ef2543d91f574e73a555bf67ab7ec2764a4411 Signed-off-by: diwakar thyagaraj <dt241s@att.com>
This commit is contained in:
parent
9f4d0efe9a
commit
a384b4e46d
4
Makefile
4
Makefile
@ -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
|
||||||
|
@ -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:
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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"
|
||||||
|
@ -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"
|
||||||
|
@ -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
|
||||||
|
@ -31,7 +31,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"
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user