Skip to content

Commit 44da1de

Browse files
authored
Merge pull request #5712 from mboersma/bump-capi
Bump CAPI to v1.10.3
2 parents 4936b6f + 377d52f commit 44da1de

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
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.10.2/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.3/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.10.2",
25+
"capi_version": "v1.10.3",
2626
"caaph_version": "v0.2.5",
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.10.2"
123+
core: "cluster-api:v1.10.3"
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.2
62-
sigs.k8s.io/cluster-api/test v1.10.2
61+
sigs.k8s.io/cluster-api v1.10.3
62+
sigs.k8s.io/cluster-api/test v1.10.3
6363
sigs.k8s.io/controller-runtime v0.20.4
6464
sigs.k8s.io/kind v0.29.0
6565
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,10 +723,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9 h1:+ngbNuuzAIy4mIA09/ALZxx0
723723
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9/go.mod h1:wlb5KMXferSuS9asjIlqjU7yHnCUEtAGnwjYdDtqdmk=
724724
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 h1:F5qZPS35TGb0ghlLGcHrbwzoO3mFnCBMM4ADGAlY+rI=
725725
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1/go.mod h1:rEQnoF3pmD1kmAFQCwA/SqHiiftLFeMwdQt0gsuKWbM=
726-
sigs.k8s.io/cluster-api v1.10.2 h1:xfvtNu4Fy/41grL0ryH5xSKQjpJEWdO8HiV2lPCCozQ=
727-
sigs.k8s.io/cluster-api v1.10.2/go.mod h1:/b9Un5Imprib6S7ZOcJitC2ep/5wN72b0pXpMQFfbTw=
728-
sigs.k8s.io/cluster-api/test v1.10.2 h1:y6vSdS9FSAi/DNoFE2fZo2fed0m1cgW+ueBazk1g4i8=
729-
sigs.k8s.io/cluster-api/test v1.10.2/go.mod h1:KLeRjNtQS8k5jIPvQF0QxOti/ATu5euwSusb6iFBga8=
726+
sigs.k8s.io/cluster-api v1.10.3 h1:7tE5xgQJutisgDyeLzaZ9JhDaHGuG3GjPltsFM89BoA=
727+
sigs.k8s.io/cluster-api v1.10.3/go.mod h1:pu1WDn+fdax9aC9ZtDDoXqnO7P3LLjxbKGU/Nzf/DF4=
728+
sigs.k8s.io/cluster-api/test v1.10.3 h1:NFdzowDNIY6Pq+3DQKOdpctnIMk4rWBZCxDyKgo6vzM=
729+
sigs.k8s.io/cluster-api/test v1.10.3/go.mod h1:reUcQ/HTpDDkTXqsZj1BEmn3VzAoABy2XhLaM2XlMQQ=
730730
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
731731
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
732732
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

test/e2e/config/azure-dev.yaml

Lines changed: 10 additions & 10 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.10.2
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.3
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.2
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.3
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.2
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.3
1111
loadBehavior: tryLoad
1212
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.2.5
1313
loadBehavior: tryLoad
@@ -25,8 +25,8 @@ providers:
2525
new: --metrics-addr=:8080
2626
files:
2727
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
28-
- name: v1.10.2
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml
28+
- name: v1.10.3
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/core-components.yaml
3030
type: url
3131
contract: v1beta1
3232
files:
@@ -48,8 +48,8 @@ providers:
4848
new: --metrics-addr=:8080
4949
files:
5050
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
51-
- name: v1.10.2
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml
51+
- name: v1.10.3
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/bootstrap-components.yaml
5353
type: url
5454
contract: v1beta1
5555
files:
@@ -70,8 +70,8 @@ providers:
7070
new: --metrics-addr=:8080
7171
files:
7272
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
73-
- name: v1.10.2
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml
73+
- name: v1.10.3
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -243,7 +243,7 @@ variables:
243243
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
244244
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
245245
OLD_CAPI_UPGRADE_VERSION: "v1.9.7"
246-
LATEST_CAPI_UPGRADE_VERSION: "v1.10.2"
246+
LATEST_CAPI_UPGRADE_VERSION: "v1.10.3"
247247
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.4"
248248
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.0"
249249
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)