Skip to content

Commit 8b8ba05

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5371 from willie-yao/bump-capi-one-eight
Bump CAPI to v1.8.8
2 parents 1e5b0b0 + 3571457 commit 8b8ba05

12 files changed

+34
-40
lines changed

‎Makefile

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

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

330330
# Deploy CAAPH
331331
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.8.5",
23+
"capi_version": "v1.8.8",
2424
"caaph_version": "v0.2.5",
2525
"cert_manager_version": "v1.16.1",
2626
"kubernetes_version": "v1.28.15",

‎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.8.5"
123+
core: "cluster-api:v1.8.8"
124124
infrastructure: "azure:v1.17.2"
125125
addon: "helm:v0.2.5"
126126
manager:

‎go.mod

Lines changed: 4 additions & 4 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-20240502163921-fe8a2dddb1d0
5757
sigs.k8s.io/cloud-provider-azure v1.30.4
58-
sigs.k8s.io/cluster-api v1.8.5
59-
sigs.k8s.io/cluster-api/test v1.8.5
60-
sigs.k8s.io/controller-runtime v0.18.5
58+
sigs.k8s.io/cluster-api v1.8.8
59+
sigs.k8s.io/cluster-api/test v1.8.8
60+
sigs.k8s.io/controller-runtime v0.18.6
6161
sigs.k8s.io/kind v0.26.0
6262
)
6363

@@ -156,7 +156,7 @@ require (
156156
github.com/kr/fs v0.1.0 // indirect
157157
github.com/kylelemons/godebug v1.1.0 // indirect
158158
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
159-
github.com/magiconair/properties v1.8.7 // indirect
159+
github.com/magiconair/properties v1.8.8 // indirect
160160
github.com/mailru/easyjson v0.7.7 // indirect
161161
github.com/mattn/go-isatty v0.0.20 // indirect
162162
github.com/mitchellh/copystructure v1.2.0 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
168168
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
169169
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
170170
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
171-
github.com/coredns/corefile-migration v1.0.23 h1:Fp4FETmk8sT/IRgnKX2xstC2dL7+QdcU+BL5AYIN3Jw=
172-
github.com/coredns/corefile-migration v1.0.23/go.mod h1:8HyMhuyzx9RLZp8cRc9Uf3ECpEAafHOFxQWUPqktMQI=
171+
github.com/coredns/corefile-migration v1.0.24 h1:NL/zRKijhJZLYlNnMr891DRv5jXgfd3Noons1M6oTpc=
172+
github.com/coredns/corefile-migration v1.0.24/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
173173
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
174174
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
175175
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
@@ -361,8 +361,8 @@ github.com/leanovate/gopter v0.2.11 h1:vRjThO1EKPb/1NsDXuDrzldR28RLkBflWYcU9CvzW
361361
github.com/leanovate/gopter v0.2.11/go.mod h1:aK3tzZP/C+p1m3SPRE4SYZFGP7jjkuSI4f7Xvpt0S9c=
362362
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
363363
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
364-
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
365-
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
364+
github.com/magiconair/properties v1.8.8 h1:Ver94o/KW27O7MbhemLysbQUa6lCdvy5Ol62vcYn4Q0=
365+
github.com/magiconair/properties v1.8.8/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
366366
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
367367
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
368368
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -743,12 +743,12 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29 h1:qiifAaaBqV3d/EcN9dKJaJI
743743
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29/go.mod h1:ZFAt0qF1kR+w8nBVJK56s6CFvLrlosN1i2c+Sxb7LBk=
744744
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16 h1:Fm/Yjv4nXjUtJ90uXKSKwPwaTWYuDFMhDNNOd77PlOg=
745745
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16/go.mod h1:+kl90flu4+WCP6HBGVYbKVQR+5ztDzUNrWJz8rsnvRU=
746-
sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA=
747-
sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
748-
sigs.k8s.io/cluster-api/test v1.8.5 h1:p2fjSv/exSFgYw+pO6iap1RVJPc0LJ+/A/PAMPl9vhU=
749-
sigs.k8s.io/cluster-api/test v1.8.5/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc=
750-
sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
751-
sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
746+
sigs.k8s.io/cluster-api v1.8.8 h1:0QchrO0gKvUBQlLyMWEPHSIC8YdVd8EMyajejIks2qE=
747+
sigs.k8s.io/cluster-api v1.8.8/go.mod h1:XnsL2ynNRPGvA1180m51rFjM9IAmfBQ3oK65/samTkw=
748+
sigs.k8s.io/cluster-api/test v1.8.8 h1:hMJWwi9ie7e4Kxw2uI6naRDVuftf+18GmIGT8ukfy2E=
749+
sigs.k8s.io/cluster-api/test v1.8.8/go.mod h1:SzaYMrIYKIEgnmgUy/KGz1+43T/obChjHviGjwHg65E=
750+
sigs.k8s.io/controller-runtime v0.18.6 h1:UnEoLBLDpQwzJ2jYh6aTdiMhGjNDR7IdFn9YEqHIccc=
751+
sigs.k8s.io/controller-runtime v0.18.6/go.mod h1:Dcsa9v8AEBWa3sQNJHsuWPT4ICv99irl5wj83NiC12U=
752752
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
753753
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
754754
sigs.k8s.io/kind v0.26.0 h1:8fS6I0Q5WGlmLprSpH0DarlOSdcsv0txnwc93J2BP7M=

‎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.8.5
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.8
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.5
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.8
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.5
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.8
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.7.8 # 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.7.8/core-components.yaml"
19+
- name: v1.7.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.7.9/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.8.5
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/core-components.yaml
28+
- name: v1.8.8
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/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.7.8 # 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.7.8/bootstrap-components.yaml"
42+
- name: v1.7.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.7.9/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.8.5
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/bootstrap-components.yaml
51+
- name: v1.8.8
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/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.7.8 # 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.7.8/control-plane-components.yaml"
64+
- name: v1.7.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.7.9/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.8.5
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/control-plane-components.yaml
73+
- name: v1.8.8
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/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.7.8"
238-
LATEST_CAPI_UPGRADE_VERSION: "v1.8.5"
237+
OLD_CAPI_UPGRADE_VERSION: "v1.7.9"
238+
LATEST_CAPI_UPGRADE_VERSION: "v1.8.8"
239239
OLD_PROVIDER_UPGRADE_VERSION: "v1.16.3"
240240
LATEST_PROVIDER_UPGRADE_VERSION: "v1.17.1"
241241
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

‎test/e2e/data/infrastructure-azure/v1.16.3/cluster-template-prow-machine-and-machine-pool.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/data/infrastructure-azure/v1.17.1/cluster-template-prow-machine-and-machine-pool.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/data/infrastructure-azure/v1beta1/bases/mp.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ metadata:
2929
name: ${CLUSTER_NAME}-mp-0
3030
namespace: default
3131
spec:
32-
identity: SystemAssigned
3332
location: ${AZURE_LOCATION}
3433
template:
3534
osDisk:

‎test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-and-machine-pool.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)