Update to v1.5.0-rc.1

kubernetes-sigs · Jul 19, 2023 · 8f788cc · 8f788cc
1 parent e6eabb2
commit 8f788cc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -301,7 +301,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.0-rc.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
+	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/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
@@ -19,7 +19,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v1.5.0-rc.0",
+    "capi_version": "v1.5.0-rc.1",
     "cert_manager_version": "v1.12.2",
     "kubernetes_version": "v1.27.2",
     "aks_kubernetes_version": "v1.26.3",

diff --git a/go.mod b/go.mod
@@ -46,8 +46,8 @@ require (
 	k8s.io/kubectl v0.27.2
 	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
 	sigs.k8s.io/cloud-provider-azure v1.26.7
-	sigs.k8s.io/cluster-api v1.5.0-rc.0
-	sigs.k8s.io/cluster-api/test v1.5.0-rc.0
+	sigs.k8s.io/cluster-api v1.5.0-rc.1
+	sigs.k8s.io/cluster-api/test v1.5.0-rc.1
 	sigs.k8s.io/controller-runtime v0.15.0
 	sigs.k8s.io/kind v0.20.0
 )
@@ -228,4 +228,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0-rc.0
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0-rc.1
diff --git a/go.sum b/go.sum
@@ -1313,10 +1313,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.5.0-rc.0 h1:401QD3wyprHTz8KXQwjq3Qci5OdmmCOH/t7bGt62kWo=
-sigs.k8s.io/cluster-api v1.5.0-rc.0/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
-sigs.k8s.io/cluster-api/test v1.5.0-rc.0 h1:t10iz0eO1OkDdtqMJYhifp87m0CahP5aPz0vDNHzScY=
-sigs.k8s.io/cluster-api/test v1.5.0-rc.0/go.mod h1:jcB/RQqtF8Od75DKWEoVVxWv9/n6wKuTQO63ILJJTQg=
+sigs.k8s.io/cluster-api v1.5.0-rc.1 h1:pLaRjFlknMWMKzippA+Dm2HXmONubAicSujFhsO2pzo=
+sigs.k8s.io/cluster-api v1.5.0-rc.1/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
+sigs.k8s.io/cluster-api/test v1.5.0-rc.1 h1:jFqe7FH0z9dbuHUADHKLrDlc8TLeLFFCETlNOhSU4Q0=
+sigs.k8s.io/cluster-api/test v1.5.0-rc.1/go.mod h1:jcB/RQqtF8Od75DKWEoVVxWv9/n6wKuTQO63ILJJTQg=
 sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
 sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
 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
@@ -3,11 +3,11 @@ managementClusterName: capz-e2e
 images:
   - name: ${MANAGER_IMAGE}
     loadBehavior: mustLoad
-  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-rc.0
+  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-rc.1
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-rc.0
+  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-rc.1
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-rc.0
+  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-rc.1
     loadBehavior: tryLoad
 
 providers:
@@ -23,8 +23,8 @@ providers:
           new: --metrics-addr=:8080
       files:
         - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-    - name: v1.5.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.0/core-components.yaml
+    - name: v1.5.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/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.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.0/bootstrap-components.yaml
+    - name: v1.5.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/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.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.0/control-plane-components.yaml
+    - name: v1.5.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/control-plane-components.yaml
       type: url
       contract: v1beta1
       files:
@@ -183,7 +183,7 @@ variables:
   WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
   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" 
+  AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
 
 intervals:
   default/wait-controllers: ["3m", "10s"]