Skip to content

Commit 3a0eec4

Browse files
authored
Merge pull request #2720 from mrueg/k8s-1.33
chore: Build with k8s 1.33
2 parents d680e8c + 72ed667 commit 3a0eec4

File tree

6 files changed

+95
-87
lines changed

6 files changed

+95
-87
lines changed

.golangci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,18 @@ linters:
2424
text: 'G104:'
2525
- linters:
2626
- revive
27-
text: 'package-comments:'
27+
text: 'package-comments:|var-naming:'
28+
# This needs to stay as long as we support exposing v1.endpoints metrics
29+
- linters:
30+
- staticcheck
31+
text: 'SA1019: v1.Endpoint'
32+
path: 'internal/store/endpoint.*.go|internal/store/builder.go'
33+
# TODO: Use functions with context https://github.com/kubernetes/kube-state-metrics/issues/2721
34+
- linters:
35+
- staticcheck
36+
text: 'SA1019: .*List|Watch'
37+
path: 'pkg/sharding/listwatch.go|pkg/watch/watch.go'
38+
2839
paths:
2940
- third_party$
3041
- builtin$

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Generally, it is recommended to use the latest release of kube-state-metrics. If
8484
| **v2.14.0** | v1.31 |
8585
| **v2.15.0** | v1.32 |
8686
| **v2.16.0** | v1.32 |
87-
| **main** | v1.32 |
87+
| **main** | v1.33 |
8888

8989
#### Resource group version compatibility
9090

data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ compat:
1616
- version: "v2.16.0"
1717
kubernetes: "1.32"
1818
- version: "main"
19-
kubernetes: "1.32"
19+
kubernetes: "1.33"

go.mod

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ require (
1919
github.com/spf13/cobra v1.9.1
2020
github.com/spf13/viper v1.20.1
2121
github.com/stretchr/testify v1.10.0
22-
k8s.io/api v0.32.6
23-
k8s.io/apimachinery v0.32.6
24-
k8s.io/client-go v0.32.6
25-
k8s.io/component-base v0.32.6
22+
k8s.io/api v0.33.3
23+
k8s.io/apimachinery v0.33.3
24+
k8s.io/client-go v0.33.3
25+
k8s.io/component-base v0.33.3
2626
k8s.io/klog/v2 v2.130.1
27-
k8s.io/sample-controller v0.32.6
27+
k8s.io/sample-controller v0.33.3
2828
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
29-
sigs.k8s.io/controller-runtime v0.20.4
29+
sigs.k8s.io/controller-runtime v0.21.0
3030
sigs.k8s.io/yaml v1.6.0
3131
)
3232

3333
require (
34-
cel.dev/expr v0.18.0 // indirect
34+
cel.dev/expr v0.19.1 // indirect
3535
cloud.google.com/go v0.116.0 // indirect
3636
cloud.google.com/go/auth v0.13.0 // indirect
3737
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
@@ -61,7 +61,6 @@ require (
6161
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
6262
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6363
github.com/armon/go-metrics v0.4.1 // indirect
64-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
6564
github.com/aws/aws-sdk-go v1.55.5 // indirect
6665
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
6766
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
@@ -114,15 +113,13 @@ require (
114113
github.com/go-openapi/jsonpointer v0.21.0 // indirect
115114
github.com/go-openapi/jsonreference v0.20.2 // indirect
116115
github.com/go-openapi/swag v0.23.0 // indirect
117-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
116+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
118117
github.com/gogo/protobuf v1.3.2 // indirect
119118
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
120119
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
121-
github.com/golang/protobuf v1.5.4 // indirect
122-
github.com/google/cel-go v0.22.0 // indirect
123-
github.com/google/gnostic-models v0.6.8 // indirect
120+
github.com/google/cel-go v0.23.2 // indirect
121+
github.com/google/gnostic-models v0.6.9 // indirect
124122
github.com/google/go-jsonnet v0.20.0 // indirect
125-
github.com/google/gofuzz v1.2.0 // indirect
126123
github.com/google/s2a-go v0.1.8 // indirect
127124
github.com/google/uuid v1.6.0 // indirect
128125
github.com/google/wire v0.6.0 // indirect
@@ -206,8 +203,8 @@ require (
206203
go.opencensus.io v0.24.0 // indirect
207204
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
208205
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
209-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
210-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
206+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
207+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
211208
go.opentelemetry.io/otel v1.33.0 // indirect
212209
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
213210
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
@@ -223,17 +220,17 @@ require (
223220
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
224221
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
225222
gocloud.dev v0.40.0 // indirect
226-
golang.org/x/crypto v0.38.0 // indirect
223+
golang.org/x/crypto v0.40.0 // indirect
227224
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
228-
golang.org/x/mod v0.21.0 // indirect
229-
golang.org/x/net v0.40.0 // indirect
225+
golang.org/x/mod v0.25.0 // indirect
226+
golang.org/x/net v0.41.0 // indirect
230227
golang.org/x/oauth2 v0.30.0 // indirect
231228
golang.org/x/perf v0.0.0-20250214215153-c95ad7d5b636 // indirect
232-
golang.org/x/sync v0.14.0 // indirect
233-
golang.org/x/sys v0.33.0 // indirect
234-
golang.org/x/term v0.32.0 // indirect
235-
golang.org/x/text v0.25.0 // indirect
236-
golang.org/x/time v0.8.0 // indirect
229+
golang.org/x/sync v0.16.0 // indirect
230+
golang.org/x/sys v0.34.0 // indirect
231+
golang.org/x/term v0.33.0 // indirect
232+
golang.org/x/text v0.27.0 // indirect
233+
golang.org/x/time v0.9.0 // indirect
237234
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
238235
google.golang.org/api v0.215.0 // indirect
239236
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
@@ -249,11 +246,12 @@ require (
249246
gopkg.in/yaml.v2 v2.4.0 // indirect
250247
gopkg.in/yaml.v3 v3.0.1 // indirect
251248
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
252-
k8s.io/apiserver v0.32.1 // indirect
253-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
254-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
249+
k8s.io/apiserver v0.33.0 // indirect
250+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
251+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
255252
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
256-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
253+
sigs.k8s.io/randfill v1.0.0 // indirect
254+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
257255
)
258256

259257
tool (

0 commit comments

Comments
 (0)