Merge pull request #6140 from mboersma/bump-capi-v1.11.6

[release-1.22] Bump CAPI to v1.11.6

Author: k8s-ci-robot

Makefile

@@ -358,7 +358,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.11.5/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.11.6/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.5.2/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

Tiltfile

@@ -22,7 +22,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v1.11.5",
+    "capi_version": "v1.11.6",
     "caaph_version": "v0.5.2",
     "cert_manager_version": "v1.19.1",
     "kubernetes_version": "v1.33.6",

docs/book/src/developers/getting-started-with-capi-operator.md

@@ -120,7 +120,7 @@ helm install cert-manager jetstack/cert-manager --namespace cert-manager --creat
 Create a `values.yaml` file for the CAPI Operator Helm chart like so:
 
 ```yaml
-core: "cluster-api:v1.11.5"
+core: "cluster-api:v1.11.6"
 infrastructure: "azure:v1.17.2"
 addon: "helm:v0.5.2"
 manager:

go.mod

@@ -63,8 +63,8 @@ require (
 	k8s.io/kubectl v0.33.6
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
 	sigs.k8s.io/cloud-provider-azure v1.33.6
-	sigs.k8s.io/cluster-api v1.11.5
-	sigs.k8s.io/cluster-api/test v1.11.5
+	sigs.k8s.io/cluster-api v1.11.6
+	sigs.k8s.io/cluster-api/test v1.11.6
 	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/kind v0.31.0
 )

go.sum

@@ -157,8 +157,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
 github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
-github.com/coredns/corefile-migration v1.0.29 h1:g4cPYMXXDDs9uLE2gFYrJaPBuUAR07eEMGyh9JBE13w=
-github.com/coredns/corefile-migration v1.0.29/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
+github.com/coredns/corefile-migration v1.0.30 h1:ljZNPGgna+4yKv81gfkvkgLEWdtz0NjBR1glaiPI140=
+github.com/coredns/corefile-migration v1.0.30/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -621,10 +621,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.9.1 h1:9N7Pdu3zOyO0W1iE44MYK9Bt
 sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.9.1/go.mod h1:93tr4zarMRObuc6/KEspD+22ZTg7JOC7IDq0IJwhpv4=
 sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.8.2 h1:rxDNMKj2Y1XVMMaAw4vl1IKZHiHTkYqJnXvF4HroSrI=
 sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.8.2/go.mod h1:WFyNunzycMEJll1O4dZVe0u0lqV5Ls/hqiJ4x5QWjpU=
-sigs.k8s.io/cluster-api v1.11.5 h1:mKQAfB8+6l2uxtEvQ6Z5EIcTObdPNs3TL4DcJScchGo=
-sigs.k8s.io/cluster-api v1.11.5/go.mod h1:n0d6BAo8s9+KRap8Wv/IllfmwnSN5XFTWNJuq2gKNlg=
-sigs.k8s.io/cluster-api/test v1.11.5 h1:sL/CqxD5vRMVrwkmoi2ewNfdJq5BFHDE8Pv+7zfdjMA=
-sigs.k8s.io/cluster-api/test v1.11.5/go.mod h1:7Zfdj42bJUrgZC5cuE6Q3zer18XoZLfH+8Sv3Yf7kO0=
+sigs.k8s.io/cluster-api v1.11.6 h1:cgv4Sbnqi7e5dvx/umTCZRbs/CbSR/56Yyw53aBOgas=
+sigs.k8s.io/cluster-api v1.11.6/go.mod h1:VFf1SDS31iriWmhRvjt66e/NSOzip9pbWdZtQJRl44g=
+sigs.k8s.io/cluster-api/test v1.11.6 h1:2dY/vI6L6ZugTsEPV/pnwsIg2SR72v7wDo3NC+pQbRg=
+sigs.k8s.io/cluster-api/test v1.11.6/go.mod h1:7Zfdj42bJUrgZC5cuE6Q3zer18XoZLfH+8Sv3Yf7kO0=
 sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
 sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

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.11.5
+  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.11.6
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.11.5
+  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.11.6
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.11.5
+  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.11.6
     loadBehavior: tryLoad
   - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.5.2
     loadBehavior: tryLoad
@@ -25,8 +25,8 @@ providers:
           new: --metrics-addr=:8080
       files:
         - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-    - name: v1.11.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.5/core-components.yaml
+    - name: v1.11.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.6/core-components.yaml
       type: url
       contract: v1beta2
       files:
@@ -47,8 +47,8 @@ providers:
           new: --metrics-addr=:8080
       files:
         - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-    - name: v1.11.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.5/bootstrap-components.yaml
+    - name: v1.11.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.6/bootstrap-components.yaml
       type: url
       contract: v1beta2
       files:
@@ -69,8 +69,8 @@ providers:
           new: --metrics-addr=:8080
       files:
         - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-    - name: v1.11.5
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.5/control-plane-components.yaml
+    - name: v1.11.6
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.6/control-plane-components.yaml
       type: url
       contract: v1beta2
       files:
@@ -82,32 +82,32 @@ providers:
   - name: azure
     type: InfrastructureProvider
     versions:
-    - name: v1.20.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
-      value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.20.4/infrastructure-components.yaml
+    - name: v1.20.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
+      value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.20.5/infrastructure-components.yaml
       type: url
       contract: v1beta1
       files:
       - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
-      - sourcePath: "../data/infrastructure-azure/v1.20.4/cluster-template-prow.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.20.5/cluster-template-prow.yaml"
         targetName: "cluster-template.yaml"
-      - sourcePath: "../data/infrastructure-azure/v1.20.4/cluster-template-prow-machine-and-machine-pool.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.20.5/cluster-template-prow-machine-and-machine-pool.yaml"
         targetName: "cluster-template-machine-and-machine-pool.yaml"
-      - sourcePath: "../data/infrastructure-azure/v1.20.4/cluster-template-aks.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.20.5/cluster-template-aks.yaml"
         targetName: "cluster-template-aks.yaml"
       replacements:
       - old: "imagePullPolicy: Always"
         new: "imagePullPolicy: IfNotPresent"
-    - name: v1.21.1 # latest patch of latest minor in supported v1beta1 releases; this is used for v1beta1 latest --> v1beta1 current clusterctl upgrades test only.
-      value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.21.1/infrastructure-components.yaml
+    - name: v1.21.2 # latest patch of latest minor in supported v1beta1 releases; this is used for v1beta1 latest --> v1beta1 current clusterctl upgrades test only.
+      value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.21.2/infrastructure-components.yaml
       type: url
       contract: v1beta1
       files:
       - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
-      - sourcePath: "../data/infrastructure-azure/v1.21.1/cluster-template-prow.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.21.2/cluster-template-prow.yaml"
         targetName: "cluster-template.yaml"
-      - sourcePath: "../data/infrastructure-azure/v1.21.1/cluster-template-prow-machine-and-machine-pool.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.21.2/cluster-template-prow-machine-and-machine-pool.yaml"
         targetName: "cluster-template-machine-and-machine-pool.yaml"
-      - sourcePath: "../data/infrastructure-azure/v1.21.1/cluster-template-aks.yaml"
+      - sourcePath: "../data/infrastructure-azure/v1.21.2/cluster-template-aks.yaml"
         targetName: "cluster-template-aks.yaml"
       replacements:
       - old: "imagePullPolicy: Always"
@@ -253,9 +253,9 @@ variables:
   WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
   AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
   OLD_CAPI_UPGRADE_VERSION: "v1.10.9"
-  LATEST_CAPI_UPGRADE_VERSION: "v1.11.5"
-  OLD_PROVIDER_UPGRADE_VERSION: "v1.20.4"
-  LATEST_PROVIDER_UPGRADE_VERSION: "v1.21.1"
+  LATEST_CAPI_UPGRADE_VERSION: "v1.11.6"
+  OLD_PROVIDER_UPGRADE_VERSION: "v1.20.5"
+  LATEST_PROVIDER_UPGRADE_VERSION: "v1.21.2"
   OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"
   LATEST_CAAPH_UPGRADE_VERSION: "v0.5.2"
   CI_RG: "${CI_RG:-capz-ci}"