diff --git a/Makefile b/Makefile index 76037cd4365..73261581a96 100644 --- a/Makefile +++ b/Makefile @@ -305,7 +305,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.5.1/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f - + curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/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 713b8d9af56..fc284c0a656 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.5.1", - "cert_manager_version": "v1.12.3", + "capi_version": "v1.5.2", + "cert_manager_version": "v1.13.0", "kubernetes_version": "v1.28.0", "aks_kubernetes_version": "v1.26.3", "flatcar_version": "3374.2.1", diff --git a/go.mod b/go.mod index 01e7601928f..c1c9bde4ac4 100644 --- a/go.mod +++ b/go.mod @@ -52,8 +52,8 @@ require ( k8s.io/kubectl v0.27.2 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/cloud-provider-azure v1.27.7 - sigs.k8s.io/cluster-api v1.5.1 - sigs.k8s.io/cluster-api/test v1.5.1 + sigs.k8s.io/cluster-api v1.5.2 + sigs.k8s.io/cluster-api/test v1.5.2 sigs.k8s.io/controller-runtime v0.15.1 sigs.k8s.io/kind v0.20.0 ) @@ -206,4 +206,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.1 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2 diff --git a/go.sum b/go.sum index 5501932a372..1a1f048a040 100644 --- a/go.sum +++ b/go.sum @@ -1099,10 +1099,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.27.7 h1:X6DdOA1aUlnBfSffTdq1zGWph7L62VY6ZS1ErwR5bVY= sigs.k8s.io/cloud-provider-azure v1.27.7/go.mod h1:ytwtCpVGJFvIc+n9q6CB14QD+AiiuXnsqz3DkWG7bBI= -sigs.k8s.io/cluster-api v1.5.1 h1:+oO4EbVQcbBJr5wjqmdjvewPHSTbVLigXZqPk3ZO8t0= -sigs.k8s.io/cluster-api v1.5.1/go.mod h1:EGJUNpFWi7dF426tO8MG/jE+w7T0UO5KyMnOwQ5riUY= -sigs.k8s.io/cluster-api/test v1.5.1 h1:kYUfzE6RFsopXek+l/LDnh4gtfjTi2FUghEY8zx0Z9U= -sigs.k8s.io/cluster-api/test v1.5.1/go.mod h1:mFlsY1y0lApBgQyXbmVprdzCK+9MQNp1C38K+aZdn5A= +sigs.k8s.io/cluster-api v1.5.2 h1:pCsyEHwTBb7n+U5Z2OA5STxdJ1EuSpJv8FLBx4lii3s= +sigs.k8s.io/cluster-api v1.5.2/go.mod h1:EGJUNpFWi7dF426tO8MG/jE+w7T0UO5KyMnOwQ5riUY= +sigs.k8s.io/cluster-api/test v1.5.2 h1:Hlorgn4ebGdSxP4IZAT7eMweAowh4n0/vdhc4HAPNF8= +sigs.k8s.io/cluster-api/test v1.5.2/go.mod h1:mFlsY1y0lApBgQyXbmVprdzCK+9MQNp1C38K+aZdn5A= sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c= sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= 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 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 8af6de31a0a..53c217536cb 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.5.1 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.2 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.1 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.2 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.2 loadBehavior: tryLoad providers: @@ -23,8 +23,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.5.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.1/core-components.yaml + - name: v1.5.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/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.5.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.1/bootstrap-components.yaml + - name: v1.5.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/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.5.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.1/control-plane-components.yaml + - name: v1.5.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/control-plane-components.yaml type: url contract: v1beta1 files: