Skip to content

Commit 0374e70

Browse files
committed
Bump to v1.11.0
1 parent 606f76b commit 0374e70

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
358358
./hack/create-custom-cloud-provider-config.sh
359359

360360
# Deploy CAPI
361-
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.1/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
361+
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
362362

363363
# Deploy CAAPH
364364
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.3.2/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ settings = {
2222
"deploy_cert_manager": True,
2323
"preload_images_for_kind": True,
2424
"kind_cluster_name": "capz",
25-
"capi_version": "v1.11.0-rc.1",
25+
"capi_version": "v1.11.0",
2626
"caaph_version": "v0.3.2",
2727
"cert_manager_version": "v1.18.1",
2828
"kubernetes_version": "v1.32.2",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ helm install cert-manager jetstack/cert-manager --namespace cert-manager --creat
120120
Create a `values.yaml` file for the CAPI Operator Helm chart like so:
121121

122122
```yaml
123-
core: "cluster-api:v1.11.0-rc.1"
123+
core: "cluster-api:v1.11.0"
124124
infrastructure: "azure:v1.17.2"
125125
addon: "helm:v0.3.2"
126126
manager:

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ require (
5858
k8s.io/kubectl v0.32.3
5959
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
6060
sigs.k8s.io/cloud-provider-azure v1.32.3
61-
sigs.k8s.io/cluster-api v1.11.0-rc.1
62-
sigs.k8s.io/cluster-api/test v1.11.0-rc.1
61+
sigs.k8s.io/cluster-api v1.11.0
62+
sigs.k8s.io/cluster-api/test v1.11.0
6363
sigs.k8s.io/controller-runtime v0.21.0
6464
sigs.k8s.io/kind v0.29.0
6565
)

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
180180
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
181181
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
182182
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
183-
github.com/coredns/corefile-migration v1.0.26 h1:xiiEkVB1Dwolb24pkeDUDBfygV9/XsOSq79yFCrhptY=
184-
github.com/coredns/corefile-migration v1.0.26/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
183+
github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM=
184+
github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
185185
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
186186
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
187187
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -685,10 +685,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9 h1:+ngbNuuzAIy4mIA09/ALZxx0
685685
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9/go.mod h1:wlb5KMXferSuS9asjIlqjU7yHnCUEtAGnwjYdDtqdmk=
686686
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 h1:F5qZPS35TGb0ghlLGcHrbwzoO3mFnCBMM4ADGAlY+rI=
687687
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1/go.mod h1:rEQnoF3pmD1kmAFQCwA/SqHiiftLFeMwdQt0gsuKWbM=
688-
sigs.k8s.io/cluster-api v1.11.0-rc.1 h1:99cSK8dAsh3ZAb7H+jRCs2OmB0nMybHMSHIHNJVm8FI=
689-
sigs.k8s.io/cluster-api v1.11.0-rc.1/go.mod h1:HVLZTAcnkzsM8bYvGgh4eC2Wfx/WzFerPvtCGfmggiw=
690-
sigs.k8s.io/cluster-api/test v1.11.0-rc.1 h1:DqYqYi6inHzcFlQbN/6o4Lov9y/ntwMV7/AtF7sGfYs=
691-
sigs.k8s.io/cluster-api/test v1.11.0-rc.1/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
688+
sigs.k8s.io/cluster-api v1.11.0 h1:4ZqKxjhdP3F/vvHMd675rGsDrT/siggnFPt5eKQ8nkI=
689+
sigs.k8s.io/cluster-api v1.11.0/go.mod h1:gGmNlHrtJe3z0YV3J6JRy5Rwh9SfzokjQaS+Fv3DBPE=
690+
sigs.k8s.io/cluster-api/test v1.11.0 h1:dvwMAb5rm4Z7Kj3l9FkeYTWfSthpN0oX3gvUrd8ej24=
691+
sigs.k8s.io/cluster-api/test v1.11.0/go.mod h1:2f489Lp5TKPGVhNL6V3huq8fp6eb23APlY2cLbhuDBU=
692692
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
693693
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
694694
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

test/e2e/config/azure-dev.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ managementClusterName: capz-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.11.0-rc.1
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.11.0
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.11.0-rc.1
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.11.0
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.11.0-rc.1
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.11.0
1111
loadBehavior: tryLoad
1212
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.3.2
1313
loadBehavior: tryLoad
@@ -16,17 +16,17 @@ providers:
1616
- name: cluster-api
1717
type: CoreProvider
1818
versions:
19-
- name: v1.9.10 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
20-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.10/core-components.yaml"
19+
- name: v1.10.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
20+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/core-components.yaml"
2121
type: "url"
2222
contract: v1beta1
2323
replacements:
2424
- old: --metrics-addr=127.0.0.1:8080
2525
new: --metrics-addr=:8080
2626
files:
2727
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
28-
- name: v1.11.0-rc.1
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.1/core-components.yaml
28+
- name: v1.11.0
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/core-components.yaml
3030
type: url
3131
contract: v1beta1
3232
files:
@@ -39,17 +39,17 @@ providers:
3939
- name: kubeadm
4040
type: BootstrapProvider
4141
versions:
42-
- name: v1.9.10 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
43-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.10/bootstrap-components.yaml"
42+
- name: v1.10.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
43+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/bootstrap-components.yaml"
4444
type: "url"
4545
contract: v1beta1
4646
replacements:
4747
- old: --metrics-addr=127.0.0.1:8080
4848
new: --metrics-addr=:8080
4949
files:
5050
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
51-
- name: v1.11.0-rc.1
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.1/bootstrap-components.yaml
51+
- name: v1.11.0
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/bootstrap-components.yaml
5353
type: url
5454
contract: v1beta1
5555
files:
@@ -61,17 +61,17 @@ providers:
6161
- name: kubeadm
6262
type: ControlPlaneProvider
6363
versions:
64-
- name: v1.9.10 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
65-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.10/control-plane-components.yaml"
64+
- name: v1.10.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
65+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/control-plane-components.yaml"
6666
type: "url"
6767
contract: v1beta1
6868
replacements:
6969
- old: --metrics-addr=127.0.0.1:8080
7070
new: --metrics-addr=:8080
7171
files:
7272
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
73-
- name: v1.11.0-rc.1
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0-rc.1/control-plane-components.yaml
73+
- name: v1.11.0
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -244,8 +244,8 @@ variables:
244244
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
245245
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
246246
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
247-
OLD_CAPI_UPGRADE_VERSION: "v1.9.10"
248-
LATEST_CAPI_UPGRADE_VERSION: "v1.11.0-rc.1"
247+
OLD_CAPI_UPGRADE_VERSION: "v1.10.5"
248+
LATEST_CAPI_UPGRADE_VERSION: "v1.11.0"
249249
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.6"
250250
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.2"
251251
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)