Skip to content

Commit bfdbbd8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5438 from mboersma/bump-capi-one-nine-five
Bump CAPI to v1.9.5
2 parents c5afe7d + 83d2d85 commit bfdbbd8

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export GOPROXY
3434
export GO111MODULE=on
3535

3636
# Kubebuilder.
37-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
37+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
3838
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
3939
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
4040

@@ -328,7 +328,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
328328
./hack/create-custom-cloud-provider-config.sh
329329

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

333333
# Deploy CAAPH
334334
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
@@ -20,7 +20,7 @@ settings = {
2020
"deploy_cert_manager": True,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "capz",
23-
"capi_version": "v1.9.4",
23+
"capi_version": "v1.9.5",
2424
"caaph_version": "v0.2.5",
2525
"cert_manager_version": "v1.16.2",
2626
"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.4"
123+
core: "cluster-api:v1.9.5"
124124
infrastructure: "azure:v1.17.2"
125125
addon: "helm:v0.2.5"
126126
manager:

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ require (
5555
k8s.io/kubectl v0.30.3
5656
k8s.io/utils v0.0.0-20240821151609-f90d01438635
5757
sigs.k8s.io/cloud-provider-azure v1.30.4
58-
sigs.k8s.io/cluster-api v1.9.4
59-
sigs.k8s.io/cluster-api/test v1.9.4
60-
sigs.k8s.io/controller-runtime v0.19.4
58+
sigs.k8s.io/cluster-api v1.9.5
59+
sigs.k8s.io/cluster-api/test v1.9.5
60+
sigs.k8s.io/controller-runtime v0.19.6
6161
sigs.k8s.io/kind v0.27.0
6262
)
6363

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,12 +741,12 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29 h1:qiifAaaBqV3d/EcN9dKJaJI
741741
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29/go.mod h1:ZFAt0qF1kR+w8nBVJK56s6CFvLrlosN1i2c+Sxb7LBk=
742742
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16 h1:Fm/Yjv4nXjUtJ90uXKSKwPwaTWYuDFMhDNNOd77PlOg=
743743
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16/go.mod h1:+kl90flu4+WCP6HBGVYbKVQR+5ztDzUNrWJz8rsnvRU=
744-
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
745-
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
746-
sigs.k8s.io/cluster-api/test v1.9.4 h1:ZZ+IPK/lfyc4d/QPtompt+cxXYC6tGJ4kTHhhocgbIM=
747-
sigs.k8s.io/cluster-api/test v1.9.4/go.mod h1:dHLUcNc9vBNyQyY6NTcqcfpFvIiXmcL5Iqe2sETFD1c=
748-
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
749-
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
744+
sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro=
745+
sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
746+
sigs.k8s.io/cluster-api/test v1.9.5 h1:DtiiDWCIGaWhp4cA7xzGPWeM796XIRQwOptLATe0yFg=
747+
sigs.k8s.io/cluster-api/test v1.9.5/go.mod h1:YL2wANe8TFWFBka9CDkxjPj7KALqUtK+PtKa4ChNIok=
748+
sigs.k8s.io/controller-runtime v0.19.6 h1:fuq53qTLQ7aJTA7aNsklNnu7eQtSFqJUomOyM+phPLk=
749+
sigs.k8s.io/controller-runtime v0.19.6/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
750750
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
751751
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
752752
sigs.k8s.io/kind v0.27.0 h1:PQ3f0iAWNIj66LYkZ1ivhEg/+Zb6UPMbO+qVei/INZA=

‎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.4
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.9.5
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.4
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.5
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.4
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.5
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.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.8.9/core-components.yaml"
19+
- name: v1.8.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.8.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.9.4
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/core-components.yaml
28+
- name: v1.9.5
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/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.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.8.9/bootstrap-components.yaml"
42+
- name: v1.8.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.8.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.9.4
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/bootstrap-components.yaml
51+
- name: v1.9.5
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/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.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.8.9/control-plane-components.yaml"
64+
- name: v1.8.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.8.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.9.4
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/control-plane-components.yaml
73+
- name: v1.9.5
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -234,8 +234,8 @@ variables:
234234
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
235235
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
236236
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
237-
OLD_CAPI_UPGRADE_VERSION: "v1.8.9"
238-
LATEST_CAPI_UPGRADE_VERSION: "v1.9.4"
237+
OLD_CAPI_UPGRADE_VERSION: "v1.8.10"
238+
LATEST_CAPI_UPGRADE_VERSION: "v1.9.5"
239239
OLD_PROVIDER_UPGRADE_VERSION: "v1.17.3"
240240
LATEST_PROVIDER_UPGRADE_VERSION: "v1.18.0"
241241
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)