Skip to content

Commit ef42075

Browse files
zhanggbjzhanggbj
authored
Merge pull request #1445 from zhanggbj/bump_k8s_group_1.33
🌱 Bump the Kubernetes group to v0.33.0-beta.0
2 parents ef0252b + b436f8a commit ef42075

File tree

9 files changed

+231
-234
lines changed

9 files changed

+231
-234
lines changed

‎cluster/images/controller-manager/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.23.0
17+
ARG GOLANG_IMAGE=golang:1.24.0
1818

1919
# The distroless image on which the CPI manager image is built.
2020
ARG DISTROLESS_IMAGE=gcr.io/distroless/static-debian11:latest
@@ -45,7 +45,7 @@ RUN go build -a -ldflags="-w -s -extldflags=static -X main.version=${VERSION}" -
4545
################################################################################
4646
# Copy the manager into the distroless image.
4747
FROM ${DISTROLESS_IMAGE}
48-
LABEL maintainer="Yike Wang <yikew@vmware.com>"
48+
LABEL maintainer="Gong Zhang <gong.zhang@broadcom.com>"
4949

5050
USER nobody
5151

‎go.mod

+39-42
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module k8s.io/cloud-provider-vsphere
22

3-
go 1.23.0
4-
5-
toolchain go1.23.3
3+
go 1.24.0
64

75
replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v1.8.6
86

@@ -11,7 +9,7 @@ require (
119
github.com/golang/mock v1.6.0
1210
github.com/google/uuid v1.6.0
1311
github.com/pkg/errors v0.9.1
14-
github.com/prometheus/client_golang v1.21.1
12+
github.com/prometheus/client_golang v1.22.0-rc.0
1513
github.com/spf13/cobra v1.9.1
1614
github.com/spf13/pflag v1.0.6
1715
github.com/stretchr/testify v1.10.0
@@ -25,22 +23,21 @@ require (
2523
golang.org/x/net v0.37.0
2624
gopkg.in/gcfg.v1 v1.2.3
2725
gopkg.in/yaml.v2 v2.4.0
28-
k8s.io/api v0.32.2
29-
k8s.io/apimachinery v0.32.2
30-
k8s.io/client-go v0.32.2
31-
k8s.io/cloud-provider v0.32.2
32-
k8s.io/code-generator v0.32.2
33-
k8s.io/component-base v0.32.2
26+
k8s.io/api v0.33.0-beta.0
27+
k8s.io/apimachinery v0.33.0-beta.0
28+
k8s.io/client-go v0.33.0-beta.0
29+
k8s.io/cloud-provider v0.33.0-beta.0
30+
k8s.io/code-generator v0.33.0-beta.0
31+
k8s.io/component-base v0.33.0-beta.0
3432
k8s.io/klog/v2 v2.130.1
3533
sigs.k8s.io/yaml v1.4.0
3634
)
3735

3836
require (
39-
cel.dev/expr v0.18.0 // indirect
37+
cel.dev/expr v0.19.1 // indirect
4038
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4139
github.com/NYTimes/gziphandler v1.1.1 // indirect
4240
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
43-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4441
github.com/beevik/etree v1.1.3 // indirect
4542
github.com/beorn7/perks v1.0.1 // indirect
4643
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -61,19 +58,17 @@ require (
6158
github.com/go-openapi/jsonreference v0.21.0 // indirect
6259
github.com/go-openapi/swag v0.23.0 // indirect
6360
github.com/gogo/protobuf v1.3.2 // indirect
64-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
61+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
6562
github.com/golang/protobuf v1.5.4 // indirect
66-
github.com/google/btree v1.0.1 // indirect
67-
github.com/google/cel-go v0.22.0 // indirect
68-
github.com/google/gnostic-models v0.6.8 // indirect
63+
github.com/google/btree v1.1.3 // indirect
64+
github.com/google/cel-go v0.23.2 // indirect
65+
github.com/google/gnostic-models v0.6.9 // indirect
6966
github.com/google/go-cmp v0.7.0 // indirect
70-
github.com/google/gofuzz v1.2.0 // indirect
7167
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
72-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
68+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
7369
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7470
github.com/josharian/intern v1.0.0 // indirect
7571
github.com/json-iterator/go v1.1.12 // indirect
76-
github.com/klauspost/compress v1.17.11 // indirect
7772
github.com/kylelemons/godebug v1.1.0 // indirect
7873
github.com/mailru/easyjson v0.7.7 // indirect
7974
github.com/moby/term v0.5.0 // indirect
@@ -89,47 +84,49 @@ require (
8984
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
9085
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
9186
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
92-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
93-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
94-
go.opentelemetry.io/otel v1.28.0 // indirect
95-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
96-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
97-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
98-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
99-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
100-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
87+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
88+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
90+
go.opentelemetry.io/otel v1.33.0 // indirect
91+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
92+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
93+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
94+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
95+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
96+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
10197
go.uber.org/multierr v1.11.0 // indirect
10298
go.uber.org/zap v1.27.0 // indirect
10399
golang.org/x/crypto v0.36.0 // indirect
104100
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
105101
golang.org/x/mod v0.21.0 // indirect
106-
golang.org/x/oauth2 v0.24.0 // indirect
102+
golang.org/x/oauth2 v0.27.0 // indirect
107103
golang.org/x/sync v0.12.0 // indirect
108104
golang.org/x/sys v0.31.0 // indirect
109105
golang.org/x/term v0.30.0 // indirect
110106
golang.org/x/text v0.23.0 // indirect
111-
golang.org/x/time v0.7.0 // indirect
107+
golang.org/x/time v0.9.0 // indirect
112108
golang.org/x/tools v0.26.0 // indirect
113109
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
114-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
115-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
116-
google.golang.org/grpc v1.65.0 // indirect
117-
google.golang.org/protobuf v1.36.1 // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
112+
google.golang.org/grpc v1.68.1 // indirect
113+
google.golang.org/protobuf v1.36.5 // indirect
118114
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
119115
gopkg.in/inf.v0 v0.9.1 // indirect
120116
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
121117
gopkg.in/warnings.v0 v0.1.2 // indirect
122118
gopkg.in/yaml.v3 v3.0.1 // indirect
123119
k8s.io/apiextensions-apiserver v0.31.0-alpha.3 // indirect
124-
k8s.io/apiserver v0.32.2 // indirect
125-
k8s.io/component-helpers v0.32.2 // indirect
126-
k8s.io/controller-manager v0.32.2 // indirect
127-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
128-
k8s.io/kms v0.32.2 // indirect
129-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
120+
k8s.io/apiserver v0.33.0-beta.0 // indirect
121+
k8s.io/component-helpers v0.33.0-beta.0 // indirect
122+
k8s.io/controller-manager v0.33.0-beta.0 // indirect
123+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
124+
k8s.io/kms v0.33.0-beta.0 // indirect
125+
k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9 // indirect
130126
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
131-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
127+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
132128
sigs.k8s.io/controller-runtime v0.18.1-0.20240717024706-fcd2fcfc974f // indirect
133129
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
134-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
130+
sigs.k8s.io/randfill v1.0.0 // indirect
131+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
135132
)

0 commit comments

Comments
 (0)