Skip to content

Commit dfcf145

Browse files
authored
Merge pull request #800 from yussufsh/main
Upgrade k8s deps and golang version
2 parents fad0fc3 + 8adb79f commit dfcf145

File tree

3 files changed

+133
-122
lines changed

3 files changed

+133
-122
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Initialized TARGETPLATFORM with default value
1616
ARG TARGETPLATFORM=linux/amd64
1717

18-
FROM golang:1.22.3 AS builder
18+
FROM golang:1.23.4 AS builder
1919
ARG TARGETPLATFORM
2020
WORKDIR /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver
2121
ADD . .

go.mod

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module sigs.k8s.io/ibm-powervs-block-csi-driver
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
66
github.com/IBM-Cloud/power-go-client v1.9.0
77
github.com/IBM/go-sdk-core/v5 v5.18.1
88
github.com/IBM/platform-services-go-sdk v0.72.0
99
github.com/container-storage-interface/spec v1.10.0
10-
github.com/davecgh/go-spew v1.1.1
10+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1111
github.com/google/go-cmp v0.6.0
1212
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
1313
github.com/onsi/ginkgo/v2 v2.21.0
@@ -16,20 +16,20 @@ require (
1616
golang.org/x/sys v0.28.0
1717
google.golang.org/grpc v1.68.1
1818
gopkg.in/gcfg.v1 v1.2.3
19-
k8s.io/api v0.30.3
20-
k8s.io/apimachinery v0.30.3
21-
k8s.io/client-go v0.30.3
19+
k8s.io/api v0.31.4
20+
k8s.io/apimachinery v0.31.4
21+
k8s.io/client-go v0.31.4
2222
k8s.io/klog/v2 v2.130.1
23-
k8s.io/kubernetes v1.30.3
24-
k8s.io/mount-utils v0.30.3
25-
k8s.io/pod-security-admission v0.30.3
26-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
27-
sigs.k8s.io/controller-runtime v0.18.4
23+
k8s.io/kubernetes v1.31.4
24+
k8s.io/mount-utils v0.31.4
25+
k8s.io/pod-security-admission v0.31.4
26+
k8s.io/utils v0.0.0-20241210054802-24370beab758
27+
sigs.k8s.io/controller-runtime v0.19.3
2828
)
2929

3030
require (
3131
github.com/NYTimes/gziphandler v1.1.1 // indirect
32-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
32+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3333
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3434
github.com/beorn7/perks v1.0.1 // indirect
3535
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -43,6 +43,7 @@ require (
4343
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4444
github.com/felixge/httpsnoop v1.0.4 // indirect
4545
github.com/fsnotify/fsnotify v1.7.0 // indirect
46+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4647
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
4748
github.com/go-logr/logr v1.4.2 // indirect
4849
github.com/go-logr/stdr v1.2.2 // indirect
@@ -64,8 +65,8 @@ require (
6465
github.com/gogo/protobuf v1.3.2 // indirect
6566
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6667
github.com/golang/protobuf v1.5.4 // indirect
67-
github.com/google/cel-go v0.17.8 // indirect
68-
github.com/google/gnostic-models v0.6.8 // indirect
68+
github.com/google/cel-go v0.20.1 // indirect
69+
github.com/google/gnostic-models v0.6.9 // indirect
6970
github.com/google/gofuzz v1.2.0 // indirect
7071
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
7172
github.com/google/uuid v1.6.0 // indirect
@@ -74,16 +75,16 @@ require (
7475
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7576
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7677
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
77-
github.com/imdario/mergo v0.3.16 // indirect
78+
github.com/imdario/mergo v0.3.6 // indirect
7879
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7980
github.com/josharian/intern v1.0.0 // indirect
8081
github.com/json-iterator/go v1.1.12 // indirect
8182
github.com/leodido/go-urn v1.4.0 // indirect
8283
github.com/mailru/easyjson v0.7.7 // indirect
83-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8484
github.com/mitchellh/mapstructure v1.5.0 // indirect
85-
github.com/moby/spdystream v0.4.0 // indirect
85+
github.com/moby/spdystream v0.5.0 // indirect
8686
github.com/moby/sys/mountinfo v0.7.2 // indirect
87+
github.com/moby/sys/userns v0.1.0 // indirect
8788
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8889
github.com/modern-go/reflect2 v1.0.2 // indirect
8990
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -92,16 +93,18 @@ require (
9293
github.com/oklog/ulid v1.3.1 // indirect
9394
github.com/onsi/ginkgo v1.16.5 // indirect
9495
github.com/opencontainers/go-digest v1.0.0 // indirect
96+
github.com/opencontainers/runc v1.2.3 // indirect
9597
github.com/opencontainers/selinux v1.11.0 // indirect
9698
github.com/opentracing/opentracing-go v1.2.0 // indirect
9799
github.com/pkg/errors v0.9.1 // indirect
98-
github.com/prometheus/client_golang v1.17.0 // indirect
100+
github.com/prometheus/client_golang v1.19.1 // indirect
99101
github.com/prometheus/client_model v0.6.1 // indirect
100-
github.com/prometheus/common v0.44.0 // indirect
102+
github.com/prometheus/common v0.55.0 // indirect
101103
github.com/prometheus/procfs v0.15.1 // indirect
102104
github.com/spf13/cobra v1.8.1 // indirect
103105
github.com/spf13/pflag v1.0.5 // indirect
104106
github.com/stoewer/go-strcase v1.3.0 // indirect
107+
github.com/x448/float16 v0.8.4 // indirect
105108
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
106109
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
107110
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
@@ -119,38 +122,38 @@ require (
119122
go.uber.org/zap v1.27.0 // indirect
120123
golang.org/x/crypto v0.31.0 // indirect
121124
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
122-
golang.org/x/net v0.30.0 // indirect
123-
golang.org/x/oauth2 v0.23.0 // indirect
125+
golang.org/x/net v0.32.0 // indirect
126+
golang.org/x/oauth2 v0.24.0 // indirect
124127
golang.org/x/sync v0.10.0 // indirect
125128
golang.org/x/term v0.27.0 // indirect
126129
golang.org/x/text v0.21.0 // indirect
127-
golang.org/x/time v0.5.0 // indirect
130+
golang.org/x/time v0.8.0 // indirect
128131
golang.org/x/tools v0.26.0 // indirect
129132
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
130133
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
131134
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
132135
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
133-
google.golang.org/protobuf v1.35.1 // indirect
136+
google.golang.org/protobuf v1.35.2 // indirect
137+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
134138
gopkg.in/inf.v0 v0.9.1 // indirect
135139
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
136140
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
137141
gopkg.in/warnings.v0 v0.1.2 // indirect
138142
gopkg.in/yaml.v2 v2.4.0 // indirect
139143
gopkg.in/yaml.v3 v3.0.1 // indirect
140-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
141-
k8s.io/apiserver v0.30.3 // indirect
142-
k8s.io/cloud-provider v0.30.3 // indirect
143-
k8s.io/component-base v0.30.3 // indirect
144-
k8s.io/component-helpers v0.30.3 // indirect
145-
k8s.io/controller-manager v0.30.3 // indirect
146-
k8s.io/kms v0.30.3 // indirect
147-
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
148-
k8s.io/kubectl v0.30.3 // indirect
149-
k8s.io/kubelet v0.30.3 // indirect
150-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
151-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
152-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
144+
k8s.io/apiextensions-apiserver v0.31.4 // indirect
145+
k8s.io/apiserver v0.31.4 // indirect
146+
k8s.io/cloud-provider v0.31.4 // indirect
147+
k8s.io/component-base v0.31.4 // indirect
148+
k8s.io/component-helpers v0.31.4 // indirect
149+
k8s.io/controller-manager v0.31.4 // indirect
150+
k8s.io/csi-translation-lib v0.31.4 // indirect
151+
k8s.io/kms v0.31.4 // indirect
152+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
153+
k8s.io/kubectl v0.31.4 // indirect
154+
k8s.io/kubelet v0.31.4 // indirect
155+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
156+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
157+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
153158
sigs.k8s.io/yaml v1.4.0 // indirect
154159
)
155-
156-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.3

0 commit comments

Comments
 (0)