Skip to content

Commit 9e4da61

Browse files
authored
Merge pull request #172 from dgrisonnet/bump-1.30
Bump Kubernetes to v1.30.0
2 parents 001a3e6 + b374786 commit 9e4da61

File tree

9 files changed

+892
-224
lines changed

9 files changed

+892
-224
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ pkg/generated/openapi/%/zz_generated.openapi.go: go.mod go.sum
2727
go install -mod=readonly k8s.io/kube-openapi/cmd/openapi-gen
2828
$(GOPATH)/bin/openapi-gen --logtostderr \
2929
--go-header-file ./hack/boilerplate.go.txt \
30-
--output-package ./$(@D) \
31-
--output-file-base zz_generated.openapi \
32-
--output-base ./$(@D) \
30+
--output-pkg ./$(@D) \
31+
--output-file zz_generated.openapi.go \
32+
--output-dir ./$(@D) \
3333
-r /dev/null \
3434
$(INPUTS)
3535

go.mod

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module sigs.k8s.io/custom-metrics-apiserver
22

3-
go 1.21
3+
go 1.22.1
44

5-
toolchain go1.21.8
5+
toolchain go1.22.2
66

77
require (
8-
github.com/emicklei/go-restful/v3 v3.11.0
8+
github.com/emicklei/go-restful/v3 v3.12.0
99
github.com/google/addlicense v1.1.1
1010
github.com/spf13/pflag v1.0.5
1111
github.com/stretchr/testify v1.9.0
12-
k8s.io/api v0.29.4
13-
k8s.io/apimachinery v0.29.4
14-
k8s.io/apiserver v0.29.4
15-
k8s.io/client-go v0.29.4
16-
k8s.io/component-base v0.29.4
17-
k8s.io/klog/v2 v2.110.1
18-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
19-
k8s.io/metrics v0.29.4
20-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
12+
k8s.io/api v0.30.0
13+
k8s.io/apimachinery v0.30.0
14+
k8s.io/apiserver v0.30.0
15+
k8s.io/client-go v0.30.0
16+
k8s.io/component-base v0.30.0
17+
k8s.io/klog/v2 v2.120.1
18+
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
19+
k8s.io/metrics v0.30.0
20+
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22
2121
)
2222

2323
require (
@@ -43,7 +43,7 @@ require (
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4545
github.com/golang/protobuf v1.5.4 // indirect
46-
github.com/google/cel-go v0.17.7 // indirect
46+
github.com/google/cel-go v0.17.8 // indirect
4747
github.com/google/gnostic-models v0.6.8 // indirect
4848
github.com/google/go-cmp v0.6.0 // indirect
4949
github.com/google/gofuzz v1.2.0 // indirect
@@ -81,17 +81,17 @@ require (
8181
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
8282
go.uber.org/multierr v1.11.0 // indirect
8383
go.uber.org/zap v1.26.0 // indirect
84-
golang.org/x/crypto v0.21.0 // indirect
84+
golang.org/x/crypto v0.22.0 // indirect
8585
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
86-
golang.org/x/mod v0.14.0 // indirect
87-
golang.org/x/net v0.23.0 // indirect
86+
golang.org/x/mod v0.17.0 // indirect
87+
golang.org/x/net v0.24.0 // indirect
8888
golang.org/x/oauth2 v0.15.0 // indirect
89-
golang.org/x/sync v0.5.0 // indirect
90-
golang.org/x/sys v0.18.0 // indirect
91-
golang.org/x/term v0.18.0 // indirect
89+
golang.org/x/sync v0.7.0 // indirect
90+
golang.org/x/sys v0.19.0 // indirect
91+
golang.org/x/term v0.19.0 // indirect
9292
golang.org/x/text v0.14.0 // indirect
9393
golang.org/x/time v0.5.0 // indirect
94-
golang.org/x/tools v0.16.1 // indirect
94+
golang.org/x/tools v0.20.0 // indirect
9595
google.golang.org/appengine v1.6.8 // indirect
9696
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
9797
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
@@ -102,8 +102,8 @@ require (
102102
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
103103
gopkg.in/yaml.v2 v2.4.0 // indirect
104104
gopkg.in/yaml.v3 v3.0.1 // indirect
105-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
106-
k8s.io/kms v0.29.4 // indirect
105+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
106+
k8s.io/kms v0.30.0 // indirect
107107
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
108108
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109109
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

go.sum

+50-60
Large diffs are not rendered by default.

pkg/generated/openapi/core/pkg/generated/openapi/core/zz_generated.openapi.go

-32
This file was deleted.

0 commit comments

Comments
 (0)