From 30592f61cc6c9e1bbb3652a685c7148279e02561 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 11 Nov 2024 11:45:46 -0700 Subject: [PATCH] Bump CAPI to v1.7.8 --- Makefile | 2 +- Tiltfile | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++---- hack/install-cert-manager.sh | 2 +- test/e2e/config/azure-dev.yaml | 20 ++++++++++---------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 349620751d4..cbd8073838d 100644 --- a/Makefile +++ b/Makefile @@ -312,7 +312,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.7/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.8/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 c8f70c455ee..fe97685bf9a 100644 --- a/Tiltfile +++ b/Tiltfile @@ -20,9 +20,9 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capz", - "capi_version": "v1.7.7", + "capi_version": "v1.7.8", "caaph_version": "v0.2.1", - "cert_manager_version": "v1.16.0", + "cert_manager_version": "v1.16.1", "kubernetes_version": "v1.28.3", "aks_kubernetes_version": "v1.28.3", "flatcar_version": "3374.2.1", diff --git a/go.mod b/go.mod index d9dac32a87b..dd06099510c 100644 --- a/go.mod +++ b/go.mod @@ -54,8 +54,8 @@ require ( k8s.io/kubectl v0.29.3 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 sigs.k8s.io/cloud-provider-azure v1.29.3 - sigs.k8s.io/cluster-api v1.7.7 - sigs.k8s.io/cluster-api/test v1.7.7 + sigs.k8s.io/cluster-api v1.7.8 + sigs.k8s.io/cluster-api/test v1.7.8 sigs.k8s.io/controller-runtime v0.18.4 sigs.k8s.io/kind v0.23.0 ) @@ -217,7 +217,7 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.7 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.8 // 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 69a5442aa35..94cdacaa283 100644 --- a/go.sum +++ b/go.sum @@ -718,10 +718,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.7 h1:c+vNNg4qGD2lrVru8kjOeDKhjeYFacFdYg3rPrg9epc= -sigs.k8s.io/cluster-api v1.7.7/go.mod h1:wmlCVPoxbFcHeZzp4Vgphi7I8nSXAgY3cqJFeaF2QLM= -sigs.k8s.io/cluster-api/test v1.7.7 h1:0tq//ww0KlLXyICa+sbYyEBFeAsDtpifG1Z/ry9XJu4= -sigs.k8s.io/cluster-api/test v1.7.7/go.mod h1:ckOdUw20CBIuoUxohDAYtC5Ko9UVHN5vdgXCQJbZ4XE= +sigs.k8s.io/cluster-api v1.7.8 h1:7gN7kWQVAv2l+UMJdDdK0K3s8FTmNTaTsaoblj3r24Y= +sigs.k8s.io/cluster-api v1.7.8/go.mod h1:wmlCVPoxbFcHeZzp4Vgphi7I8nSXAgY3cqJFeaF2QLM= +sigs.k8s.io/cluster-api/test v1.7.8 h1:PgGpPyK4Vs7/ZpOMNvuwcX5QP9KXQ4LeRmMKGSaf1/E= +sigs.k8s.io/cluster-api/test v1.7.8/go.mod h1:ckOdUw20CBIuoUxohDAYtC5Ko9UVHN5vdgXCQJbZ4XE= 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/hack/install-cert-manager.sh b/hack/install-cert-manager.sh index 91321942487..ddc3f441f5f 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.16.0/cert-manager.yaml +"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.16.1/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 diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index 328899085a4..66534e68673 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.7 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.8 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.7 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.8 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.7 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.8 loadBehavior: tryLoad - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.1.1-alpha.1 loadBehavior: tryLoad @@ -25,8 +25,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.7.7 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.7/core-components.yaml + - name: v1.7.8 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.8/core-components.yaml type: url contract: v1beta1 files: @@ -48,8 +48,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.7.7 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.7/bootstrap-components.yaml + - name: v1.7.8 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.8/bootstrap-components.yaml type: url contract: v1beta1 files: @@ -70,8 +70,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.7.7 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.7/control-plane-components.yaml + - name: v1.7.8 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.8/control-plane-components.yaml type: url contract: v1beta1 files: @@ -224,7 +224,7 @@ variables: 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.8" - LATEST_CAPI_UPGRADE_VERSION: "v1.7.7" + LATEST_CAPI_UPGRADE_VERSION: "v1.7.8" OLD_PROVIDER_UPGRADE_VERSION: "v1.14.5" LATEST_PROVIDER_UPGRADE_VERSION: "v1.15.1" OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"