Skip to content

Commit 2601bfb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #337 from mboersma/bump-capi-one-eight-seven
🌱 Bump CAPI to v1.8.8
2 parents 0cdbb31 + ac0b1fd commit 2601bfb

File tree

4 files changed

+40
-36
lines changed

4 files changed

+40
-36
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ require (
2121
k8s.io/component-base v0.30.3
2222
k8s.io/klog/v2 v2.120.1
2323
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
24-
sigs.k8s.io/cluster-api v1.8.5
25-
sigs.k8s.io/cluster-api/test v1.8.5
26-
sigs.k8s.io/controller-runtime v0.18.5
24+
sigs.k8s.io/cluster-api v1.8.8
25+
sigs.k8s.io/cluster-api/test v1.8.8
26+
sigs.k8s.io/controller-runtime v0.18.6
2727
)
2828

2929
require (
@@ -112,7 +112,7 @@ require (
112112
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
113113
github.com/lib/pq v1.10.9 // indirect
114114
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
115-
github.com/magiconair/properties v1.8.7 // indirect
115+
github.com/magiconair/properties v1.8.8 // indirect
116116
github.com/mailru/easyjson v0.7.7 // indirect
117117
github.com/mattn/go-colorable v0.1.13 // indirect
118118
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -204,4 +204,4 @@ require (
204204
sigs.k8s.io/yaml v1.4.0 // indirect
205205
)
206206

207-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.5
207+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.8

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
8181
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
8282
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
8383
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
84-
github.com/coredns/corefile-migration v1.0.23 h1:Fp4FETmk8sT/IRgnKX2xstC2dL7+QdcU+BL5AYIN3Jw=
85-
github.com/coredns/corefile-migration v1.0.23/go.mod h1:8HyMhuyzx9RLZp8cRc9Uf3ECpEAafHOFxQWUPqktMQI=
84+
github.com/coredns/corefile-migration v1.0.24 h1:NL/zRKijhJZLYlNnMr891DRv5jXgfd3Noons1M6oTpc=
85+
github.com/coredns/corefile-migration v1.0.24/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
8686
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
8787
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
8888
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
@@ -303,8 +303,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
303303
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
304304
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
305305
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
306-
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
307-
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
306+
github.com/magiconair/properties v1.8.8 h1:Ver94o/KW27O7MbhemLysbQUa6lCdvy5Ol62vcYn4Q0=
307+
github.com/magiconair/properties v1.8.8/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
308308
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
309309
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
310310
github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI=
@@ -692,12 +692,12 @@ oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
692692
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
693693
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M=
694694
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
695-
sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA=
696-
sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
697-
sigs.k8s.io/cluster-api/test v1.8.5 h1:p2fjSv/exSFgYw+pO6iap1RVJPc0LJ+/A/PAMPl9vhU=
698-
sigs.k8s.io/cluster-api/test v1.8.5/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc=
699-
sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
700-
sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
695+
sigs.k8s.io/cluster-api v1.8.8 h1:0QchrO0gKvUBQlLyMWEPHSIC8YdVd8EMyajejIks2qE=
696+
sigs.k8s.io/cluster-api v1.8.8/go.mod h1:XnsL2ynNRPGvA1180m51rFjM9IAmfBQ3oK65/samTkw=
697+
sigs.k8s.io/cluster-api/test v1.8.8 h1:hMJWwi9ie7e4Kxw2uI6naRDVuftf+18GmIGT8ukfy2E=
698+
sigs.k8s.io/cluster-api/test v1.8.8/go.mod h1:SzaYMrIYKIEgnmgUy/KGz1+43T/obChjHviGjwHg65E=
699+
sigs.k8s.io/controller-runtime v0.18.6 h1:UnEoLBLDpQwzJ2jYh6aTdiMhGjNDR7IdFn9YEqHIccc=
700+
sigs.k8s.io/controller-runtime v0.18.6/go.mod h1:Dcsa9v8AEBWa3sQNJHsuWPT4ICv99irl5wj83NiC12U=
701701
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
702702
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
703703
sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg=

‎test/e2e/config/helm.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ managementClusterName: caaph-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.4
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.7.4
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.7.4
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.8
1111
loadBehavior: tryLoad
1212
# Note: This pulls the CAPD image from the staging repo instead of the official registry.
13-
- name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.7.4
13+
- name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.8.8
1414
loadBehavior: tryLoad
1515

1616
providers:
1717
- name: cluster-api
1818
type: CoreProvider
1919
versions:
20-
- name: v1.6.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
21-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/core-components.yaml"
20+
- 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.
21+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.9/core-components.yaml"
2222
type: "url"
2323
contract: v1beta1
2424
replacements:
2525
- old: --metrics-addr=127.0.0.1:8080
2626
new: --metrics-addr=:8080
2727
files:
2828
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
29-
- name: v1.7.4
30-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/core-components.yaml
29+
- name: v1.8.8
30+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/core-components.yaml
3131
type: url
3232
contract: v1beta1
3333
files:
@@ -40,17 +40,17 @@ providers:
4040
- name: kubeadm
4141
type: BootstrapProvider
4242
versions:
43-
- name: v1.6.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
44-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/bootstrap-components.yaml"
43+
- 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.
44+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.9/bootstrap-components.yaml"
4545
type: "url"
4646
contract: v1beta1
4747
replacements:
4848
- old: --metrics-addr=127.0.0.1:8080
4949
new: --metrics-addr=:8080
5050
files:
5151
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
52-
- name: v1.7.4
53-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/bootstrap-components.yaml
52+
- name: v1.8.8
53+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/bootstrap-components.yaml
5454
type: url
5555
contract: v1beta1
5656
files:
@@ -62,17 +62,17 @@ providers:
6262
- name: kubeadm
6363
type: ControlPlaneProvider
6464
versions:
65-
- name: v1.6.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
66-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/control-plane-components.yaml"
65+
- 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.
66+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.9/control-plane-components.yaml"
6767
type: "url"
6868
contract: v1beta1
6969
replacements:
7070
- old: --metrics-addr=127.0.0.1:8080
7171
new: --metrics-addr=:8080
7272
files:
7373
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
74-
- name: v1.7.4
75-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/control-plane-components.yaml
74+
- name: v1.8.8
75+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/control-plane-components.yaml
7676
type: url
7777
contract: v1beta1
7878
files:
@@ -84,8 +84,8 @@ providers:
8484
- name: docker
8585
type: InfrastructureProvider
8686
versions:
87-
- name: v1.6.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
88-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/infrastructure-components-development.yaml"
87+
- 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.
88+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.9/infrastructure-components-development.yaml"
8989
type: "url"
9090
contract: v1beta1
9191
replacements:
@@ -95,8 +95,8 @@ providers:
9595
- sourcePath: "${PWD}/test/e2e/data/shared/v1beta1/metadata.yaml"
9696
- sourcePath: "${PWD}/test/e2e/data/addons-helm/v1.5/cluster-template.yaml"
9797
targetName: "cluster-template.yaml"
98-
- name: "v1.7.4" # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
99-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/infrastructure-components-development.yaml"
98+
- name: "v1.8.8" # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
99+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.8/infrastructure-components-development.yaml"
100100
type: "url"
101101
contract: v1beta1
102102
replacements:
@@ -166,7 +166,7 @@ variables:
166166
EXP_MACHINE_SET_PREFLIGHT_CHECKS: "true"
167167
CAPI_DIAGNOSTICS_ADDRESS: ":8080"
168168
CAPI_INSECURE_DIAGNOSTICS: "true"
169-
OLD_CAPI_UPGRADE_VERSION: "v1.6.7"
169+
OLD_CAPI_UPGRADE_VERSION: "v1.7.9"
170170
OLD_PROVIDER_UPGRADE_VERSION: "v0.1.1-alpha.1"
171171

172172
intervals:

‎test/e2e/data/shared/v1beta1/metadata.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
---
12
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
23
kind: Metadata
34
releaseSeries:
5+
- major: 1
6+
minor: 8
7+
contract: v1beta1
48
- major: 1
59
minor: 7
610
contract: v1beta1

0 commit comments

Comments
 (0)