From a3ec45569678684de176aa05415ba62f2677a737 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 14 May 2024 16:55:02 -0600 Subject: [PATCH 1/2] Bump CAPI to v1.7.2 --- Makefile | 2 +- Tiltfile | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- test/e2e/config/azure-dev.yaml | 34 +++++++++++++++++----------------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index fd9a7d2b2d6..31af882ce6c 100644 --- a/Makefile +++ b/Makefile @@ -300,7 +300,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create ./hack/create-custom-cloud-provider-config.sh # Deploy CAPI - timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done" + timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done" # Deploy CAAPH timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.1.0-alpha.10/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done" diff --git a/Tiltfile b/Tiltfile index bf85531a7cb..bbb6db7cef8 100644 --- a/Tiltfile +++ b/Tiltfile @@ -20,7 +20,7 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capz", - "capi_version": "v1.7.1", + "capi_version": "v1.7.2", "caaph_version": "v0.2.1", "cert_manager_version": "v1.14.4", "kubernetes_version": "v1.28.3", diff --git a/go.mod b/go.mod index bc67eed9133..707a3b6d837 100644 --- a/go.mod +++ b/go.mod @@ -52,8 +52,8 @@ require ( k8s.io/kubectl v0.29.3 k8s.io/utils v0.0.0-20240102154912-e7106e64919e sigs.k8s.io/cloud-provider-azure v1.29.3 - sigs.k8s.io/cluster-api v1.7.1 - sigs.k8s.io/cluster-api/test v1.7.1 + sigs.k8s.io/cluster-api v1.7.2 + sigs.k8s.io/cluster-api/test v1.7.2 sigs.k8s.io/controller-runtime v0.17.3 sigs.k8s.io/kind v0.22.0 ) @@ -216,7 +216,7 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.1 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.2 // kube-openapi should match the version imported by CAPI. replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 diff --git a/go.sum b/go.sum index e06a7785668..f1d18b98bf2 100644 --- a/go.sum +++ b/go.sum @@ -722,10 +722,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2 h1:9Zp+uWnxdUOoy/FaQK1DjPfL sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2/go.mod h1:JKWYkoOyET3wsN0Kk9WxA+zpopkuCy+v4+mrnJ60Yyk= sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1 h1:Lp0nALZmvMJoiVeVV6XjnZv1uClfArnThhuDAjaqE5A= sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1/go.mod h1:pPkJPx/eMVWP3R+LhPoOYGoY7lywcMJev5L2uSfH+Jo= -sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY= -sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= -sigs.k8s.io/cluster-api/test v1.7.1 h1:QDru2586ZjIFBTW1Z7VVXVtauzR/yANm4tglUNLm9iE= -sigs.k8s.io/cluster-api/test v1.7.1/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM= +sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE= +sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= +sigs.k8s.io/cluster-api/test v1.7.2 h1:muacGu5G/DGz2uTv3CUxml2QLi8fxbIra4CxA2S31KE= +sigs.k8s.io/cluster-api/test v1.7.2/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM= sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk= sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index d7ddc432351..bcef1e3ba69 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -3,11 +3,11 @@ managementClusterName: capz-e2e images: - name: ${MANAGER_IMAGE} loadBehavior: mustLoad - - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.1 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.2 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.1 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.2 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.2 loadBehavior: tryLoad - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.1.1-alpha.1 loadBehavior: tryLoad @@ -16,8 +16,8 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.6.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/core-components.yaml" + - name: v1.6.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.5/core-components.yaml" type: "url" contract: v1beta1 replacements: @@ -25,8 +25,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.7.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/core-components.yaml + - name: v1.7.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/core-components.yaml type: url contract: v1beta1 files: @@ -39,8 +39,8 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/bootstrap-components.yaml" + - name: v1.6.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.5/bootstrap-components.yaml" type: "url" contract: v1beta1 replacements: @@ -48,8 +48,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.7.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/bootstrap-components.yaml + - name: v1.7.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/bootstrap-components.yaml type: url contract: v1beta1 files: @@ -61,8 +61,8 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/control-plane-components.yaml" + - name: v1.6.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.5/control-plane-components.yaml" type: "url" contract: v1beta1 replacements: @@ -70,8 +70,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.7.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/control-plane-components.yaml + - name: v1.7.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/control-plane-components.yaml type: url contract: v1beta1 files: @@ -226,8 +226,8 @@ variables: SECURITY_SCAN_FAIL_THRESHOLD: "${SECURITY_SCAN_FAIL_THRESHOLD:-100}" SECURITY_SCAN_CONTAINER: "${SECURITY_SCAN_CONTAINER:-quay.io/armosec/kubescape:v2.0.167}" AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml" - OLD_CAPI_UPGRADE_VERSION: "v1.6.4" - LATEST_CAPI_UPGRADE_VERSION: "v1.7.1" + OLD_CAPI_UPGRADE_VERSION: "v1.6.5" + LATEST_CAPI_UPGRADE_VERSION: "v1.7.2" OLD_PROVIDER_UPGRADE_VERSION: "v1.14.4" LATEST_PROVIDER_UPGRADE_VERSION: "v1.15.0" OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10" From fe0067704c8923c19997c3e744c05400779db2fe Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 14 May 2024 16:57:25 -0600 Subject: [PATCH 2/2] Bump cert-manager to v1.14.5 --- Tiltfile | 2 +- hack/install-cert-manager.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tiltfile b/Tiltfile index bbb6db7cef8..0ce5d1d0fd3 100644 --- a/Tiltfile +++ b/Tiltfile @@ -22,7 +22,7 @@ settings = { "kind_cluster_name": "capz", "capi_version": "v1.7.2", "caaph_version": "v0.2.1", - "cert_manager_version": "v1.14.4", + "cert_manager_version": "v1.14.5", "kubernetes_version": "v1.28.3", "aks_kubernetes_version": "v1.28.3", "flatcar_version": "3374.2.1", diff --git a/hack/install-cert-manager.sh b/hack/install-cert-manager.sh index 9fe66f7b9f7..ceebc26db1f 100755 --- a/hack/install-cert-manager.sh +++ b/hack/install-cert-manager.sh @@ -54,7 +54,7 @@ source "${REPO_ROOT}/hack/common-vars.sh" make --directory="${REPO_ROOT}" "${KUBECTL##*/}" ## Install cert manager and wait for availability -"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.14.4/cert-manager.yaml +"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.14.5/cert-manager.yaml "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook