Skip to content

Commit 333483b

Browse files
damdodamdo
committed
UPSTREAM: <carry>: Updating and vendoring go modules after an upstream rebase
1 parent 04c101d commit 333483b

File tree

20,518 files changed

+3885191
-1031212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

20,518 files changed

+3885191
-1031212
lines changed

‎go.mod‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api
22

3-
go 1.22
3+
go 1.21
44

55
require (
66
github.com/MakeNowJust/heredoc v1.0.0
@@ -29,23 +29,25 @@ require (
2929
github.com/spf13/pflag v1.0.5
3030
github.com/spf13/viper v1.18.2
3131
github.com/valyala/fastjson v1.6.4
32-
go.etcd.io/etcd/api/v3 v3.5.9
33-
go.etcd.io/etcd/client/v3 v3.5.9
34-
golang.org/x/net v0.17.0 // indirect
35-
golang.org/x/oauth2 v0.10.0
36-
google.golang.org/grpc v1.55.0
37-
k8s.io/api v0.27.2
38-
k8s.io/apiextensions-apiserver v0.27.2
39-
k8s.io/apimachinery v0.27.2
40-
k8s.io/apiserver v0.27.2
41-
k8s.io/client-go v0.27.2
42-
k8s.io/cluster-bootstrap v0.27.2
43-
k8s.io/component-base v0.27.2
44-
k8s.io/klog/v2 v2.90.1
45-
k8s.io/kubectl v0.27.2
46-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
47-
sigs.k8s.io/controller-runtime v0.15.1
48-
sigs.k8s.io/yaml v1.3.0
32+
go.etcd.io/etcd/api/v3 v3.5.13
33+
go.etcd.io/etcd/client/v3 v3.5.13
34+
golang.org/x/oauth2 v0.18.0
35+
golang.org/x/text v0.14.0
36+
gomodules.xyz/jsonpatch/v2 v2.4.0
37+
google.golang.org/grpc v1.59.0
38+
k8s.io/api v0.29.3
39+
k8s.io/apiextensions-apiserver v0.29.3
40+
k8s.io/apimachinery v0.29.3
41+
k8s.io/apiserver v0.29.3
42+
k8s.io/client-go v0.29.3
43+
k8s.io/cluster-bootstrap v0.29.3
44+
k8s.io/component-base v0.29.3
45+
k8s.io/klog/v2 v2.110.1
46+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
47+
k8s.io/kubectl v0.29.3
48+
k8s.io/utils v0.0.0-20231127182322-b307cd553661
49+
sigs.k8s.io/controller-runtime v0.17.3
50+
sigs.k8s.io/yaml v1.4.0
4951
)
5052

5153
require (
@@ -153,12 +155,14 @@ require (
153155
go.uber.org/multierr v1.11.0 // indirect
154156
go.uber.org/zap v1.26.0 // indirect
155157
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
156-
golang.org/x/crypto v0.14.0 // indirect
157-
golang.org/x/sys v0.13.0 // indirect
158-
golang.org/x/term v0.13.0 // indirect
159-
golang.org/x/text v0.13.0
160-
golang.org/x/time v0.3.0 // indirect
161-
golang.org/x/tools v0.14.0 // indirect
158+
golang.org/x/crypto v0.21.0 // indirect
159+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
160+
golang.org/x/net v0.23.0 // indirect
161+
golang.org/x/sync v0.6.0 // indirect
162+
golang.org/x/sys v0.18.0 // indirect
163+
golang.org/x/term v0.18.0 // indirect
164+
golang.org/x/time v0.5.0 // indirect
165+
golang.org/x/tools v0.17.0 // indirect
162166
google.golang.org/appengine v1.6.7 // indirect
163167
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
164168
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect

‎go.sum‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
575575
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
576576
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
577577
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
578-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
579-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
578+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
579+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
580580
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
581581
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
582582
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -630,8 +630,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
630630
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
631631
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
632632
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
633-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
634-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
633+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
634+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
635635
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
636636
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
637637
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -678,23 +678,24 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
678678
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
679679
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
680680
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
681-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
682-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
681+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
682+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
683+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
683684
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
684685
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
685686
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
686687
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
687-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
688-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
688+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
689+
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
689690
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
690691
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
691692
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
692693
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
693694
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
694695
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
695696
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
696-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
697-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
697+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
698+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
698699
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
699700
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
700701
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=

‎hack/tools/vendor/cloud.google.com/go/.gitignore‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)