Skip to content

Commit 3373251

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3868 from richardcase/bump_capi_version_126
chore: bump capi to 1.2.6
2 parents 7ad8d49 + 2b53d43 commit 3373251

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws/v2
22

33
go 1.18
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.5
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.6
66

77
require (
88
github.com/alessio/shellescape v1.4.1
@@ -38,8 +38,8 @@ require (
3838
k8s.io/klog/v2 v2.80.0
3939
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
4040
sigs.k8s.io/aws-iam-authenticator v0.5.10
41-
sigs.k8s.io/cluster-api v1.2.5
42-
sigs.k8s.io/cluster-api/test v1.2.5
41+
sigs.k8s.io/cluster-api v1.2.6
42+
sigs.k8s.io/cluster-api/test v1.2.6
4343
sigs.k8s.io/controller-runtime v0.12.3
4444
sigs.k8s.io/kustomize/api v0.12.1
4545
sigs.k8s.io/yaml v1.3.0

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,10 +1266,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12661266
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
12671267
sigs.k8s.io/aws-iam-authenticator v0.5.10 h1:YGPh/SpRxNkWXfGkURKGsgWvz70x41SB4QazrU7R3Wk=
12681268
sigs.k8s.io/aws-iam-authenticator v0.5.10/go.mod h1:3oJI6vy91KxVSb9g+v9gtJsFnFDJoq+ySJhGDBKpKFk=
1269-
sigs.k8s.io/cluster-api v1.2.5 h1:Am4W5ITO0v5FUNkfCuD6gwE29phDt1gyQY9EGWnTYIU=
1270-
sigs.k8s.io/cluster-api v1.2.5/go.mod h1:Ye5gn15u+q6VcE+Se7nBMSo6INm55F+zBcCiWzrjxFc=
1271-
sigs.k8s.io/cluster-api/test v1.2.5 h1:oS5r0d7caFfu+w/2K1mFZXwA/jrkJcddlZHyW1sE7gs=
1272-
sigs.k8s.io/cluster-api/test v1.2.5/go.mod h1:uDGdxAADhTIuQoHoGSYehqMWKQ9sR4/LGE8y2k0Y2LM=
1269+
sigs.k8s.io/cluster-api v1.2.6 h1:wueslUK8LdTH8rOI697WIj1jutbaGY3a24t4XjZvLI8=
1270+
sigs.k8s.io/cluster-api v1.2.6/go.mod h1:Ye5gn15u+q6VcE+Se7nBMSo6INm55F+zBcCiWzrjxFc=
1271+
sigs.k8s.io/cluster-api/test v1.2.6 h1:QGcLuLsKkjnd6bEAQ9DKVpZJ4PbgvHe8pFV1Nt5dUGA=
1272+
sigs.k8s.io/cluster-api/test v1.2.6/go.mod h1:uDGdxAADhTIuQoHoGSYehqMWKQ9sR4/LGE8y2k0Y2LM=
12731273
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
12741274
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
12751275
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=

‎hack/tools/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
k8s.io/code-generator v0.25.0
1616
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
1717
k8s.io/klog/v2 v2.80.1
18-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221110071255-bda7e5cca7b5
18+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221121093230-b1688621953c
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
2020
sigs.k8s.io/controller-tools v0.10.0
2121
sigs.k8s.io/kind v0.17.0
@@ -160,7 +160,7 @@ require (
160160
github.com/nishanths/predeclared v0.2.2 // indirect
161161
github.com/nxadm/tail v1.4.8 // indirect
162162
github.com/olekukonko/tablewriter v0.0.5 // indirect
163-
github.com/onsi/gomega v1.22.1 // indirect
163+
github.com/onsi/gomega v1.24.1 // indirect
164164
github.com/pelletier/go-toml v1.9.5 // indirect
165165
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
166166
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
@@ -223,9 +223,9 @@ require (
223223
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
224224
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
225225
golang.org/x/mod v0.6.0 // indirect
226-
golang.org/x/net v0.1.0 // indirect
226+
golang.org/x/net v0.2.0 // indirect
227227
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
228-
golang.org/x/sys v0.1.0 // indirect
228+
golang.org/x/sys v0.2.0 // indirect
229229
golang.org/x/text v0.4.0 // indirect
230230
golang.org/x/tools v0.2.0 // indirect
231231
google.golang.org/protobuf v1.28.1 // indirect

‎hack/tools/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -527,13 +527,13 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
527527
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
528528
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
529529
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
530-
github.com/onsi/ginkgo/v2 v2.3.0 h1:kUMoxMoQG3ogk/QWyKh3zibV7BKZ+xBpWil1cTylVqc=
530+
github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
531531
github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
532532
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
533533
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
534534
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
535-
github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI=
536-
github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM=
535+
github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
536+
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
537537
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
538538
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
539539
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
@@ -840,8 +840,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
840840
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
841841
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
842842
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
843-
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
844-
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
843+
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
844+
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
845845
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
846846
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
847847
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -936,11 +936,11 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
936936
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
937937
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
938938
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
939-
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
940-
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
939+
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
940+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
941941
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
942942
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
943-
golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
943+
golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
944944
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
945945
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
946946
golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1218,8 +1218,8 @@ mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2Yj
12181218
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12191219
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12201220
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1221-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221110071255-bda7e5cca7b5 h1:BUAimhU5zL1GG4AMqAL5oHSD+wSxYkKPlMoR/CAuMjs=
1222-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221110071255-bda7e5cca7b5/go.mod h1:sV9nddPTip0H15ng4il6x6CjQtpj65Ry0ZA6fB/wFnk=
1221+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221121093230-b1688621953c h1:DXSapcAhMk979WoxCKPWA6XFNDpSHFAGA/PgNLeVkeQ=
1222+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221121093230-b1688621953c/go.mod h1:7luenhlsUTb9obnAferuDFEvhtITw7JjHpXkiDmCmKY=
12231223
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
12241224
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
12251225
sigs.k8s.io/controller-tools v0.10.0 h1:0L5DTDTFB67jm9DkfrONgTGmfc/zYow0ZaHyppizU2U=

‎test/e2e/data/e2e_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ images:
2727
loadBehavior: tryLoad
2828
- name: quay.io/jetstack/cert-manager-controller:v1.7.2
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.5
30+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.6
3131
loadBehavior: tryLoad
32-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.5
32+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.6
3333
loadBehavior: tryLoad
34-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.5
34+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.6
3535
loadBehavior: tryLoad
3636

3737
providers:
3838
- name: cluster-api
3939
type: CoreProvider
4040
versions:
41-
- name: v1.2.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
42-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/core-components.yaml"
41+
- name: v1.2.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
42+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/core-components.yaml"
4343
type: "url"
4444
contract: v1beta1
4545
files:
@@ -54,8 +54,8 @@ providers:
5454
files:
5555
- sourcePath: "./shared/v1beta1/metadata.yaml"
5656
versions:
57-
- name: v1.2.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
58-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/bootstrap-components.yaml"
57+
- name: v1.2.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
58+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/bootstrap-components.yaml"
5959
type: "url"
6060
contract: v1beta1
6161
files:
@@ -70,8 +70,8 @@ providers:
7070
files:
7171
- sourcePath: "./shared/v1beta1/metadata.yaml"
7272
versions:
73-
- name: v1.2.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
74-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/control-plane-components.yaml"
73+
- name: v1.2.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
74+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/control-plane-components.yaml"
7575
type: "url"
7676
contract: v1beta1
7777
files:

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.7.2
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.5
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.6
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.5
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.6
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.5
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.6
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.2.5
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/core-components.yaml"
37+
- name: v1.2.6
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.2.5
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/bootstrap-components.yaml"
53+
- name: v1.2.6
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.2.5
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/control-plane-components.yaml"
69+
- name: v1.2.6
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

0 commit comments

Comments
 (0)