Skip to content

Commit 87b5566

Browse files
naemononaemono
committed
Update k8s dependencies to v0.32.2
Upgrade golangci-lint. Fix additional linter issues. increase golangci-lint deadline/timeout change to timeout instead of deadline. update openapi generated file.
1 parent 1ff5f1c commit 87b5566

File tree

8 files changed

+290
-260
lines changed

8 files changed

+290
-260
lines changed

‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
deadline: 5m
2+
timeout: 7m
33

44
linters:
55
disable-all: true

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GOPATH:=$(shell go env GOPATH)
77

88
VERSION?=latest
99

10-
GOLANGCI_VERSION:=1.55.2
10+
GOLANGCI_VERSION:=1.63.4
1111

1212
.PHONY: all
1313
all: build-test-adapter

‎go.mod

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

3-
go 1.22.1
3+
go 1.23.0
44

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

77
require (
88
github.com/emicklei/go-restful/v3 v3.12.1
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.31.2
13-
k8s.io/apimachinery v0.31.2
14-
k8s.io/apiserver v0.31.2
15-
k8s.io/client-go v0.31.2
16-
k8s.io/component-base v0.31.2
12+
k8s.io/api v0.32.2
13+
k8s.io/apimachinery v0.32.2
14+
k8s.io/apiserver v0.32.2
15+
k8s.io/client-go v0.32.2
16+
k8s.io/component-base v0.32.2
1717
k8s.io/klog/v2 v2.130.1
18-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
19-
k8s.io/metrics v0.31.2
20-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
18+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
19+
k8s.io/metrics v0.32.2
20+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2121
)
2222

2323
require (
24+
cel.dev/expr v0.18.0 // indirect
2425
github.com/NYTimes/gziphandler v1.1.1 // indirect
2526
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2627
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -37,20 +38,19 @@ require (
3738
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3839
github.com/go-logr/logr v1.4.2 // indirect
3940
github.com/go-logr/stdr v1.2.2 // indirect
40-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
41+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4142
github.com/go-openapi/jsonreference v0.20.4 // indirect
42-
github.com/go-openapi/swag v0.22.7 // indirect
43+
github.com/go-openapi/swag v0.23.0 // indirect
4344
github.com/gogo/protobuf v1.3.2 // indirect
44-
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.20.1 // indirect
46+
github.com/google/btree v1.0.1 // indirect
47+
github.com/google/cel-go v0.22.0 // indirect
4748
github.com/google/gnostic-models v0.6.8 // indirect
4849
github.com/google/go-cmp v0.6.0 // indirect
4950
github.com/google/gofuzz v1.2.0 // indirect
5051
github.com/google/uuid v1.6.0 // indirect
5152
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5253
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
53-
github.com/imdario/mergo v0.3.16 // indirect
5454
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5555
github.com/josharian/intern v1.0.0 // indirect
5656
github.com/json-iterator/go v1.1.12 // indirect
@@ -67,9 +67,9 @@ require (
6767
github.com/spf13/cobra v1.8.1 // indirect
6868
github.com/stoewer/go-strcase v1.3.0 // indirect
6969
github.com/x448/float16 v0.8.4 // indirect
70-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
71-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
72-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
70+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
71+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
72+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
7373
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
7474
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
7575
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -80,32 +80,30 @@ require (
8080
go.opentelemetry.io/otel/trace v1.28.0 // indirect
8181
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8282
go.uber.org/multierr v1.11.0 // indirect
83-
go.uber.org/zap v1.26.0 // indirect
84-
golang.org/x/crypto v0.24.0 // indirect
85-
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
86-
golang.org/x/mod v0.17.0 // indirect
87-
golang.org/x/net v0.26.0 // indirect
88-
golang.org/x/oauth2 v0.21.0 // indirect
89-
golang.org/x/sync v0.7.0 // indirect
90-
golang.org/x/sys v0.21.0 // indirect
91-
golang.org/x/term v0.21.0 // indirect
92-
golang.org/x/text v0.16.0 // indirect
93-
golang.org/x/time v0.5.0 // indirect
94-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
95-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
96-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
97-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
83+
go.uber.org/zap v1.27.0 // indirect
84+
golang.org/x/crypto v0.28.0 // indirect
85+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
86+
golang.org/x/mod v0.21.0 // indirect
87+
golang.org/x/net v0.30.0 // indirect
88+
golang.org/x/oauth2 v0.23.0 // indirect
89+
golang.org/x/sync v0.8.0 // indirect
90+
golang.org/x/sys v0.26.0 // indirect
91+
golang.org/x/term v0.25.0 // indirect
92+
golang.org/x/text v0.19.0 // indirect
93+
golang.org/x/time v0.7.0 // indirect
94+
golang.org/x/tools v0.26.0 // indirect
95+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
96+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
9897
google.golang.org/grpc v1.65.0 // indirect
99-
google.golang.org/protobuf v1.34.2 // indirect
98+
google.golang.org/protobuf v1.35.1 // indirect
10099
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
101100
gopkg.in/inf.v0 v0.9.1 // indirect
102101
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
103-
gopkg.in/yaml.v2 v2.4.0 // indirect
104102
gopkg.in/yaml.v3 v3.0.1 // indirect
105-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
106-
k8s.io/kms v0.31.2 // indirect
107-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
108-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
103+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
104+
k8s.io/kms v0.32.2 // indirect
105+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
106+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
107+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
110108
sigs.k8s.io/yaml v1.4.0 // indirect
111109
)

0 commit comments

Comments
 (0)