Skip to content

Commit fb6cacd

Browse files
authored
Merge pull request #434 from yussufsh/test
Upgrade dependencies
2 parents 724ff46 + cd44480 commit fb6cacd

File tree

8 files changed

+301
-301
lines changed

8 files changed

+301
-301
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ bin/mockgen: | bin
9292

9393
bin/golangci-lint: | bin
9494
echo "Installing golangci-lint..."
95-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.48.0
95+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.54.2
9696

9797
mockgen: bin/mockgen
9898
./hack/update-gomock

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.26 | 1.7.0 | 1.19 |
11+
| main | 1.28 | 1.7.0 | 1.20 |
1212
| 0.4.0 | 1.26 | 1.7.0 | 1.19 |
1313
| 0.3.0 | 1.25 | 1.6.0 | 1.19 |
1414
| 0.2.0 | 1.24 | 1.5.0 | 1.18 |

adhoc-controllers/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
ctrl "sigs.k8s.io/controller-runtime"
3131
"sigs.k8s.io/controller-runtime/pkg/healthz"
3232
"sigs.k8s.io/controller-runtime/pkg/log/zap"
33+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
3334

3435
"sigs.k8s.io/ibm-powervs-block-csi-driver/adhoc-controllers/controllers"
3536
//+kubebuilder:scaffold:imports
@@ -65,8 +66,7 @@ func main() {
6566

6667
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
6768
Scheme: scheme,
68-
MetricsBindAddress: metricsAddr,
69-
Port: 9443,
69+
Metrics: server.Options{BindAddress: metricsAddr},
7070
HealthProbeBindAddress: probeAddr,
7171
LeaderElection: enableLeaderElection,
7272
LeaderElectionID: "15c66b50.my.domain",

go.mod

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

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/IBM-Cloud/power-go-client v1.2.3
7-
github.com/IBM/go-sdk-core/v5 v5.13.4
8-
github.com/IBM/platform-services-go-sdk v0.37.4
9-
github.com/container-storage-interface/spec v1.7.0
6+
github.com/IBM-Cloud/power-go-client v1.2.4
7+
github.com/IBM/go-sdk-core/v5 v5.14.1
8+
github.com/IBM/platform-services-go-sdk v0.46.0
9+
github.com/container-storage-interface/spec v1.8.0
1010
github.com/davecgh/go-spew v1.1.1
1111
github.com/golang/mock v1.6.0
1212
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
13-
github.com/onsi/ginkgo/v2 v2.9.5
14-
github.com/onsi/gomega v1.27.6
13+
github.com/onsi/ginkgo/v2 v2.12.0
14+
github.com/onsi/gomega v1.27.10
1515
github.com/pkg/errors v0.9.1
16-
golang.org/x/sys v0.8.0
17-
google.golang.org/grpc v1.55.0
16+
golang.org/x/sys v0.11.0
17+
google.golang.org/grpc v1.57.0
1818
gopkg.in/gcfg.v1 v1.2.3
19-
k8s.io/api v0.26.7
20-
k8s.io/apimachinery v0.26.7
21-
k8s.io/client-go v0.26.7
19+
k8s.io/api v0.28.1
20+
k8s.io/apimachinery v0.28.1
21+
k8s.io/client-go v0.28.1
2222
k8s.io/klog/v2 v2.100.1
23-
k8s.io/kubernetes v1.26.7
24-
k8s.io/mount-utils v0.26.7
25-
k8s.io/pod-security-admission v0.26.7
26-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
27-
sigs.k8s.io/controller-runtime v0.14.6
23+
k8s.io/kubernetes v1.28.1
24+
k8s.io/mount-utils v0.28.1
25+
k8s.io/pod-security-admission v0.28.1
26+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
27+
sigs.k8s.io/controller-runtime v0.16.0
2828
)
2929

3030
require (
31+
github.com/NYTimes/gziphandler v1.1.1 // indirect
32+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3133
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
32-
github.com/aws/aws-sdk-go v1.44.116 // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
3435
github.com/blang/semver/v4 v4.0.0 // indirect
35-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
36+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3637
github.com/cespare/xxhash/v2 v2.2.0 // indirect
37-
github.com/docker/distribution v2.8.1+incompatible // indirect
38-
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
38+
github.com/coreos/go-semver v0.3.1 // indirect
39+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
40+
github.com/docker/distribution v2.8.2+incompatible // indirect
3941
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
40-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
42+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4143
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4244
github.com/felixge/httpsnoop v1.0.3 // indirect
4345
github.com/fsnotify/fsnotify v1.6.0 // indirect
4446
github.com/go-logr/logr v1.2.4 // indirect
4547
github.com/go-logr/stdr v1.2.2 // indirect
46-
github.com/go-logr/zapr v1.2.3 // indirect
48+
github.com/go-logr/zapr v1.2.4 // indirect
4749
github.com/go-openapi/analysis v0.21.2 // indirect
4850
github.com/go-openapi/errors v0.20.3 // indirect
49-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
50-
github.com/go-openapi/jsonreference v0.20.0 // indirect
51+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
52+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5153
github.com/go-openapi/loads v0.21.1 // indirect
5254
github.com/go-openapi/runtime v0.23.0 // indirect
5355
github.com/go-openapi/spec v0.20.4 // indirect
5456
github.com/go-openapi/strfmt v0.21.5 // indirect
55-
github.com/go-openapi/swag v0.21.1 // indirect
57+
github.com/go-openapi/swag v0.22.3 // indirect
5658
github.com/go-openapi/validate v0.20.3 // indirect
5759
github.com/go-playground/locales v0.14.1 // indirect
5860
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -61,22 +63,23 @@ require (
6163
github.com/gogo/protobuf v1.3.2 // indirect
6264
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6365
github.com/golang/protobuf v1.5.3 // indirect
64-
github.com/google/gnostic v0.5.7-v3refs // indirect
66+
github.com/google/cel-go v0.16.0 // indirect
67+
github.com/google/gnostic-models v0.6.8 // indirect
6568
github.com/google/go-cmp v0.5.9 // indirect
66-
github.com/google/gofuzz v1.1.0 // indirect
69+
github.com/google/gofuzz v1.2.0 // indirect
6770
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6871
github.com/google/uuid v1.3.0 // indirect
72+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6973
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
7074
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7175
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
7276
github.com/imdario/mergo v0.3.6 // indirect
73-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
74-
github.com/jmespath/go-jmespath v0.4.0 // indirect
77+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7578
github.com/josharian/intern v1.0.0 // indirect
7679
github.com/json-iterator/go v1.1.12 // indirect
7780
github.com/leodido/go-urn v1.2.3 // indirect
7881
github.com/mailru/easyjson v0.7.7 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
82+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8083
github.com/mitchellh/mapstructure v1.5.0 // indirect
8184
github.com/moby/spdystream v0.2.0 // indirect
8285
github.com/moby/sys/mountinfo v0.6.2 // indirect
@@ -89,14 +92,19 @@ require (
8992
github.com/opencontainers/go-digest v1.0.0 // indirect
9093
github.com/opencontainers/selinux v1.10.0 // indirect
9194
github.com/opentracing/opentracing-go v1.2.0 // indirect
92-
github.com/prometheus/client_golang v1.14.0 // indirect
93-
github.com/prometheus/client_model v0.3.0 // indirect
94-
github.com/prometheus/common v0.37.0 // indirect
95-
github.com/prometheus/procfs v0.8.0 // indirect
96-
github.com/spf13/cobra v1.6.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
99+
github.com/spf13/cobra v1.7.0 // indirect
97100
github.com/spf13/pflag v1.0.5 // indirect
101+
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
98105
go.mongodb.org/mongo-driver v1.11.3 // indirect
99-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
106+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
107+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
100108
go.opentelemetry.io/otel v1.10.0 // indirect
101109
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
102110
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -105,66 +113,74 @@ require (
105113
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
106114
go.opentelemetry.io/otel/trace v1.10.0 // indirect
107115
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
108-
go.uber.org/atomic v1.7.0 // indirect
109-
go.uber.org/multierr v1.6.0 // indirect
110-
go.uber.org/zap v1.24.0 // indirect
111-
golang.org/x/crypto v0.7.0 // indirect
112-
golang.org/x/net v0.10.0 // indirect
113-
golang.org/x/oauth2 v0.6.0 // indirect
114-
golang.org/x/term v0.8.0 // indirect
115-
golang.org/x/text v0.9.0 // indirect
116+
go.uber.org/multierr v1.11.0 // indirect
117+
go.uber.org/zap v1.25.0 // indirect
118+
golang.org/x/crypto v0.12.0 // indirect
119+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
120+
golang.org/x/net v0.14.0 // indirect
121+
golang.org/x/oauth2 v0.8.0 // indirect
122+
golang.org/x/sync v0.3.0 // indirect
123+
golang.org/x/term v0.11.0 // indirect
124+
golang.org/x/text v0.12.0 // indirect
116125
golang.org/x/time v0.3.0 // indirect
117-
golang.org/x/tools v0.9.1 // indirect
118-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
126+
golang.org/x/tools v0.12.0 // indirect
127+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
119128
google.golang.org/appengine v1.6.7 // indirect
120-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
129+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
130+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
131+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
121132
google.golang.org/protobuf v1.30.0 // indirect
122133
gopkg.in/inf.v0 v0.9.1 // indirect
134+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
123135
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
124-
gopkg.in/warnings.v0 v0.1.1 // indirect
136+
gopkg.in/warnings.v0 v0.1.2 // indirect
125137
gopkg.in/yaml.v2 v2.4.0 // indirect
126138
gopkg.in/yaml.v3 v3.0.1 // indirect
127-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
128-
k8s.io/apiserver v0.26.7 // indirect
139+
k8s.io/apiextensions-apiserver v0.28.0 // indirect
140+
k8s.io/apiserver v0.28.1 // indirect
129141
k8s.io/cloud-provider v0.0.0 // indirect
130-
k8s.io/component-base v0.26.7 // indirect
131-
k8s.io/component-helpers v0.26.7 // indirect
132-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
142+
k8s.io/component-base v0.28.1 // indirect
143+
k8s.io/component-helpers v0.28.1 // indirect
144+
k8s.io/controller-manager v0.28.1 // indirect
145+
k8s.io/kms v0.28.1 // indirect
146+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
133147
k8s.io/kubectl v0.0.0 // indirect
134-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
135-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
148+
k8s.io/kubelet v0.0.0 // indirect
149+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
150+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
136151
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
137152
sigs.k8s.io/yaml v1.3.0 // indirect
138153
)
139154

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

0 commit comments

Comments
 (0)