Skip to content

Commit b6d73d6

Browse files
dulekdulek
authored
Bump K8s to v1.30.0 (kubernetes#2581)
I also needed to flip order of mocks in Cinder CSI nodeserver tests and honestly I'm not exactly sure why.
1 parent 6387cbb commit b6d73d6

File tree

5 files changed

+122
-123
lines changed

5 files changed

+122
-123
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.21.5
17+
ARG GOLANG_IMAGE=golang:1.22.2
1818

1919
# The distroless image on which the CPI manager image is built.
2020
#
2121
# Please do not use "latest". Explicit tags should be used to provide
2222
# deterministic builds. Follow what kubernetes uses to build
2323
# kube-controller-manager, for example for 1.27.x:
2424
# https://github.com/kubernetes/kubernetes/blob/release-1.27/build/common.sh#L99
25-
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.5-bookworm.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.2-bookworm.0
2626

2727
# We use Alpine as the source for default CA certificates and some output
2828
# images

‎go.mod‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/cloud-provider-openstack
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
66
github.com/container-storage-interface/spec v1.8.0
@@ -12,48 +12,48 @@ require (
1212
github.com/kubernetes-csi/csi-test/v5 v5.0.0
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/onsi/ginkgo/v2 v2.13.0
16-
github.com/onsi/gomega v1.29.0
15+
github.com/onsi/ginkgo/v2 v2.15.0
16+
github.com/onsi/gomega v1.31.0
1717
github.com/pborman/uuid v1.2.1
1818
github.com/sirupsen/logrus v1.9.0
1919
github.com/spf13/cobra v1.7.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/spf13/viper v1.15.0
2222
github.com/stretchr/testify v1.8.4
23-
go.uber.org/goleak v1.2.1
24-
golang.org/x/net v0.19.0
25-
golang.org/x/sys v0.15.0
26-
golang.org/x/term v0.15.0
23+
go.uber.org/goleak v1.3.0
24+
golang.org/x/net v0.23.0
25+
golang.org/x/sys v0.18.0
26+
golang.org/x/term v0.18.0
2727
google.golang.org/grpc v1.58.3
28-
google.golang.org/protobuf v1.31.0
28+
google.golang.org/protobuf v1.33.0
2929
gopkg.in/gcfg.v1 v1.2.3
3030
gopkg.in/godo.v2 v2.0.9
3131
gopkg.in/yaml.v2 v2.4.0
32-
k8s.io/api v0.29.1
33-
k8s.io/apimachinery v0.29.1
34-
k8s.io/apiserver v0.29.1
35-
k8s.io/client-go v0.29.1
36-
k8s.io/cloud-provider v0.29.1
37-
k8s.io/component-base v0.29.1
38-
k8s.io/klog/v2 v2.110.1
39-
k8s.io/kms v0.29.1
40-
k8s.io/kubernetes v1.29.1
41-
k8s.io/mount-utils v0.29.1
32+
k8s.io/api v0.30.0
33+
k8s.io/apimachinery v0.30.0
34+
k8s.io/apiserver v0.30.0
35+
k8s.io/client-go v0.30.0
36+
k8s.io/cloud-provider v0.30.0
37+
k8s.io/component-base v0.30.0
38+
k8s.io/klog/v2 v2.120.1
39+
k8s.io/kms v0.30.0
40+
k8s.io/kubernetes v1.30.0
41+
k8s.io/mount-utils v0.30.0
4242
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
4343
software.sslmate.com/src/go-pkcs12 v0.2.0
4444
)
4545

4646
// the below fixes the "go list -m all" execution
4747
replace (
48-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.1
49-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.1
50-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.1
51-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.1
52-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.1
53-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.1
54-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.1
55-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.1
56-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.1
48+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
49+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0
50+
k8s.io/endpointslice => k8s.io/endpointslice v0.30.0
51+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
52+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
53+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
54+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
55+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
56+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
5757
)
5858

5959
require (
@@ -74,16 +74,16 @@ require (
7474
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7575
github.com/felixge/httpsnoop v1.0.3 // indirect
7676
github.com/fsnotify/fsnotify v1.7.0 // indirect
77-
github.com/go-logr/logr v1.3.0 // indirect
77+
github.com/go-logr/logr v1.4.1 // indirect
7878
github.com/go-logr/stdr v1.2.2 // indirect
7979
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8080
github.com/go-openapi/jsonreference v0.20.2 // indirect
8181
github.com/go-openapi/swag v0.22.3 // indirect
8282
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8383
github.com/gogo/protobuf v1.3.2 // indirect
8484
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
85-
github.com/golang/protobuf v1.5.3 // indirect
86-
github.com/google/cel-go v0.17.7 // indirect
85+
github.com/golang/protobuf v1.5.4 // indirect
86+
github.com/google/cel-go v0.17.8 // indirect
8787
github.com/google/gnostic-models v0.6.8 // indirect
8888
github.com/google/go-cmp v0.6.0 // indirect
8989
github.com/google/gofuzz v1.2.0 // indirect
@@ -135,16 +135,15 @@ require (
135135
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
136136
go.opentelemetry.io/otel/trace v1.19.0 // indirect
137137
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
138-
go.uber.org/atomic v1.10.0 // indirect
139138
go.uber.org/multierr v1.11.0 // indirect
140-
go.uber.org/zap v1.24.0 // indirect
141-
golang.org/x/crypto v0.16.0 // indirect
139+
go.uber.org/zap v1.26.0 // indirect
140+
golang.org/x/crypto v0.21.0 // indirect
142141
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
143142
golang.org/x/oauth2 v0.10.0 // indirect
144-
golang.org/x/sync v0.5.0 // indirect
143+
golang.org/x/sync v0.6.0 // indirect
145144
golang.org/x/text v0.14.0 // indirect
146145
golang.org/x/time v0.3.0 // indirect
147-
golang.org/x/tools v0.16.1 // indirect
146+
golang.org/x/tools v0.18.0 // indirect
148147
google.golang.org/appengine v1.6.7 // indirect
149148
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
150149
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
@@ -154,15 +153,15 @@ require (
154153
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
155154
gopkg.in/warnings.v0 v0.1.2 // indirect
156155
gopkg.in/yaml.v3 v3.0.1 // indirect
157-
k8s.io/apiextensions-apiserver v0.29.1 // indirect
158-
k8s.io/component-helpers v0.29.1 // indirect
159-
k8s.io/controller-manager v0.29.1 // indirect
160-
k8s.io/csi-translation-lib v0.29.1 // indirect
161-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
162-
k8s.io/kubectl v0.29.1 // indirect
163-
k8s.io/kubelet v0.29.1 // indirect
164-
k8s.io/pod-security-admission v0.29.1 // indirect
165-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
156+
k8s.io/apiextensions-apiserver v0.30.0 // indirect
157+
k8s.io/component-helpers v0.30.0 // indirect
158+
k8s.io/controller-manager v0.30.0 // indirect
159+
k8s.io/csi-translation-lib v0.30.0 // indirect
160+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
161+
k8s.io/kubectl v0.30.0 // indirect
162+
k8s.io/kubelet v0.30.0 // indirect
163+
k8s.io/pod-security-admission v0.30.0 // indirect
164+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
166165
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
167166
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
168167
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)