Skip to content

Commit ad56f48

Browse files
yangjunmyfm192085yangjunmyfm192085
committed
bump the gomod-dependencies
1 parent d512aa4 commit ad56f48

File tree

5 files changed

+190
-207
lines changed

5 files changed

+190
-207
lines changed

Diff for: ‎cmd/metrics-server/app/options/options.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
2323
genericapiserver "k8s.io/apiserver/pkg/server"
2424
genericoptions "k8s.io/apiserver/pkg/server/options"
25+
utilversion "k8s.io/apiserver/pkg/util/version"
2526
"k8s.io/client-go/pkg/version"
2627
"k8s.io/client-go/rest"
2728
"k8s.io/client-go/tools/clientcmd"
@@ -149,14 +150,14 @@ func (o Options) ApiserverConfig() (*genericapiserver.Config, error) {
149150
}
150151

151152
versionGet := version.Get()
152-
serverConfig.Version = &versionGet
153153
// enable OpenAPI schemas
154154
serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme))
155155
serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme))
156156
serverConfig.OpenAPIConfig.Info.Title = "Kubernetes metrics-server"
157157
serverConfig.OpenAPIV3Config.Info.Title = "Kubernetes metrics-server"
158-
serverConfig.OpenAPIConfig.Info.Version = strings.Split(serverConfig.Version.String(), "-")[0] // TODO(directxman12): remove this once autosetting this doesn't require security definitions
159-
serverConfig.OpenAPIV3Config.Info.Version = strings.Split(serverConfig.Version.String(), "-")[0]
158+
serverConfig.OpenAPIConfig.Info.Version = strings.Split(versionGet.String(), "-")[0] // TODO(directxman12): remove this once autosetting this doesn't require security definitions
159+
serverConfig.OpenAPIV3Config.Info.Version = strings.Split(versionGet.String(), "-")[0]
160+
serverConfig.EffectiveVersion = utilversion.DefaultKubeEffectiveVersion()
160161

161162
return serverConfig, nil
162163
}

Diff for: ‎go.mod

+53-52
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ toolchain go1.22.5
66

77
require (
88
github.com/google/go-cmp v0.6.0
9-
github.com/onsi/ginkgo/v2 v2.19.1
10-
github.com/onsi/gomega v1.34.0
11-
github.com/prometheus/common v0.46.0
12-
github.com/prometheus/prometheus v0.48.1
9+
github.com/onsi/ginkgo/v2 v2.20.0
10+
github.com/onsi/gomega v1.34.1
11+
github.com/prometheus/common v0.55.0
12+
github.com/prometheus/prometheus v0.54.0
1313
github.com/spf13/cobra v1.8.1
1414
github.com/spf13/pflag v1.0.5
15-
k8s.io/api v0.30.3
16-
k8s.io/apimachinery v0.30.3
17-
k8s.io/apiserver v0.30.3
18-
k8s.io/client-go v0.30.3
19-
k8s.io/component-base v0.30.3
15+
k8s.io/api v0.31.0
16+
k8s.io/apimachinery v0.31.0
17+
k8s.io/apiserver v0.31.0
18+
k8s.io/client-go v0.31.0
19+
k8s.io/component-base v0.31.0
2020
k8s.io/klog/v2 v2.130.1
2121
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
22-
k8s.io/metrics v0.30.3
22+
k8s.io/metrics v0.31.0
2323
)
2424

2525
require (
2626
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2727
github.com/NYTimes/gziphandler v1.1.1 // indirect
28-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
28+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2929
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3030
github.com/beorn7/perks v1.0.1 // indirect
3131
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -35,9 +35,9 @@ require (
3535
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3636
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3737
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
38-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3938
github.com/felixge/httpsnoop v1.0.4 // indirect
4039
github.com/fsnotify/fsnotify v1.7.0 // indirect
40+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4141
github.com/go-logr/logr v1.4.2 // indirect
4242
github.com/go-logr/stdr v1.2.2 // indirect
4343
github.com/go-logr/zapr v1.3.0 // indirect
@@ -48,69 +48,70 @@ require (
4848
github.com/gogo/protobuf v1.3.2 // indirect
4949
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5050
github.com/golang/protobuf v1.5.4 // indirect
51-
github.com/google/cel-go v0.17.8 // indirect
51+
github.com/google/cel-go v0.20.1 // indirect
5252
github.com/google/gnostic-models v0.6.8 // indirect
5353
github.com/google/gofuzz v1.2.0 // indirect
54-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
54+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
5555
github.com/google/uuid v1.6.0 // indirect
5656
github.com/gorilla/websocket v1.5.0 // indirect
57-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
57+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5858
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
59-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
59+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6060
github.com/imdario/mergo v0.3.16 // indirect
6161
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6262
github.com/josharian/intern v1.0.0 // indirect
6363
github.com/json-iterator/go v1.1.12 // indirect
6464
github.com/mailru/easyjson v0.7.7 // indirect
65-
github.com/moby/spdystream v0.2.0 // indirect
66-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
65+
github.com/moby/spdystream v0.4.0 // indirect
66+
github.com/moby/term v0.5.0 // indirect
6767
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6868
github.com/modern-go/reflect2 v1.0.2 // indirect
6969
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7070
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7171
github.com/pkg/errors v0.9.1 // indirect
72-
github.com/prometheus/client_golang v1.18.0 // indirect
73-
github.com/prometheus/client_model v0.5.0 // indirect
74-
github.com/prometheus/procfs v0.12.0 // indirect
72+
github.com/prometheus/client_golang v1.19.1 // indirect
73+
github.com/prometheus/client_model v0.6.1 // indirect
74+
github.com/prometheus/procfs v0.15.1 // indirect
7575
github.com/stoewer/go-strcase v1.2.0 // indirect
76-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
77-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
78-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
79-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
80-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
81-
go.opentelemetry.io/otel v1.21.0 // indirect
82-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
83-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
84-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
85-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
86-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
87-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
76+
github.com/x448/float16 v0.8.4 // indirect
77+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
78+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
79+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
80+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
81+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
82+
go.opentelemetry.io/otel v1.28.0 // indirect
83+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
84+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
85+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
86+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
87+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
88+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8889
go.uber.org/multierr v1.11.0 // indirect
8990
go.uber.org/zap v1.26.0 // indirect
90-
golang.org/x/crypto v0.23.0 // indirect
91-
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
92-
golang.org/x/net v0.25.0 // indirect
93-
golang.org/x/oauth2 v0.16.0 // indirect
94-
golang.org/x/sync v0.7.0 // indirect
95-
golang.org/x/sys v0.21.0 // indirect
96-
golang.org/x/term v0.20.0 // indirect
97-
golang.org/x/text v0.15.0 // indirect
98-
golang.org/x/time v0.3.0 // indirect
99-
golang.org/x/tools v0.21.0 // indirect
100-
google.golang.org/appengine v1.6.8 // indirect
91+
golang.org/x/crypto v0.26.0 // indirect
92+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
93+
golang.org/x/net v0.28.0 // indirect
94+
golang.org/x/oauth2 v0.21.0 // indirect
95+
golang.org/x/sync v0.8.0 // indirect
96+
golang.org/x/sys v0.23.0 // indirect
97+
golang.org/x/term v0.23.0 // indirect
98+
golang.org/x/text v0.17.0 // indirect
99+
golang.org/x/time v0.5.0 // indirect
100+
golang.org/x/tools v0.24.0 // indirect
101101
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
102-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
103-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
104-
google.golang.org/grpc v1.60.1 // indirect
105-
google.golang.org/protobuf v1.34.1 // indirect
102+
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
103+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
104+
google.golang.org/grpc v1.65.0 // indirect
105+
google.golang.org/protobuf v1.34.2 // indirect
106+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
106107
gopkg.in/inf.v0 v0.9.1 // indirect
107108
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
108109
gopkg.in/yaml.v2 v2.4.0 // indirect
109110
gopkg.in/yaml.v3 v3.0.1 // indirect
110-
k8s.io/kms v0.30.3 // indirect
111-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
112-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
111+
k8s.io/kms v0.31.0 // indirect
112+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
113+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
113114
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
114115
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
115-
sigs.k8s.io/yaml v1.3.0 // indirect
116+
sigs.k8s.io/yaml v1.4.0 // indirect
116117
)

0 commit comments

Comments
 (0)