From 0d87db9247dc9a42f4c91ca026a15481d093119a Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 11 Mar 2022 09:17:45 +0100 Subject: [PATCH 1/2] update CAPI to release v1.0.5 Signed-off-by: cpanato --- Makefile | 2 +- Tiltfile | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- test/e2e/config/gcp-ci.yaml | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index fe24e7e91..f9dbe729b 100644 --- a/Makefile +++ b/Makefile @@ -389,7 +389,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook # Deploy CAPI - curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.4/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f - + curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f - # Deploy CAPG kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi diff --git a/Tiltfile b/Tiltfile index f3838dd24..6519a75f5 100644 --- a/Tiltfile +++ b/Tiltfile @@ -16,7 +16,7 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capg", - "capi_version": "v1.0.4", + "capi_version": "v1.0.5", "cert_manager_version": "v1.1.0", "kubernetes_version": "v1.21.4", } diff --git a/go.mod b/go.mod index 0f3461932..38fda3f20 100644 --- a/go.mod +++ b/go.mod @@ -18,9 +18,9 @@ require ( k8s.io/component-base v0.22.2 k8s.io/klog/v2 v2.10.0 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 - sigs.k8s.io/cluster-api v1.0.4 - sigs.k8s.io/cluster-api/test v1.0.4 + sigs.k8s.io/cluster-api v1.0.5 + sigs.k8s.io/cluster-api/test v1.0.5 sigs.k8s.io/controller-runtime v0.10.3 ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.4 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.5 diff --git a/go.sum b/go.sum index fc49084b7..05b42df63 100644 --- a/go.sum +++ b/go.sum @@ -1524,10 +1524,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/cluster-api v1.0.4 h1:3vMvQjEmkSQayN9r0DXlfn8uWHzqNT+HPBveVryJ1Dc= -sigs.k8s.io/cluster-api v1.0.4/go.mod h1:/LkJXtsvhxTV4U0z1Y2Y1Gr2xebJ0/ce09Ab2M0XU/U= -sigs.k8s.io/cluster-api/test v1.0.4 h1:aHLxi6vGx60VFgvfg8dk6jz45645pm4VbMf2qjB8CP8= -sigs.k8s.io/cluster-api/test v1.0.4/go.mod h1:IaRugWZKwnbN7o6fFeBuBffOo4EwPqVMBNfC8QRWlj4= +sigs.k8s.io/cluster-api v1.0.5 h1:MnUxDc6N/K8wPHIAJa+2GnCsWVkUQPqjf05a+TtTs3Y= +sigs.k8s.io/cluster-api v1.0.5/go.mod h1:/LkJXtsvhxTV4U0z1Y2Y1Gr2xebJ0/ce09Ab2M0XU/U= +sigs.k8s.io/cluster-api/test v1.0.5 h1:Y+eJTNUG5kdNwM2IVyF2+GehHO0ETfxhD6fqScpED/0= +sigs.k8s.io/cluster-api/test v1.0.5/go.mod h1:IaRugWZKwnbN7o6fFeBuBffOo4EwPqVMBNfC8QRWlj4= sigs.k8s.io/controller-runtime v0.10.3 h1:s5Ttmw/B4AuIbwrXD3sfBkXwnPMMWrqpVj4WRt1dano= sigs.k8s.io/controller-runtime v0.10.3/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= sigs.k8s.io/kind v0.11.1 h1:pVzOkhUwMBrCB0Q/WllQDO3v14Y+o2V0tFgjTqIUjwA= diff --git a/test/e2e/config/gcp-ci.yaml b/test/e2e/config/gcp-ci.yaml index 01532f59a..6429743df 100644 --- a/test/e2e/config/gcp-ci.yaml +++ b/test/e2e/config/gcp-ci.yaml @@ -15,8 +15,8 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.0.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.4/core-components.yaml + - name: v1.0.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/core-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -28,8 +28,8 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.0.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.4/bootstrap-components.yaml + - name: v1.0.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/bootstrap-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" @@ -41,8 +41,8 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.0.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.4/control-plane-components.yaml + - name: v1.0.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/control-plane-components.yaml type: url files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" From ee434d1da6cf6cfe86a0ed84c305fd85511d46ab Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 11 Mar 2022 09:18:10 +0100 Subject: [PATCH 2/2] 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}"