chore(deps,e2e,dev): bump CAPI to v1.11.0 and Go to 1.24

bryan-cox · bryan-cox · commit 6b0bab24ed7f · 2025-08-26T06:34:07.000-04:00
- build: set CAPI_VERSION to v1.11.0 in versions.mk
- e2e: update Cluster API controller image tags to v1.11.0
- dev: bump Go to 1.24 in devbox.json and .golangci-kal.yml

No functional code changes; updates tooling, test configs, and versions.
diff --git a/.golangci-kal.yml b/.golangci-kal.yml
@@ -2,7 +2,7 @@ version: "2"
 
 run:
   timeout: 10m
-  go: "1.22"
+  go: "1.24"
   allow-parallel-runners: true
 
 linters:
diff --git a/devbox.json b/devbox.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.7/.schema/devbox.schema.json",
   "packages": [
-    "go@1.22",
+    "go@1.24",
     "kind@latest",
     "docker@latest",
     "jq@latest",
diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml
@@ -26,11 +26,11 @@ images:
     loadBehavior: tryLoad
   - name: quay.io/jetstack/cert-manager-controller:v1.17.2
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.2
+  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.11.0
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.2
+  - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.11.0
     loadBehavior: tryLoad
-  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.2
+  - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.11.0
     loadBehavior: tryLoad
 
 providers:
@@ -48,12 +48,12 @@ providers:
             new: "imagePullPolicy: IfNotPresent"
           - old: --metrics-bind-addr=127.0.0.1:8080
             new: --metrics-bind-addr=:8080
-      - name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
+      - name: v1.11.0 # latest published release in the v1beta1 series; used for v1beta1 --> main clusterctl upgrades test only.
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "./shared/v1beta1/metadata.yaml"
+          - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -75,12 +75,12 @@ providers:
             new: "imagePullPolicy: IfNotPresent"
           - old: --metrics-bind-addr=127.0.0.1:8080
             new: --metrics-bind-addr=:8080
-      - name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
+      - name: v1.11.0 # latest published release in the v1beta1 series; used for v1beta1 --> main clusterctl upgrades test only.
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "./shared/v1beta1/metadata.yaml"
+          - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -102,12 +102,12 @@ providers:
             new: "imagePullPolicy: IfNotPresent"
           - old: --metrics-bind-addr=127.0.0.1:8080
             new: --metrics-bind-addr=:8080
-      - name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
+      - name: v1.11.0 # latest published release in the v1beta1 series; used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "./shared/v1beta1/metadata.yaml"
+          - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -116,7 +116,7 @@ providers:
   - name: aws
     type: InfrastructureProvider
     versions:
-      - name: v1.5.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta2 clusterctl upgrades test only.
+      - name: v1.5.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 clusterctl upgrades test only.
         value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v1.5.2/infrastructure-components.yaml"
         type: "url"
         contract: v1beta1
@@ -126,12 +126,12 @@ providers:
       - name: "v2.7.1"
         value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v2.7.1/infrastructure-components.yaml"
         type: "url"
-        contract: v1beta2
+        contract: v1beta1
         replacements:
           - old: --metrics-addr=127.0.0.1:8080
             new: --metrics-addr=:8080
         files:
-          - sourcePath: "./shared/v1beta2_provider/v2.7/metadata.yaml"
+          - sourcePath: "./shared/v1beta1_provider/v2.7/metadata.yaml"
           - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-classicelb-upgrade.yaml"
       - name: v9.9.99
         # Use manifest from source files
@@ -165,7 +165,7 @@ providers:
           - sourcePath: "./infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/clusterclass-multi-tenancy.yaml"
           - sourcePath: "./infrastructure-aws/withclusterclass/generated/cluster-template-self-hosted-clusterclass.yaml"
           - sourcePath: "./infrastructure-aws/withclusterclass/generated/cluster-template-external-vpc-clusterclass.yaml"
-          - sourcePath: "./shared/v1beta2_provider/metadata.yaml"
+          - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
           - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-ignition.yaml"
           - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-upgrade-to-external-cloud-provider.yaml"
           - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-dedicated-host.yaml"
diff --git a/test/e2e/data/e2e_eks_conf.yaml b/test/e2e/data/e2e_eks_conf.yaml
@@ -34,8 +34,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v1.10.2
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
+      - name: v1.11.0
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -50,8 +50,8 @@ providers:
     files:
       - sourcePath: "./shared/v1beta1/metadata.yaml"
     versions:
-      - name: v1.10.2
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
+      - name: v1.11.0
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -66,8 +66,8 @@ providers:
     files:
       - sourcePath: "./shared/v1beta1/metadata.yaml"
     versions:
-      - name: v1.10.2
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
+      - name: v1.11.0
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -85,7 +85,7 @@ providers:
         value: ../../../config/default
         contract: v1beta1
         files:
-          - sourcePath: "./shared/v1beta2_provider/metadata.yaml"
+          - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
diff --git a/versions.mk b/versions.mk
@@ -15,7 +15,7 @@
 MDBOOK_VERSION := v0.4.5
 PLANTUML_VERSION := 1.2020.16
 CERT_MANAGER_VERSION := v1.17.2
-CAPI_VERSION := v1.10.2
+CAPI_VERSION := v1.11.0
 KPROMO_VERSION := v4.0.4
 YQ_VERSION := v4.25.2
 GOLANGCI_LINT_VERSION := v2.1.0

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.7/.schema/devbox.schema.json",`
`3`	`3`	`"packages": [`
`4`		`- "go@1.22",`
	`4`	`+ "go@1.24",`
`5`	`5`	`"kind@latest",`
`6`	`6`	`"docker@latest",`
`7`	`7`	`"jq@latest",`