Skip to content

Commit 1947da6

Browse files
twz123twz123
committed
⚠ Bump k8s.io/ to v1.30.0-beta.0
Kubernetes 1.30 has a breaking API change around leader election metrics. Adapt to those API changes accordingly. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
1 parent 4c2442e commit 1947da6

File tree

5 files changed

+89
-90
lines changed

5 files changed

+89
-90
lines changed

‎examples/scratch-env/go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/go-openapi/swag v0.22.3 // indirect
2323
github.com/gogo/protobuf v1.3.2 // indirect
2424
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
25-
github.com/golang/protobuf v1.5.3 // indirect
25+
github.com/golang/protobuf v1.5.4 // indirect
2626
github.com/google/gnostic-models v0.6.8 // indirect
2727
github.com/google/go-cmp v0.6.0 // indirect
2828
github.com/google/gofuzz v1.2.0 // indirect
@@ -41,25 +41,25 @@ require (
4141
github.com/prometheus/procfs v0.12.0 // indirect
4242
go.uber.org/multierr v1.11.0 // indirect
4343
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
44-
golang.org/x/net v0.20.0 // indirect
44+
golang.org/x/net v0.21.0 // indirect
4545
golang.org/x/oauth2 v0.16.0 // indirect
4646
golang.org/x/sys v0.18.0 // indirect
47-
golang.org/x/term v0.16.0 // indirect
47+
golang.org/x/term v0.17.0 // indirect
4848
golang.org/x/text v0.14.0 // indirect
4949
golang.org/x/time v0.3.0 // indirect
5050
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5151
google.golang.org/appengine v1.6.7 // indirect
52-
google.golang.org/protobuf v1.32.0 // indirect
52+
google.golang.org/protobuf v1.33.0 // indirect
5353
gopkg.in/inf.v0 v0.9.1 // indirect
5454
gopkg.in/yaml.v2 v2.4.0 // indirect
5555
gopkg.in/yaml.v3 v3.0.1 // indirect
56-
k8s.io/api v0.29.2 // indirect
57-
k8s.io/apiextensions-apiserver v0.29.2 // indirect
58-
k8s.io/apimachinery v0.29.2 // indirect
59-
k8s.io/client-go v0.29.2 // indirect
60-
k8s.io/component-base v0.29.2 // indirect
56+
k8s.io/api v0.30.0-beta.0 // indirect
57+
k8s.io/apiextensions-apiserver v0.30.0-beta.0 // indirect
58+
k8s.io/apimachinery v0.30.0-beta.0 // indirect
59+
k8s.io/client-go v0.30.0-beta.0 // indirect
60+
k8s.io/component-base v0.30.0-beta.0 // indirect
6161
k8s.io/klog/v2 v2.120.1 // indirect
62-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
62+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
6363
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
6464
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6565
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎examples/scratch-env/go.sum

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
3131
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
3232
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
3333
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
34-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
35-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
36-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
34+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
35+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
3736
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
3837
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
39-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
4038
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
4139
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4240
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -120,8 +118,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
120118
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
121119
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
122120
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
123-
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
124-
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
121+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
122+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
125123
golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
126124
golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
127125
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -132,8 +130,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
132130
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
133131
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
134132
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
135-
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
136-
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
133+
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
134+
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
137135
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
138136
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
139137
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -145,8 +143,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
145143
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
146144
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
147145
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
148-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
149-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
146+
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
147+
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
150148
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
151149
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
152150
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -155,10 +153,8 @@ gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw
155153
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
156154
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
157155
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
158-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
159-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
160-
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
161-
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
156+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
157+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
162158
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
163159
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
164160
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -170,20 +166,20 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
170166
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
171167
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
172168
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
173-
k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=
174-
k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0=
175-
k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg=
176-
k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8=
177-
k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
178-
k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
179-
k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
180-
k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
181-
k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8=
182-
k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM=
169+
k8s.io/api v0.30.0-beta.0 h1:5nsH5CjCcgbHxWigNtvMu3rulycLWPqrlDe5tSonVQI=
170+
k8s.io/api v0.30.0-beta.0/go.mod h1:A74Wh+vOyYXQS7SbhLXPF3rW0+CQP078Sqn+yuHQV8Y=
171+
k8s.io/apiextensions-apiserver v0.30.0-beta.0 h1:jQQjaL42qHYqpERMmgWMk6R6mTle3DV9k2RweaFT1Uw=
172+
k8s.io/apiextensions-apiserver v0.30.0-beta.0/go.mod h1:vQzYpGPmkfiBCjHoZii1qlmJXkTEA2oi/Q/HFD/JJRA=
173+
k8s.io/apimachinery v0.30.0-beta.0 h1:/gaNLWP5ynEG0ExJ+4w2YCj5/L4MU66RsWEAKciy0/g=
174+
k8s.io/apimachinery v0.30.0-beta.0/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
175+
k8s.io/client-go v0.30.0-beta.0 h1:9K7+KFX7IuacC0lvMyxRBAx6rEiFfhWYo+AN919XWp4=
176+
k8s.io/client-go v0.30.0-beta.0/go.mod h1:HFM/neoED2h1OCm5AERy1PmCb3etIgrfIbcDbUqfDQ8=
177+
k8s.io/component-base v0.30.0-beta.0 h1:BrmAW/HLVhLUi9lpLJKKsb0Xqn8KX/5ez56/lVzgWXg=
178+
k8s.io/component-base v0.30.0-beta.0/go.mod h1:jz7Tz00FFNpjMBCJ1X4CTLIGAwmHjlmTKB25vPcnvuI=
183179
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
184180
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
185-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
186-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
181+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
182+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
187183
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
188184
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
189185
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ require (
1919
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
2020
golang.org/x/sys v0.18.0
2121
gomodules.xyz/jsonpatch/v2 v2.4.0
22-
k8s.io/api v0.29.2
23-
k8s.io/apiextensions-apiserver v0.29.2
24-
k8s.io/apimachinery v0.29.2
25-
k8s.io/apiserver v0.29.2
26-
k8s.io/client-go v0.29.2
27-
k8s.io/component-base v0.29.2
22+
k8s.io/api v0.30.0-beta.0
23+
k8s.io/apiextensions-apiserver v0.30.0-beta.0
24+
k8s.io/apimachinery v0.30.0-beta.0
25+
k8s.io/apiserver v0.30.0-beta.0
26+
k8s.io/client-go v0.30.0-beta.0
27+
k8s.io/component-base v0.30.0-beta.0
2828
k8s.io/klog/v2 v2.120.1
2929
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3030
sigs.k8s.io/yaml v1.4.0
@@ -46,8 +46,8 @@ require (
4646
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4747
github.com/gogo/protobuf v1.3.2 // indirect
4848
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
49-
github.com/golang/protobuf v1.5.3 // indirect
50-
github.com/google/cel-go v0.17.7 // indirect
49+
github.com/golang/protobuf v1.5.4 // indirect
50+
github.com/google/cel-go v0.17.8 // indirect
5151
github.com/google/gnostic-models v0.6.8 // indirect
5252
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5353
github.com/google/uuid v1.3.0 // indirect
@@ -73,23 +73,23 @@ require (
7373
go.opentelemetry.io/otel/trace v1.19.0 // indirect
7474
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
7575
go.uber.org/multierr v1.11.0 // indirect
76-
golang.org/x/net v0.20.0 // indirect
76+
golang.org/x/net v0.21.0 // indirect
7777
golang.org/x/oauth2 v0.16.0 // indirect
7878
golang.org/x/sync v0.6.0 // indirect
79-
golang.org/x/term v0.16.0 // indirect
79+
golang.org/x/term v0.17.0 // indirect
8080
golang.org/x/text v0.14.0 // indirect
8181
golang.org/x/time v0.3.0 // indirect
82-
golang.org/x/tools v0.17.0 // indirect
82+
golang.org/x/tools v0.18.0 // indirect
8383
google.golang.org/appengine v1.6.7 // indirect
8484
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
8585
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
8686
google.golang.org/grpc v1.58.3 // indirect
87-
google.golang.org/protobuf v1.32.0 // indirect
87+
google.golang.org/protobuf v1.33.0 // indirect
8888
gopkg.in/inf.v0 v0.9.1 // indirect
8989
gopkg.in/yaml.v2 v2.4.0 // indirect
9090
gopkg.in/yaml.v3 v3.0.1 // indirect
91-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
92-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
91+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
92+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
9393
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9494
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
9595
)

0 commit comments

Comments
 (0)