Skip to content

Commit 42b38b6

Browse files
committed
Bump CAPI to v1.6.4
1 parent cae83da commit 42b38b6

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ require (
1818
k8s.io/client-go v0.29.0
1919
k8s.io/klog/v2 v2.110.1
2020
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
21-
sigs.k8s.io/cluster-api v1.6.3
22-
sigs.k8s.io/cluster-api/test v1.6.3
21+
sigs.k8s.io/cluster-api v1.6.4
22+
sigs.k8s.io/cluster-api/test v1.6.4
2323
sigs.k8s.io/controller-runtime v0.16.5
2424
)
2525

@@ -175,14 +175,14 @@ require (
175175
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
176176
go.uber.org/multierr v1.11.0 // indirect
177177
go.uber.org/zap v1.25.0 // indirect
178-
golang.org/x/crypto v0.18.0 // indirect
178+
golang.org/x/crypto v0.21.0 // indirect
179179
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
180180
golang.org/x/mod v0.14.0 // indirect
181-
golang.org/x/net v0.20.0 // indirect
181+
golang.org/x/net v0.23.0 // indirect
182182
golang.org/x/oauth2 v0.14.0 // indirect
183183
golang.org/x/sync v0.6.0 // indirect
184-
golang.org/x/sys v0.16.0 // indirect
185-
golang.org/x/term v0.16.0 // indirect
184+
golang.org/x/sys v0.18.0 // indirect
185+
golang.org/x/term v0.18.0 // indirect
186186
golang.org/x/text v0.14.0 // indirect
187187
golang.org/x/time v0.3.0 // indirect
188188
golang.org/x/tools v0.17.0 // indirect

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
680680
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
681681
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
682682
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
683-
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
684-
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
683+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
684+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
685685
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
686686
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
687687
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -758,8 +758,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
758758
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
759759
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
760760
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
761-
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
762-
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
761+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
762+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
763763
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
764764
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
765765
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -835,14 +835,14 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
835835
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
836836
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
837837
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
838-
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
839-
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
838+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
839+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
840840
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
841841
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
842842
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
843843
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
844-
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
845-
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
844+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
845+
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
846846
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
847847
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
848848
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1086,10 +1086,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10861086
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10871087
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
10881088
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
1089-
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=
1090-
sigs.k8s.io/cluster-api v1.6.3/go.mod h1:4FzfgPPiYaFq8X9F9j2SvmggH/4OOLEDgVJuWDqKLig=
1091-
sigs.k8s.io/cluster-api/test v1.6.3 h1:ZCboLCTpKWzSbf+f7MpQT7EN8aeH9DNhJC1T9/vAuAM=
1092-
sigs.k8s.io/cluster-api/test v1.6.3/go.mod h1:AKs25dgW6AnyGaQBoWuXfWnBs+FT7vJmAI/aox64DEI=
1089+
sigs.k8s.io/cluster-api v1.6.4 h1:O3J+Dm/wBMAQSyTtdkEPcWbv4KyY4yqv8Q8g6pJVefM=
1090+
sigs.k8s.io/cluster-api v1.6.4/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s=
1091+
sigs.k8s.io/cluster-api/test v1.6.4 h1:eNs1FtKEQqWKxBB19/cQ/1IAgb4nHT0qbh0w7T9yqZ4=
1092+
sigs.k8s.io/cluster-api/test v1.6.4/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA=
10931093
sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw=
10941094
sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
10951095
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

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.6.3
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.4
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.3
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.4
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.3
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.4
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.6.3
13+
- name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.6.4
1414
loadBehavior: tryLoad
1515

1616
providers:
1717
- name: cluster-api
1818
type: CoreProvider
1919
versions:
20-
- name: v1.5.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.5.7/core-components.yaml"
20+
- name: v1.5.8 # 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.5.8/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.6.3
30-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/core-components.yaml
29+
- name: v1.6.4
30+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/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.5.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.5.7/bootstrap-components.yaml"
43+
- name: v1.5.8 # 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.5.8/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.6.3
53-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/bootstrap-components.yaml
52+
- name: v1.6.4
53+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/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.5.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.5.7/control-plane-components.yaml"
65+
- name: v1.5.8 # 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.5.8/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.6.3
75-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/control-plane-components.yaml
74+
- name: v1.6.4
75+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.4/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.5.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.5.7/infrastructure-components-development.yaml"
87+
- name: v1.5.8 # 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.5.8/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.6.3" # 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.6.3/infrastructure-components-development.yaml"
98+
- name: "v1.6.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.6.4/infrastructure-components-development.yaml"
100100
type: "url"
101101
contract: v1beta1
102102
replacements:
@@ -165,7 +165,7 @@ variables:
165165
EXP_MACHINE_SET_PREFLIGHT_CHECKS: "true"
166166
CAPI_DIAGNOSTICS_ADDRESS: ":8080"
167167
CAPI_INSECURE_DIAGNOSTICS: "true"
168-
OLD_CAPI_UPGRADE_VERSION: "v1.5.7"
168+
OLD_CAPI_UPGRADE_VERSION: "v1.5.8"
169169
OLD_PROVIDER_UPGRADE_VERSION: "v0.1.1-alpha.1"
170170

171171
intervals:

0 commit comments

Comments
 (0)