Skip to content

Commit c4b61c2

Browse files
Amulyam24Amulyam24
authored
Update cluster-api to v1.3.2 (#1025)
1 parent 902a1d5 commit c4b61c2

File tree

6 files changed

+43
-40
lines changed

6 files changed

+43
-40
lines changed

‎go.mod

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

33
go 1.19
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.2
66

77
require (
88
github.com/IBM-Cloud/power-go-client v1.2.2
@@ -24,8 +24,8 @@ require (
2424
k8s.io/client-go v0.25.0
2525
k8s.io/klog/v2 v2.80.1
2626
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
27-
sigs.k8s.io/cluster-api v1.3.1
28-
sigs.k8s.io/cluster-api/test v1.3.1
27+
sigs.k8s.io/cluster-api v1.3.2
28+
sigs.k8s.io/cluster-api/test v1.3.2
2929
sigs.k8s.io/controller-runtime v0.13.1
3030
)
3131

@@ -122,10 +122,10 @@ require (
122122
github.com/valyala/fastjson v1.6.3 // indirect
123123
go.mongodb.org/mongo-driver v1.10.0 // indirect
124124
golang.org/x/crypto v0.3.0 // indirect
125-
golang.org/x/net v0.2.0 // indirect
125+
golang.org/x/net v0.4.0 // indirect
126126
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
127-
golang.org/x/sys v0.2.0 // indirect
128-
golang.org/x/term v0.2.0 // indirect
127+
golang.org/x/sys v0.3.0 // indirect
128+
golang.org/x/term v0.3.0 // indirect
129129
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
130130
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
131131
google.golang.org/appengine v1.6.7 // indirect

‎go.sum

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,9 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su
921921
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
922922
golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
923923
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
924-
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
925924
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
925+
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
926+
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
926927
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
927928
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
928929
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1049,12 +1050,14 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc
10491050
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10501051
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10511052
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1052-
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
10531053
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1054+
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
1055+
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10541056
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
10551057
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
1056-
golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
10571058
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
1059+
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
1060+
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
10581061
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10591062
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10601063
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1396,10 +1399,10 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
13961399
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
13971400
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
13981401
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1399-
sigs.k8s.io/cluster-api v1.3.1 h1:sFd/ayOhQxd4YZX1qw8HC2xO7eKRBNRL+mlCKwdVhvY=
1400-
sigs.k8s.io/cluster-api v1.3.1/go.mod h1:ef5vvtp2PyhEHTYCw8niaVPlOX5Ntvrh+8oBZt0PJ08=
1401-
sigs.k8s.io/cluster-api/test v1.3.1 h1:5j0EJi58qgP6Ga9W0fI/T0rW+CeKPq1BoOg30Yx9zfI=
1402-
sigs.k8s.io/cluster-api/test v1.3.1/go.mod h1:aK8zSbF7gQyoM2FaPVFcE0o125feyRXVKlw03Ok+feA=
1402+
sigs.k8s.io/cluster-api v1.3.2 h1:DkkaVASrxgOP4hT24ndGwfge8+YjHKuAyZBSGJwAlq4=
1403+
sigs.k8s.io/cluster-api v1.3.2/go.mod h1:nnXmR51rHshpMEXmB4LZIwdiXWKXV6yaooB1KzrL0Qs=
1404+
sigs.k8s.io/cluster-api/test v1.3.2 h1:+EH9OwoIJ/UpGntRRhNxwIZkW3hx2pEn6aQrm7pRuJE=
1405+
sigs.k8s.io/cluster-api/test v1.3.2/go.mod h1:HKkh1O4lALo51GsXVIJ1rQNyLRE+CbEVcA+f/1gU5Rw=
14031406
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
14041407
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
14051408
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎hack/tools/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools
22

33
go 1.19
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.2
66

77
require (
88
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
@@ -13,7 +13,7 @@ require (
1313
github.com/onsi/ginkgo/v2 v2.6.0
1414
gotest.tools/gotestsum v1.8.2
1515
k8s.io/code-generator v0.25.0
16-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221214145535-a9f75adbe966
16+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230110112728-18c6e8e6cda0
1717
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
1818
sigs.k8s.io/controller-tools v0.10.0
1919
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
@@ -216,10 +216,10 @@ require (
216216
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
217217
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
218218
golang.org/x/mod v0.6.0 // indirect
219-
golang.org/x/net v0.2.0 // indirect
219+
golang.org/x/net v0.4.0 // indirect
220220
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
221-
golang.org/x/sys v0.2.0 // indirect
222-
golang.org/x/term v0.2.0 // indirect
221+
golang.org/x/sys v0.3.0 // indirect
222+
golang.org/x/term v0.3.0 // indirect
223223
golang.org/x/text v0.5.0 // indirect
224224
golang.org/x/tools v0.2.0 // indirect
225225
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
@@ -830,8 +830,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
830830
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
831831
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
832832
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
833-
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
834-
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
833+
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
834+
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
835835
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
836836
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
837837
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -928,13 +928,13 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
928928
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
929929
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
930930
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
931-
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
932-
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
931+
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
932+
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
933933
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
934934
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
935935
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
936-
golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
937-
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
936+
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
937+
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
938938
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
939939
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
940940
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1210,10 +1210,10 @@ mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2Yj
12101210
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12111211
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12121212
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1213-
sigs.k8s.io/cluster-api v1.3.1 h1:sFd/ayOhQxd4YZX1qw8HC2xO7eKRBNRL+mlCKwdVhvY=
1214-
sigs.k8s.io/cluster-api v1.3.1/go.mod h1:ef5vvtp2PyhEHTYCw8niaVPlOX5Ntvrh+8oBZt0PJ08=
1215-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221214145535-a9f75adbe966 h1:wlUd+N9gaG2y1H3ev28d/N+ArhVH4TEGyRKKiwl/fhk=
1216-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221214145535-a9f75adbe966/go.mod h1:6sstltyyN986QUG8+mn84+IBriMjJZPbqnM6GXErHcI=
1213+
sigs.k8s.io/cluster-api v1.3.2 h1:DkkaVASrxgOP4hT24ndGwfge8+YjHKuAyZBSGJwAlq4=
1214+
sigs.k8s.io/cluster-api v1.3.2/go.mod h1:nnXmR51rHshpMEXmB4LZIwdiXWKXV6yaooB1KzrL0Qs=
1215+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230110112728-18c6e8e6cda0 h1:8HJeHNNcrjvsWMz7Nsm2Xjg76CnpnFBsWDs4RcwJdCI=
1216+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230110112728-18c6e8e6cda0/go.mod h1:OCx3ogUBFL/rS2f1oARtr8FP8JmZZKjnUBrHxhAQSBg=
12171217
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
12181218
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
12191219
sigs.k8s.io/controller-tools v0.10.0 h1:0L5DTDTFB67jm9DkfrONgTGmfc/zYow0ZaHyppizU2U=

‎test/e2e/config/ibmcloud-e2e-powervs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.3.1
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/core-components.yaml
12+
- name: v1.3.2
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.3.1
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/bootstrap-components.yaml
20+
- name: v1.3.2
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.3.1
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/control-plane-components.yaml
28+
- name: v1.3.2
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

‎test/e2e/config/ibmcloud-e2e-vpc.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.3.1
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/core-components.yaml
12+
- name: v1.3.2
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.3.1
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/bootstrap-components.yaml
20+
- name: v1.3.2
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.3.1
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/control-plane-components.yaml
28+
- name: v1.3.2
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.2/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

0 commit comments

Comments
 (0)