From 457588cb188938103153359db4fcbecbb65aa640 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 26 Sep 2023 16:14:41 -0600 Subject: [PATCH] Update CAPI to v1.4.7 --- Makefile | 2 +- Tiltfile | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++---- hack/install-cert-manager.sh | 2 +- test/e2e/config/azure-dev.yaml | 18 +++++++++--------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 87734cc67f0..f59c5bfc2d4 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create ./hack/create-custom-cloud-provider-config.sh # Deploy CAPI - curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f - + curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f - # Deploy CAPZ $(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME) diff --git a/Tiltfile b/Tiltfile index b8640111d2e..035694e1d48 100644 --- a/Tiltfile +++ b/Tiltfile @@ -19,8 +19,8 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capz", - "capi_version": "v1.4.6", - "cert_manager_version": "v1.12.3", + "capi_version": "v1.4.7", + "cert_manager_version": "v1.13.0", "kubernetes_version": "v1.27.2", "aks_kubernetes_version": "v1.26.3", "flatcar_version": "3374.2.1", diff --git a/go.mod b/go.mod index f45da5acf68..ade80417ed7 100644 --- a/go.mod +++ b/go.mod @@ -44,8 +44,8 @@ require ( k8s.io/kubectl v0.26.1 k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 sigs.k8s.io/cloud-provider-azure v1.26.7 - sigs.k8s.io/cluster-api v1.4.6 - sigs.k8s.io/cluster-api/test v1.4.6 + sigs.k8s.io/cluster-api v1.4.7 + sigs.k8s.io/cluster-api/test v1.4.7 sigs.k8s.io/controller-runtime v0.14.5 sigs.k8s.io/kind v0.20.0 ) @@ -197,4 +197,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.6 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.7 diff --git a/go.sum b/go.sum index 2026131e2e8..ef34d7e5440 100644 --- a/go.sum +++ b/go.sum @@ -1074,10 +1074,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/cloud-provider-azure v1.26.7 h1:LSVRPyxeTQZPOF7z42zNZGzL1S1N5tg28RBZVy7gea4= sigs.k8s.io/cloud-provider-azure v1.26.7/go.mod h1:UIwr0Bk4wQb77wNL9cdT4zZw6DP2AtOQ9EKRt9c5g7Q= -sigs.k8s.io/cluster-api v1.4.6 h1:ZOAtQsPW7zh2iY7RdvvUozPR7OYRDCPSFEBS0979Vys= -sigs.k8s.io/cluster-api v1.4.6/go.mod h1:B+QIe/B4Yp+NqMSd6f36Oh+7pIgalsClAX976rIn9J0= -sigs.k8s.io/cluster-api/test v1.4.6 h1:a+sVWioQfir1Bw7fQJbd162RFjgiWX2078Yh3fEm4qw= -sigs.k8s.io/cluster-api/test v1.4.6/go.mod h1:SBKZ9SR50acvjQyE/d+tVB88jky7mbVDZ4UURdEkNjk= +sigs.k8s.io/cluster-api v1.4.7 h1:24UFXLDy6eiL37wquWSofKJAmFP691PLKBIA9VSUX2A= +sigs.k8s.io/cluster-api v1.4.7/go.mod h1:B+QIe/B4Yp+NqMSd6f36Oh+7pIgalsClAX976rIn9J0= +sigs.k8s.io/cluster-api/test v1.4.7 h1:/RsOGIa17S0Fox3DpgbCvKxMEHLNGjuo6/wF0k6lsqM= +sigs.k8s.io/cluster-api/test v1.4.7/go.mod h1:SBKZ9SR50acvjQyE/d+tVB88jky7mbVDZ4UURdEkNjk= sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s= sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= diff --git a/hack/install-cert-manager.sh b/hack/install-cert-manager.sh index ba64b8eb6a8..1a1a6b64df1 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.12.3/cert-manager.yaml +"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.0/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 174234abb12..218dc346e81 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.4.6 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.7 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.6 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.7 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.6 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.7 loadBehavior: tryLoad providers: @@ -23,8 +23,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.4.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/core-components.yaml + - name: v1.4.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/core-components.yaml type: url contract: v1beta1 files: @@ -46,8 +46,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.4.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/bootstrap-components.yaml + - name: v1.4.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/bootstrap-components.yaml type: url contract: v1beta1 files: @@ -68,8 +68,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.4.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/control-plane-components.yaml + - name: v1.4.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/control-plane-components.yaml type: url contract: v1beta1 files: