Skip to content

Commit 1ed3450

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2883 from sbueringer/pr-bump-to-beta
✨ Bump to k8s.io/* v0.31.0-beta.0
2 parents fcd2fcf + 5942c74 commit 1ed3450

File tree

7 files changed

+124
-128
lines changed

7 files changed

+124
-128
lines changed

‎.gomodcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ upstreamRefs:
55
- k8s.io/apiserver
66
- k8s.io/client-go
77
- k8s.io/component-base
8-
- k8s.io/klog/v2
8+
# k8s.io/klog/v2 -> conflicts with k/k deps
99
# k8s.io/utils -> conflicts with k/k deps
1010

1111
excludedModules:

‎examples/scratch-env/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ require (
1010

1111
require (
1212
github.com/beorn7/perks v1.0.1 // indirect
13-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
13+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1414
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1515
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1616
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
1717
github.com/fsnotify/fsnotify v1.7.0 // indirect
1818
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
19-
github.com/go-logr/logr v1.4.1 // indirect
19+
github.com/go-logr/logr v1.4.2 // indirect
2020
github.com/go-logr/zapr v1.3.0 // indirect
2121
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2222
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -27,7 +27,7 @@ require (
2727
github.com/google/gnostic-models v0.6.8 // indirect
2828
github.com/google/go-cmp v0.6.0 // indirect
2929
github.com/google/gofuzz v1.2.0 // indirect
30-
github.com/google/uuid v1.3.1 // indirect
30+
github.com/google/uuid v1.6.0 // indirect
3131
github.com/imdario/mergo v0.3.6 // indirect
3232
github.com/josharian/intern v1.0.0 // indirect
3333
github.com/json-iterator/go v1.1.12 // indirect
@@ -54,13 +54,13 @@ require (
5454
gopkg.in/inf.v0 v0.9.1 // indirect
5555
gopkg.in/yaml.v2 v2.4.0 // indirect
5656
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/api v0.31.0-alpha.3 // indirect
58-
k8s.io/apiextensions-apiserver v0.31.0-alpha.3 // indirect
59-
k8s.io/apimachinery v0.31.0-alpha.3 // indirect
60-
k8s.io/client-go v0.31.0-alpha.3 // indirect
57+
k8s.io/api v0.31.0-beta.0 // indirect
58+
k8s.io/apiextensions-apiserver v0.31.0-beta.0 // indirect
59+
k8s.io/apimachinery v0.31.0-beta.0 // indirect
60+
k8s.io/client-go v0.31.0-beta.0 // indirect
6161
k8s.io/klog/v2 v2.130.1 // indirect
6262
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
63-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
63+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
6464
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6565
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6666
sigs.k8s.io/yaml v1.4.0 // indirect

‎examples/scratch-env/go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
22
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
3-
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
4-
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
4+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
55
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
66
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
77
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -17,8 +17,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
1717
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
1818
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
1919
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
20-
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
21-
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
20+
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
21+
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2222
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
2323
github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
2424
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
@@ -46,8 +46,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
4646
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4747
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
4848
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
49-
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
50-
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
49+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
50+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5151
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
5252
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
5353
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -89,8 +89,8 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G
8989
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
9090
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
9191
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
92-
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
93-
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
92+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
93+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
9494
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
9595
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
9696
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -170,20 +170,20 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
170170
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
171171
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
172172
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
173-
k8s.io/api v0.31.0-alpha.3 h1:BGZmlRxV27GiPMkUacLAIY9hwu+aopxyggyUe8d3oNo=
174-
k8s.io/api v0.31.0-alpha.3/go.mod h1:DuSHralkv8DUXY90bSPWBvoNlRA8nUJ1fT5lyMG0hp4=
175-
k8s.io/apiextensions-apiserver v0.31.0-alpha.3 h1:VuaSODxQf/g/4DOUolhd8Qv78Cejs9XRG+rZUwBxvzY=
176-
k8s.io/apiextensions-apiserver v0.31.0-alpha.3/go.mod h1:mpm07GF4AzUOKvRYAXWcOlaJ4qF9aQW1q4OqOFNoQ4w=
177-
k8s.io/apimachinery v0.31.0-alpha.3 h1:VPZzsANpbCItljAzvWqK/FDTH3SnEE9cWDlb8DjUOvQ=
178-
k8s.io/apimachinery v0.31.0-alpha.3/go.mod h1:HaB7jl7MnnH0C8g+t13Fw226p3U88ZDog/Dt8pQRZUI=
179-
k8s.io/client-go v0.31.0-alpha.3 h1:g9wbiICMHrFwxl3pGi63v2wPXL4Mk4z0ps6kMRHBcSI=
180-
k8s.io/client-go v0.31.0-alpha.3/go.mod h1:vVK9F/qT7echvzsBfdH5EeH8WH6+SMcY7IbYJCZa6fU=
173+
k8s.io/api v0.31.0-beta.0 h1:4qPGblT8h5w81f+dbj8gbYTnZATmHDRapPcmSfqKJec=
174+
k8s.io/api v0.31.0-beta.0/go.mod h1:0Zff1rZco/hYJZmBdGxE+Q0KBGRxIwPAFK6fHYxjvk8=
175+
k8s.io/apiextensions-apiserver v0.31.0-beta.0 h1:jiCx1fngp4kwV0Z5RNjxdA7uGboTnGPQ8E11wq3dG3U=
176+
k8s.io/apiextensions-apiserver v0.31.0-beta.0/go.mod h1:RLgkSUSiaHGOL8+Oy8hSDrw+f+fhKwg8HCf2avGCzQc=
177+
k8s.io/apimachinery v0.31.0-beta.0 h1:KoBE9f7sPz67HclZC/JgH1pIBvOlMZQAwoHQuriE/5E=
178+
k8s.io/apimachinery v0.31.0-beta.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
179+
k8s.io/client-go v0.31.0-beta.0 h1:op39m8L2YX8cUVTj8Fj+SD09axcxwPbFlipM3x+11fc=
180+
k8s.io/client-go v0.31.0-beta.0/go.mod h1:ZTCtLpZyZDJBji9GGwrzKjR60/lVXvm8WLdgTEqPRw4=
181181
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
182182
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
183183
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
184184
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
185-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
186-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
185+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
186+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
187187
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
188188
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
189189
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
require (
66
github.com/evanphx/json-patch/v5 v5.9.0
77
github.com/fsnotify/fsnotify v1.7.0
8-
github.com/go-logr/logr v1.4.1
8+
github.com/go-logr/logr v1.4.2
99
github.com/go-logr/zapr v1.3.0
1010
github.com/google/go-cmp v0.6.0
1111
github.com/google/gofuzz v1.2.0
@@ -20,13 +20,13 @@ require (
2020
golang.org/x/sys v0.21.0
2121
gomodules.xyz/jsonpatch/v2 v2.4.0
2222
gopkg.in/evanphx/json-patch.v4 v4.12.0 // Using v4 to match upstream
23-
k8s.io/api v0.31.0-alpha.3
24-
k8s.io/apiextensions-apiserver v0.31.0-alpha.3
25-
k8s.io/apimachinery v0.31.0-alpha.3
26-
k8s.io/apiserver v0.31.0-alpha.3
27-
k8s.io/client-go v0.31.0-alpha.3
23+
k8s.io/api v0.31.0-beta.0
24+
k8s.io/apiextensions-apiserver v0.31.0-beta.0
25+
k8s.io/apimachinery v0.31.0-beta.0
26+
k8s.io/apiserver v0.31.0-beta.0
27+
k8s.io/client-go v0.31.0-beta.0
2828
k8s.io/klog/v2 v2.130.1
29-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
29+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3030
sigs.k8s.io/yaml v1.4.0
3131
)
3232

@@ -35,11 +35,11 @@ require (
3535
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3636
github.com/beorn7/perks v1.0.1 // indirect
3737
github.com/blang/semver/v4 v4.0.0 // indirect
38-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
39-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
38+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
39+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4040
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4141
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
42-
github.com/felixge/httpsnoop v1.0.3 // indirect
42+
github.com/felixge/httpsnoop v1.0.4 // indirect
4343
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4444
github.com/go-logr/stdr v1.2.2 // indirect
4545
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -52,8 +52,8 @@ require (
5252
github.com/google/cel-go v0.20.1 // indirect
5353
github.com/google/gnostic-models v0.6.8 // indirect
5454
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
55-
github.com/google/uuid v1.3.1 // indirect
56-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
55+
github.com/google/uuid v1.6.0 // indirect
56+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5757
github.com/imdario/mergo v0.3.6 // indirect
5858
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5959
github.com/josharian/intern v1.0.0 // indirect
@@ -69,14 +69,14 @@ require (
6969
github.com/spf13/pflag v1.0.5 // indirect
7070
github.com/stoewer/go-strcase v1.2.0 // indirect
7171
github.com/x448/float16 v0.8.4 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
73-
go.opentelemetry.io/otel v1.20.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
77-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
78-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
79-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
72+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
73+
go.opentelemetry.io/otel v1.28.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
75+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
76+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
77+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
78+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
79+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8080
go.uber.org/multierr v1.11.0 // indirect
8181
golang.org/x/net v0.26.0 // indirect
8282
golang.org/x/oauth2 v0.21.0 // indirect
@@ -85,14 +85,14 @@ require (
8585
golang.org/x/text v0.16.0 // indirect
8686
golang.org/x/time v0.3.0 // indirect
8787
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
88-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
89-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
90-
google.golang.org/grpc v1.59.0 // indirect
88+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
89+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
90+
google.golang.org/grpc v1.65.0 // indirect
9191
google.golang.org/protobuf v1.34.2 // indirect
9292
gopkg.in/inf.v0 v0.9.1 // indirect
9393
gopkg.in/yaml.v2 v2.4.0 // indirect
9494
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
k8s.io/component-base v0.31.0-alpha.3 // indirect
95+
k8s.io/component-base v0.31.0-beta.0 // indirect
9696
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
9797
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
9898
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)