Skip to content

Commit 1677d99

Browse files
bryan-coxbryan-cox
committed
chore(deps,e2e,dev): bump CAPI to v1.11.0 and Go to 1.24
- build: set CAPI_VERSION to v1.11.0 in versions.mk - e2e: update provider URLs/contracts to v1.11.0/v1beta2 in e2e_conf.yaml and e2e_eks_conf.yaml - e2e: update Cluster API controller image tags to v1.11.0; adjust metadata path to shared/v1beta2_provider - dev: bump Go to 1.24 in devbox.json and .golangci-kal.yml No functional code changes; updates tooling, test configs, and versions.
1 parent 0cad8e5 commit 1677d99

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎.golangci-kal.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
run:
44
timeout: 10m
5-
go: "1.22"
5+
go: "1.24"
66
allow-parallel-runners: true
77

88
linters:

‎devbox.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.7/.schema/devbox.schema.json",
33
"packages": [
4-
"go@1.22",
4+
"go@1.24",
55
"kind@latest",
66
"docker@latest",
77
"jq@latest",

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ images:
1919

2020
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
2121

22-
# Cluster API v1beta1 Preloads
22+
# Cluster API v1beta2 Preloads
2323
- name: quay.io/jetstack/cert-manager-cainjector:v1.17.2
2424
loadBehavior: tryLoad
2525
- name: quay.io/jetstack/cert-manager-webhook:v1.17.2
2626
loadBehavior: tryLoad
2727
- name: quay.io/jetstack/cert-manager-controller:v1.17.2
2828
loadBehavior: tryLoad
29-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.2
29+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.11.0
3030
loadBehavior: tryLoad
31-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.2
31+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.11.0
3232
loadBehavior: tryLoad
33-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.2
33+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.11.0
3434
loadBehavior: tryLoad
3535

3636
providers:
@@ -48,12 +48,12 @@ providers:
4848
new: "imagePullPolicy: IfNotPresent"
4949
- old: --metrics-bind-addr=127.0.0.1:8080
5050
new: --metrics-bind-addr=:8080
51-
- name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
51+
- name: v1.11.0 # latest published release in the v1beta2 series; used for v1beta2 --> main clusterctl upgrades test only.
52+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/core-components.yaml"
5353
type: "url"
54-
contract: v1beta1
54+
contract: v1beta2
5555
files:
56-
- sourcePath: "./shared/v1beta1/metadata.yaml"
56+
- sourcePath: "./shared/v1beta2_provider/metadata.yaml"
5757
replacements:
5858
- old: "imagePullPolicy: Always"
5959
new: "imagePullPolicy: IfNotPresent"
@@ -75,12 +75,12 @@ providers:
7575
new: "imagePullPolicy: IfNotPresent"
7676
- old: --metrics-bind-addr=127.0.0.1:8080
7777
new: --metrics-bind-addr=:8080
78-
- name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
78+
- name: v1.11.0 # latest published release in the v1beta2 series; used for v1beta2 --> main clusterctl upgrades test only.
79+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/bootstrap-components.yaml"
8080
type: "url"
81-
contract: v1beta1
81+
contract: v1beta2
8282
files:
83-
- sourcePath: "./shared/v1beta1/metadata.yaml"
83+
- sourcePath: "./shared/v1beta2_provider/metadata.yaml"
8484
replacements:
8585
- old: "imagePullPolicy: Always"
8686
new: "imagePullPolicy: IfNotPresent"
@@ -102,12 +102,12 @@ providers:
102102
new: "imagePullPolicy: IfNotPresent"
103103
- old: --metrics-bind-addr=127.0.0.1:8080
104104
new: --metrics-bind-addr=:8080
105-
- name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
105+
- name: v1.11.0 # latest published release in the v1beta2 series; used for v1beta2 --> v1beta2 latest clusterctl upgrades test only.
106+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/control-plane-components.yaml"
107107
type: "url"
108-
contract: v1beta1
108+
contract: v1beta2
109109
files:
110-
- sourcePath: "./shared/v1beta1/metadata.yaml"
110+
- sourcePath: "./shared/v1beta2_provider/metadata.yaml"
111111
replacements:
112112
- old: "imagePullPolicy: Always"
113113
new: "imagePullPolicy: IfNotPresent"

‎test/e2e/data/e2e_eks_conf.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.10.2
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
37+
- name: v1.11.0
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/core-components.yaml"
3939
type: "url"
40-
contract: v1beta1
40+
contract: v1beta2
4141
files:
4242
- sourcePath: "./shared/v1beta1/metadata.yaml"
4343
replacements:
@@ -50,10 +50,10 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.10.2
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
53+
- name: v1.11.0
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/bootstrap-components.yaml"
5555
type: "url"
56-
contract: v1beta1
56+
contract: v1beta2
5757
files:
5858
- sourcePath: "./shared/v1beta1/metadata.yaml"
5959
replacements:
@@ -66,10 +66,10 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.10.2
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
69+
- name: v1.11.0
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/control-plane-components.yaml"
7171
type: "url"
72-
contract: v1beta1
72+
contract: v1beta2
7373
files:
7474
- sourcePath: "./shared/v1beta1/metadata.yaml"
7575
replacements:

‎versions.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
1717
CERT_MANAGER_VERSION := v1.17.2
18-
CAPI_VERSION := v1.10.2
18+
CAPI_VERSION := v1.11.0
1919
KPROMO_VERSION := v4.0.4
2020
YQ_VERSION := v4.25.2
2121
GOLANGCI_LINT_VERSION := v2.1.0

0 commit comments

Comments
 (0)