From ee434d1da6cf6cfe86a0ed84c305fd85511d46ab Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 11 Mar 2022 09:18:10 +0100 Subject: [PATCH] update k8s version to v1.22.6 Signed-off-by: cpanato --- Tiltfile | 2 +- scripts/ci-conformance.sh | 2 +- scripts/ci-e2e.sh | 4 ++-- test/e2e/config/gcp-ci.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tiltfile b/Tiltfile index 6519a75f5..159de22fd 100644 --- a/Tiltfile +++ b/Tiltfile @@ -18,7 +18,7 @@ settings = { "kind_cluster_name": "capg", "capi_version": "v1.0.5", "cert_manager_version": "v1.1.0", - "kubernetes_version": "v1.21.4", + "kubernetes_version": "v1.22.6", } keys = ["GCP_B64ENCODED_CREDENTIALS"] diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh index 3c63afb84..655ac6d5e 100755 --- a/scripts/ci-conformance.sh +++ b/scripts/ci-conformance.sh @@ -46,7 +46,7 @@ export GCP_NETWORK_NAME=${GCP_NETWORK_NAME:-"${TEST_NAME}-mynetwork"} export GCP_B64ENCODED_CREDENTIALS=$(base64 -w0 "$GOOGLE_APPLICATION_CREDENTIALS") export KUBERNETES_MAJOR_VERSION="1" export KUBERNETES_MINOR_VERSION="22" -export KUBERNETES_PATCH_VERSION="3" +export KUBERNETES_PATCH_VERSION="6" export KUBERNETES_VERSION="v${KUBERNETES_MAJOR_VERSION}.${KUBERNETES_MINOR_VERSION}.${KUBERNETES_PATCH_VERSION}" # using prebuilt image from image-builder project the image is built everyday and the job is available here https://prow.k8s.io/?job=periodic-image-builder-gcp-all-nightly export IMAGE_ID="projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-1804-${KUBERNETES_VERSION//[.+]/-}-nightly" diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index 37a907577..78dd589eb 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -45,8 +45,8 @@ export TEST_NAME=${CLUSTER_NAME:-"capg-${RANDOM}"} export GCP_NETWORK_NAME=${GCP_NETWORK_NAME:-"${TEST_NAME}-mynetwork"} export GCP_B64ENCODED_CREDENTIALS=$(base64 -w0 "$GOOGLE_APPLICATION_CREDENTIALS") export KUBERNETES_MAJOR_VERSION="1" -export KUBERNETES_MINOR_VERSION="20" -export KUBERNETES_PATCH_VERSION="9" +export KUBERNETES_MINOR_VERSION="22" +export KUBERNETES_PATCH_VERSION="6" export KUBERNETES_VERSION="v${KUBERNETES_MAJOR_VERSION}.${KUBERNETES_MINOR_VERSION}.${KUBERNETES_PATCH_VERSION}" # using prebuilt image from image-builder project the image is built everyday and the job is available here https://prow.k8s.io/?job=periodic-image-builder-gcp-all-nightly export IMAGE_ID="projects/k8s-staging-cluster-api-gcp/global/images/cluster-api-ubuntu-1804-${KUBERNETES_VERSION//[.+]/-}-nightly" diff --git a/test/e2e/config/gcp-ci.yaml b/test/e2e/config/gcp-ci.yaml index 6429743df..5f80748d2 100644 --- a/test/e2e/config/gcp-ci.yaml +++ b/test/e2e/config/gcp-ci.yaml @@ -65,13 +65,13 @@ providers: targetName: "cluster-template-conformance-ci-artifacts.yaml" variables: - KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.20.9}" + KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.22.6}" EXP_CLUSTER_RESOURCE_SET: "true" # Cluster Addons CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml" GCP_CONTROL_PLANE_MACHINE_TYPE: n1-standard-2 GCP_NODE_MACHINE_TYPE: n1-standard-2 - CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.22.3" + CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.22.6" CONFORMANCE_WORKER_MACHINE_COUNT: "5" CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1" CONFORMANCE_NODES: "${CONFORMANCE_NODES:-4}"