Skip to content

Commit 62bf29f

Browse files
committed
Bump otelgrpc otelhttp crypto net grpc protobuf
1 parent a938798 commit 62bf29f

File tree

5 files changed

+355
-787
lines changed

5 files changed

+355
-787
lines changed

cmd/metrics-server/app/options/options.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,11 @@ func (o Options) ApiserverConfig() (*genericapiserver.Config, error) {
132132
serverConfig.Version = &versionGet
133133
// enable OpenAPI schemas
134134
serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme))
135+
serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme))
135136
serverConfig.OpenAPIConfig.Info.Title = "Kubernetes metrics-server"
137+
serverConfig.OpenAPIV3Config.Info.Title = "Kubernetes metrics-server"
136138
serverConfig.OpenAPIConfig.Info.Version = strings.Split(serverConfig.Version.String(), "-")[0] // TODO(directxman12): remove this once autosetting this doesn't require security definitions
139+
serverConfig.OpenAPIV3Config.Info.Version = strings.Split(versionGet.String(), "-")[0]
137140

138141
return serverConfig, nil
139142
}

go.mod

Lines changed: 92 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,127 @@
11
module sigs.k8s.io/metrics-server
22

3-
go 1.19
3+
go 1.23.3
44

55
require (
6-
github.com/google/addlicense v1.0.0
7-
github.com/google/go-cmp v0.5.9
8-
github.com/onsi/ginkgo v1.14.0
9-
github.com/onsi/gomega v1.10.1
10-
github.com/prometheus/common v0.31.0
6+
github.com/google/addlicense v1.1.1
7+
github.com/google/go-cmp v0.6.0
8+
github.com/onsi/ginkgo v1.16.5
9+
github.com/onsi/gomega v1.30.0
10+
github.com/prometheus/common v0.46.0
1111
github.com/prometheus/prometheus v2.5.0+incompatible
12-
github.com/spf13/cobra v1.6.1
12+
github.com/spf13/cobra v1.8.1
1313
github.com/spf13/pflag v1.0.5
14-
golang.org/x/perf v0.0.0-20210220033136-40a54f11e909
15-
k8s.io/api v0.23.17
16-
k8s.io/apimachinery v0.23.17
17-
k8s.io/apiserver v0.23.17
18-
k8s.io/client-go v0.23.17
19-
k8s.io/component-base v0.23.17
20-
k8s.io/klog/v2 v2.60.1
21-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
22-
k8s.io/metrics v0.23.17
23-
sigs.k8s.io/logtools v0.4.1
24-
sigs.k8s.io/mdtoc v1.1.0
14+
golang.org/x/perf v0.0.0-20250106172127-400946f43c82
15+
k8s.io/api v0.29.8
16+
k8s.io/apimachinery v0.29.8
17+
k8s.io/apiserver v0.29.8
18+
k8s.io/client-go v0.29.8
19+
k8s.io/component-base v0.29.8
20+
k8s.io/klog/v2 v2.120.0
21+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
22+
k8s.io/metrics v0.29.8
23+
sigs.k8s.io/logtools v0.9.0
24+
sigs.k8s.io/mdtoc v1.4.0
2525
)
2626

2727
require (
28-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2928
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
30-
github.com/BurntSushi/toml v1.2.1 // indirect
29+
github.com/BurntSushi/toml v0.3.1 // indirect
3130
github.com/NYTimes/gziphandler v1.1.1 // indirect
32-
github.com/PuerkitoBio/purell v1.2.0 // indirect
31+
github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect
32+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
33+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
34-
github.com/blang/semver v3.5.1+incompatible // indirect
35-
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
35+
github.com/blang/semver/v4 v4.0.0 // indirect
36+
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
37+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3638
github.com/cespare/xxhash v1.1.0 // indirect
3739
github.com/cespare/xxhash/v2 v2.2.0 // indirect
38-
github.com/coreos/go-semver v0.3.0 // indirect
39-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
40-
github.com/davecgh/go-spew v1.1.1 // indirect
41-
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
42-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
43-
github.com/felixge/httpsnoop v1.0.1 // indirect
44-
github.com/fsnotify/fsnotify v1.4.9 // indirect
45-
github.com/go-logr/logr v1.2.0 // indirect
46-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
47-
github.com/go-openapi/jsonreference v0.19.5 // indirect
48-
github.com/go-openapi/swag v0.19.14 // indirect
40+
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
41+
github.com/coreos/go-semver v0.3.1 // indirect
42+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
43+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
44+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
45+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
46+
github.com/felixge/httpsnoop v1.0.4 // indirect
47+
github.com/fsnotify/fsnotify v1.7.0 // indirect
48+
github.com/go-logr/logr v1.4.1 // indirect
49+
github.com/go-logr/stdr v1.2.2 // indirect
50+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
51+
github.com/go-openapi/jsonreference v0.20.2 // indirect
52+
github.com/go-openapi/swag v0.22.4 // indirect
4953
github.com/gogo/protobuf v1.3.2 // indirect
5054
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
51-
github.com/golang/protobuf v1.5.2 // indirect
52-
github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 // indirect
55+
github.com/golang/protobuf v1.5.4 // indirect
56+
github.com/gomarkdown/markdown v0.0.0-20240328165702-4d01890c35c0 // indirect
57+
github.com/google/cel-go v0.17.7 // indirect
58+
github.com/google/gnostic-models v0.6.8 // indirect
5359
github.com/google/gofuzz v1.2.0 // indirect
54-
github.com/google/uuid v1.3.0 // indirect
55-
github.com/googleapis/gnostic v0.5.5 // indirect
60+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
61+
github.com/google/uuid v1.3.1 // indirect
5662
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
57-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
58-
github.com/imdario/mergo v0.3.13 // indirect
63+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
64+
github.com/imdario/mergo v0.3.16 // indirect
5965
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6066
github.com/josharian/intern v1.0.0 // indirect
6167
github.com/json-iterator/go v1.1.12 // indirect
62-
github.com/mailru/easyjson v0.7.6 // indirect
63-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
68+
github.com/mailru/easyjson v0.7.7 // indirect
6469
github.com/mmarkdown/mmark v2.0.40+incompatible // indirect
6570
github.com/moby/spdystream v0.2.0 // indirect
66-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
71+
github.com/moby/term v0.5.0 // indirect
6772
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6873
github.com/modern-go/reflect2 v1.0.2 // indirect
6974
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
75+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7076
github.com/nxadm/tail v1.4.8 // indirect
77+
github.com/onsi/ginkgo/v2 v2.14.0 // indirect
7178
github.com/pkg/errors v0.9.1 // indirect
72-
github.com/prometheus/client_golang v1.11.1 // indirect
73-
github.com/prometheus/client_model v0.2.0 // indirect
74-
github.com/prometheus/procfs v0.6.0 // indirect
75-
github.com/spf13/afero v1.9.4 // indirect
76-
github.com/stretchr/testify v1.8.2 // indirect
77-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
78-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
79-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
80-
go.opentelemetry.io/contrib v0.20.0 // indirect
81-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
82-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
83-
go.opentelemetry.io/otel v0.20.0 // indirect
84-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
85-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
86-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
87-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
88-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
89-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
90-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
91-
go.uber.org/atomic v1.7.0 // indirect
92-
go.uber.org/multierr v1.6.0 // indirect
79+
github.com/prometheus/client_golang v1.18.0 // indirect
80+
github.com/prometheus/client_model v0.5.0 // indirect
81+
github.com/prometheus/procfs v0.12.0 // indirect
82+
github.com/stoewer/go-strcase v1.2.0 // indirect
83+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
84+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
85+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
86+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
87+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
88+
go.opentelemetry.io/otel v1.21.0 // indirect
89+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
90+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
92+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
93+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
94+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
95+
go.uber.org/atomic v1.11.0 // indirect
96+
go.uber.org/multierr v1.11.0 // indirect
9397
go.uber.org/zap v1.19.0 // indirect
94-
golang.org/x/crypto v0.6.0 // indirect
95-
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
96-
golang.org/x/mod v0.8.0 // indirect
97-
golang.org/x/net v0.7.0 // indirect
98-
golang.org/x/oauth2 v0.5.0 // indirect
99-
golang.org/x/sync v0.1.0 // indirect
100-
golang.org/x/sys v0.5.0 // indirect
101-
golang.org/x/term v0.5.0 // indirect
102-
golang.org/x/text v0.7.0 // indirect
98+
golang.org/x/crypto v0.32.0 // indirect
99+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
100+
golang.org/x/mod v0.17.0 // indirect
101+
golang.org/x/net v0.34.0 // indirect
102+
golang.org/x/oauth2 v0.25.0 // indirect
103+
golang.org/x/sync v0.10.0 // indirect
104+
golang.org/x/sys v0.29.0 // indirect
105+
golang.org/x/term v0.28.0 // indirect
106+
golang.org/x/text v0.21.0 // indirect
103107
golang.org/x/time v0.3.0 // indirect
104-
golang.org/x/tools v0.6.0 // indirect
105-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
106-
google.golang.org/appengine v1.6.7 // indirect
107-
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect
108-
google.golang.org/grpc v1.50.1 // indirect
109-
google.golang.org/protobuf v1.28.1 // indirect
108+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
109+
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
112+
google.golang.org/grpc v1.59.0 // indirect
113+
google.golang.org/protobuf v1.33.0 // indirect
110114
gopkg.in/inf.v0 v0.9.1 // indirect
111-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
115+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
112116
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
113117
gopkg.in/yaml.v2 v2.4.0 // indirect
114118
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
116-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
117-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
118-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
119-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
120-
sigs.k8s.io/yaml v1.2.0 // indirect
119+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
120+
k8s.io/kms v0.29.8 // indirect
121+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
122+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
123+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
124+
sigs.k8s.io/release-utils v0.8.3 // indirect
125+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
126+
sigs.k8s.io/yaml v1.3.0 // indirect
121127
)

0 commit comments

Comments
 (0)