Skip to content

Commit 5f1517b

Browse files
authored
Merge pull request #565 from yussufsh/temp
Upgrade k8s and deps to v1.29.1
2 parents 778a9e2 + 73da412 commit 5f1517b

File tree

4 files changed

+155
-171
lines changed

4 files changed

+155
-171
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The IBM Power Virtual Systems Container Storage Interface (CSI) Driver provides
88
# CSI Specification Compatibility Matrix
99
| PowerVS CSI Driver | Kubernetes | CSI | Golang |
1010
| ----------------------------- | ----------- | -------- | -------- |
11-
| main | 1.28 | 1.8.0 | 1.20 |
11+
| main | 1.29 | 1.9.0 | 1.21 |
1212
| 0.5.0 | 1.28 | 1.8.0 | 1.20 |
1313
| 0.4.0 | 1.26 | 1.7.0 | 1.19 |
1414
| 0.3.0 | 1.25 | 1.6.0 | 1.19 |

go.mod

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

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/IBM-Cloud/power-go-client v1.5.8
@@ -16,15 +16,15 @@ require (
1616
golang.org/x/sys v0.16.0
1717
google.golang.org/grpc v1.61.0
1818
gopkg.in/gcfg.v1 v1.2.3
19-
k8s.io/api v0.28.4
20-
k8s.io/apimachinery v0.28.4
21-
k8s.io/client-go v0.28.4
19+
k8s.io/api v0.29.1
20+
k8s.io/apimachinery v0.29.1
21+
k8s.io/client-go v0.29.1
2222
k8s.io/klog/v2 v2.120.1
23-
k8s.io/kubernetes v1.28.4
24-
k8s.io/mount-utils v0.28.4
25-
k8s.io/pod-security-admission v0.28.4
26-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
27-
sigs.k8s.io/controller-runtime v0.16.3
23+
k8s.io/kubernetes v1.29.1
24+
k8s.io/mount-utils v0.29.1
25+
k8s.io/pod-security-admission v0.29.1
26+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
27+
sigs.k8s.io/controller-runtime v0.17.0
2828
)
2929

3030
require (
@@ -37,15 +37,15 @@ require (
3737
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3838
github.com/coreos/go-semver v0.3.1 // indirect
3939
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
40-
github.com/docker/distribution v2.8.2+incompatible // indirect
40+
github.com/distribution/reference v0.5.0 // indirect
4141
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4242
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
43-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
4444
github.com/felixge/httpsnoop v1.0.4 // indirect
45-
github.com/fsnotify/fsnotify v1.6.0 // indirect
45+
github.com/fsnotify/fsnotify v1.7.0 // indirect
4646
github.com/go-logr/logr v1.4.1 // indirect
4747
github.com/go-logr/stdr v1.2.2 // indirect
48-
github.com/go-logr/zapr v1.2.4 // indirect
48+
github.com/go-logr/zapr v1.3.0 // indirect
4949
github.com/go-openapi/analysis v0.21.5 // indirect
5050
github.com/go-openapi/errors v0.21.0 // indirect
5151
github.com/go-openapi/jsonpointer v0.20.1 // indirect
@@ -63,12 +63,13 @@ require (
6363
github.com/gogo/protobuf v1.3.2 // indirect
6464
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6565
github.com/golang/protobuf v1.5.3 // indirect
66-
github.com/google/cel-go v0.16.1 // indirect
66+
github.com/google/cel-go v0.17.7 // indirect
6767
github.com/google/gnostic-models v0.6.8 // indirect
6868
github.com/google/go-cmp v0.6.0 // indirect
6969
github.com/google/gofuzz v1.2.0 // indirect
7070
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7171
github.com/google/uuid v1.4.0 // indirect
72+
github.com/gorilla/websocket v1.5.0 // indirect
7273
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7374
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7475
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -79,29 +80,30 @@ require (
7980
github.com/json-iterator/go v1.1.12 // indirect
8081
github.com/leodido/go-urn v1.2.3 // indirect
8182
github.com/mailru/easyjson v0.7.7 // indirect
82-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
83+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8384
github.com/mitchellh/mapstructure v1.5.0 // indirect
8485
github.com/moby/spdystream v0.2.0 // indirect
8586
github.com/moby/sys/mountinfo v0.6.2 // indirect
8687
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8788
github.com/modern-go/reflect2 v1.0.2 // indirect
8889
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
90+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8991
github.com/nxadm/tail v1.4.8 // indirect
9092
github.com/oklog/ulid v1.3.1 // indirect
9193
github.com/onsi/ginkgo v1.16.5 // indirect
9294
github.com/opencontainers/go-digest v1.0.0 // indirect
93-
github.com/opencontainers/selinux v1.10.0 // indirect
95+
github.com/opencontainers/selinux v1.11.0 // indirect
9496
github.com/opentracing/opentracing-go v1.2.0 // indirect
95-
github.com/prometheus/client_golang v1.16.0 // indirect
96-
github.com/prometheus/client_model v0.4.0 // indirect
97-
github.com/prometheus/common v0.44.0 // indirect
98-
github.com/prometheus/procfs v0.10.1 // indirect
97+
github.com/prometheus/client_golang v1.18.0 // indirect
98+
github.com/prometheus/client_model v0.5.0 // indirect
99+
github.com/prometheus/common v0.45.0 // indirect
100+
github.com/prometheus/procfs v0.12.0 // indirect
99101
github.com/spf13/cobra v1.7.0 // indirect
100102
github.com/spf13/pflag v1.0.5 // indirect
101103
github.com/stoewer/go-strcase v1.2.0 // indirect
102-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
103-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
104-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
104+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
105+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
106+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
105107
go.mongodb.org/mongo-driver v1.13.1 // indirect
106108
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
107109
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
@@ -113,7 +115,7 @@ require (
113115
go.opentelemetry.io/otel/trace v1.20.0 // indirect
114116
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
115117
go.uber.org/multierr v1.11.0 // indirect
116-
go.uber.org/zap v1.25.0 // indirect
118+
go.uber.org/zap v1.26.0 // indirect
117119
golang.org/x/crypto v0.17.0 // indirect
118120
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
119121
golang.org/x/net v0.19.0 // indirect
@@ -135,51 +137,20 @@ require (
135137
gopkg.in/warnings.v0 v0.1.2 // indirect
136138
gopkg.in/yaml.v2 v2.4.0 // indirect
137139
gopkg.in/yaml.v3 v3.0.1 // indirect
138-
k8s.io/apiextensions-apiserver v0.28.4 // indirect
139-
k8s.io/apiserver v0.28.4 // indirect
140-
k8s.io/cloud-provider v0.0.0 // indirect
141-
k8s.io/component-base v0.28.4 // indirect
142-
k8s.io/component-helpers v0.28.4 // indirect
143-
k8s.io/controller-manager v0.28.4 // indirect
144-
k8s.io/kms v0.28.4 // indirect
145-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
146-
k8s.io/kubectl v0.0.0 // indirect
147-
k8s.io/kubelet v0.0.0 // indirect
148-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
140+
k8s.io/apiextensions-apiserver v0.29.1 // indirect
141+
k8s.io/apiserver v0.29.1 // indirect
142+
k8s.io/cloud-provider v0.29.1 // indirect
143+
k8s.io/component-base v0.29.1 // indirect
144+
k8s.io/component-helpers v0.29.1 // indirect
145+
k8s.io/controller-manager v0.29.1 // indirect
146+
k8s.io/kms v0.29.1 // indirect
147+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
148+
k8s.io/kubectl v0.29.1 // indirect
149+
k8s.io/kubelet v0.29.1 // indirect
150+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
149151
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
150-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
151-
sigs.k8s.io/yaml v1.3.0 // indirect
152+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
153+
sigs.k8s.io/yaml v1.4.0 // indirect
152154
)
153155

154-
replace (
155-
k8s.io/api => k8s.io/api v0.28.4
156-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
157-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
158-
k8s.io/apiserver => k8s.io/apiserver v0.28.4
159-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
160-
k8s.io/client-go => k8s.io/client-go v0.28.4
161-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
162-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
163-
k8s.io/code-generator => k8s.io/code-generator v0.28.4
164-
k8s.io/component-base => k8s.io/component-base v0.28.4
165-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
166-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
167-
k8s.io/cri-api => k8s.io/cri-api v0.28.4
168-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
169-
k8s.io/kms => k8s.io/kms v0.28.4
170-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
171-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
172-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
173-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
174-
k8s.io/kubectl => k8s.io/kubectl v0.28.4
175-
k8s.io/kubelet => k8s.io/kubelet v0.28.4
176-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
177-
k8s.io/metrics => k8s.io/metrics v0.28.4
178-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
179-
k8s.io/node-api => k8s.io/node-api v0.28.4
180-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
181-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
182-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
183-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
184-
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
185-
)
156+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.1

0 commit comments

Comments
 (0)