Skip to content

Commit a7c597a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5761 from mboersma/bump-capi
Bump CAPI to v1.10.4
2 parents 71bd7f1 + 776ef64 commit a7c597a

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
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.3/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.4/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.3",
25+
"capi_version": "v1.10.4",
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.3"
123+
core: "cluster-api:v1.10.4"
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.3
62-
sigs.k8s.io/cluster-api/test v1.10.3
61+
sigs.k8s.io/cluster-api v1.10.4
62+
sigs.k8s.io/cluster-api/test v1.10.4
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.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=
726+
sigs.k8s.io/cluster-api v1.10.4 h1:5mdyWLGbbwOowWrjqM/J9N600QnxTohu5J1/1YR6g7c=
727+
sigs.k8s.io/cluster-api v1.10.4/go.mod h1:68GJs286ZChsncp+TxYNj/vhy2NWokiPtH4+SA0afs0=
728+
sigs.k8s.io/cluster-api/test v1.10.4 h1:1CJp7yjh2XazaPFtZzxSby9Gip2yjW0dNxyyHR7VjDk=
729+
sigs.k8s.io/cluster-api/test v1.10.4/go.mod h1:n2LsLQxc4RSLDjUXhgzquSTagZTJpUcY7uwtQtCRmaY=
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: 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.10.3
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.4
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.3
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.4
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.3
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.4
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.9.9 # 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.9/core-components.yaml"
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"
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.10.3
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/core-components.yaml
28+
- name: v1.10.4
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.4/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.9 # 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.9/bootstrap-components.yaml"
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"
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.10.3
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/bootstrap-components.yaml
51+
- name: v1.10.4
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.4/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.9 # 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.9/control-plane-components.yaml"
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"
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.10.3
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/control-plane-components.yaml
73+
- name: v1.10.4
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.4/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -242,8 +242,8 @@ variables:
242242
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
243243
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
244244
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
245-
OLD_CAPI_UPGRADE_VERSION: "v1.9.9"
246-
LATEST_CAPI_UPGRADE_VERSION: "v1.10.3"
245+
OLD_CAPI_UPGRADE_VERSION: "v1.9.10"
246+
LATEST_CAPI_UPGRADE_VERSION: "v1.10.4"
247247
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.5"
248248
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.1"
249249
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)