Skip to content

Commit 5ac65cc

Browse files
tamalsahatamalsaha
committed
Bump CAPI to v1.10.1
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 59fd875 commit 5ac65cc

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

‎Makefile

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

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

338338
# Deploy CAAPH
339339
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

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.9.6",
25+
"capi_version": "v1.10.1",
2626
"caaph_version": "v0.2.5",
2727
"cert_manager_version": "v1.17.2",
2828
"kubernetes_version": "v1.30.2",

‎docs/book/src/getting-started.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.9.6"
123+
core: "cluster-api:v1.10.1"
124124
infrastructure: "azure:v1.17.2"
125125
addon: "helm:v0.2.5"
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.10.0
62-
sigs.k8s.io/cluster-api/test v1.10.0
61+
sigs.k8s.io/cluster-api v1.10.1
62+
sigs.k8s.io/cluster-api/test v1.10.1
6363
sigs.k8s.io/controller-runtime v0.20.4
6464
sigs.k8s.io/kind v0.27.0
6565
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9 h1:+ngbNuuzAIy4mIA09/ALZxx0
690690
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9/go.mod h1:wlb5KMXferSuS9asjIlqjU7yHnCUEtAGnwjYdDtqdmk=
691691
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 h1:F5qZPS35TGb0ghlLGcHrbwzoO3mFnCBMM4ADGAlY+rI=
692692
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1/go.mod h1:rEQnoF3pmD1kmAFQCwA/SqHiiftLFeMwdQt0gsuKWbM=
693-
sigs.k8s.io/cluster-api v1.10.0 h1:Jcmr8aEDI4/MCqNmvjj9YQlW7r4qTUpTnL6T9UUrVuQ=
694-
sigs.k8s.io/cluster-api v1.10.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
695-
sigs.k8s.io/cluster-api/test v1.10.0 h1:UAip3TgR/J+KV7ykJCAVP4C3UHMVoakl4hXd84kwVOI=
696-
sigs.k8s.io/cluster-api/test v1.10.0/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4=
693+
sigs.k8s.io/cluster-api v1.10.1 h1:5vsLNgQ4SkPudJ1USK532B0SIdJxRsCNKt2DZtBf+ww=
694+
sigs.k8s.io/cluster-api v1.10.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg=
695+
sigs.k8s.io/cluster-api/test v1.10.1 h1:cSgbfROhT42+M1YQg6Wj5DQWNjRZtkFQGIDSu6JJjmk=
696+
sigs.k8s.io/cluster-api/test v1.10.1/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4=
697697
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
698698
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
699699
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎hack/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
toolchain go1.23.8
66

7-
require sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250416152108-4eeaa5719065
7+
require sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250429160156-647a1b741bc8
88

99
require (
1010
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -27,7 +27,7 @@ require (
2727
k8s.io/apimachinery v0.32.3 // indirect
2828
k8s.io/klog/v2 v2.130.1 // indirect
2929
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
30-
sigs.k8s.io/controller-tools v0.17.0 // indirect
30+
sigs.k8s.io/controller-tools v0.17.3 // indirect
3131
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
3232
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
3333
sigs.k8s.io/yaml v1.4.0 // indirect

‎hack/tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
106106
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
107107
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
108108
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
109-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250416152108-4eeaa5719065 h1:qWcht2Ck+nnQ4SYqOxifxm9jFkwSgqrFlDU0M+G6E04=
110-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250416152108-4eeaa5719065/go.mod h1:h/ye+xQHISNgakWvrTQpQ0IIrV8PIkHVw+Q4AaqTrYo=
111-
sigs.k8s.io/controller-tools v0.17.0 h1:KaEQZbhrdY6J3zLBHplt+0aKUp8PeIttlhtF2UDo6bI=
112-
sigs.k8s.io/controller-tools v0.17.0/go.mod h1:SKoWY8rwGWDzHtfnhmOwljn6fViG0JF7/xmnxpklgjo=
109+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250429160156-647a1b741bc8 h1:3TILKTDhWe3LQd6SdP6vebZsKsQsCRuf618jYFvYCjI=
110+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250429160156-647a1b741bc8/go.mod h1:h/ye+xQHISNgakWvrTQpQ0IIrV8PIkHVw+Q4AaqTrYo=
111+
sigs.k8s.io/controller-tools v0.17.3 h1:lwFPLicpBKLgIepah+c8ikRBubFW5kOQyT88r3EwfNw=
112+
sigs.k8s.io/controller-tools v0.17.3/go.mod h1:1ii+oXcYZkxcBXzwv3YZBlzjt1fvkrCGjVF73blosJI=
113113
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
114114
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
115115
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎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.9.6
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.6
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.1
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.6
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.1
1111
loadBehavior: tryLoad
1212
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.2.5
1313
loadBehavior: tryLoad
@@ -16,17 +16,17 @@ providers:
1616
- name: cluster-api
1717
type: CoreProvider
1818
versions:
19-
- name: v1.8.11 # 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.8.11/core-components.yaml"
19+
- name: v1.9.7 # 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.7/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.9.6
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.6/core-components.yaml
28+
- name: v1.10.1
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/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.8.11 # 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.8.11/bootstrap-components.yaml"
42+
- name: v1.9.7 # 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.7/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.9.6
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.6/bootstrap-components.yaml
51+
- name: v1.10.1
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/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.8.11 # 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.8.11/control-plane-components.yaml"
64+
- name: v1.9.7 # 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.7/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.9.6
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.6/control-plane-components.yaml
73+
- name: v1.10.1
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -238,8 +238,8 @@ variables:
238238
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
239239
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
240240
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
241-
OLD_CAPI_UPGRADE_VERSION: "v1.8.11"
242-
LATEST_CAPI_UPGRADE_VERSION: "v1.9.6"
241+
OLD_CAPI_UPGRADE_VERSION: "v1.9.7"
242+
LATEST_CAPI_UPGRADE_VERSION: "v1.10.1"
243243
OLD_PROVIDER_UPGRADE_VERSION: "v1.18.2"
244244
LATEST_PROVIDER_UPGRADE_VERSION: "v1.19.1"
245245
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)