Merge pull request #5442 from mboersma/bump-capi-one-eight-ten-revisited

[release-1.17] Bump CAPI to v1.8.10 in dev and test code

Merging despite test `pull-cluster-api-provider-azure-test-v1beta1` failing. Reference comment: #5442 (comment)

Author: nawazkh

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.8.8/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.8.10/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.2.5/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

Tiltfile

@@ -20,7 +20,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v1.8.8",
+    "capi_version": "v1.8.10",
     "caaph_version": "v0.2.5",
     "cert_manager_version": "v1.16.1",
     "kubernetes_version": "v1.28.3",

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.8.8
+  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.10
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.8
+  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.10
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.8
+  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.10
     loadBehavior: tryLoad
   - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.2.5
     loadBehavior: tryLoad
@@ -25,8 +25,8 @@ providers:
           new: --metrics-addr=:8080
       files:
         - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-    - name: v1.8.8
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/core-components.yaml
+    - name: v1.8.10
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.10/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.8.8
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/bootstrap-components.yaml
+    - name: v1.8.10
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.10/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.8.8
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/control-plane-components.yaml
+    - name: v1.8.10
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.10/control-plane-components.yaml
       type: url
       contract: v1beta1
       files:
@@ -228,7 +228,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.7.9"
-  LATEST_CAPI_UPGRADE_VERSION: "v1.8.8"
+  LATEST_CAPI_UPGRADE_VERSION: "v1.8.10"
   OLD_PROVIDER_UPGRADE_VERSION: "v1.15.3"
   LATEST_PROVIDER_UPGRADE_VERSION: "v1.16.1"
   OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"