Skip to content

Commit 74f4aaa

Browse files
committed
Merge commit '52858db8131938f661f5201be2e3418094eed62b'
2 parents 72304e7 + 52858db commit 74f4aaa

File tree

2 files changed

+209
-293
lines changed

2 files changed

+209
-293
lines changed

go.mod

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@ module k8s.io/cloud-provider-openstack
22

33
go 1.19
44

5+
replace github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
6+
57
require (
68
github.com/container-storage-interface/spec v1.7.0
7-
github.com/gophercloud/gophercloud v1.1.0
8-
github.com/gophercloud/utils v0.0.0-20220307143606-8e7800759d16
9+
github.com/gophercloud/gophercloud v1.1.1
10+
github.com/gophercloud/utils v0.0.0-20221207145018-e8fba78967ca
911
github.com/gorilla/mux v1.8.0
10-
github.com/hashicorp/go-version v1.4.0
11-
github.com/kubernetes-csi/csi-lib-utils v0.11.0
12+
github.com/hashicorp/go-version v1.6.0
13+
github.com/kubernetes-csi/csi-lib-utils v0.12.0
1214
github.com/kubernetes-csi/csi-test/v5 v5.0.0
1315
github.com/mitchellh/go-homedir v1.1.0
1416
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/onsi/ginkgo/v2 v2.4.0
16-
github.com/onsi/gomega v1.24.0
17-
github.com/pborman/uuid v1.2.0
18-
github.com/sirupsen/logrus v1.8.1
19-
github.com/spf13/cobra v1.6.0
17+
github.com/onsi/ginkgo/v2 v2.6.1
18+
github.com/onsi/gomega v1.24.2
19+
github.com/pborman/uuid v1.2.1
20+
github.com/sirupsen/logrus v1.9.0
21+
github.com/spf13/cobra v1.6.1
2022
github.com/spf13/pflag v1.0.5
21-
github.com/spf13/viper v1.12.0
22-
github.com/stretchr/testify v1.8.0
23-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
23+
github.com/spf13/viper v1.14.0
24+
github.com/stretchr/testify v1.8.1
25+
golang.org/x/net v0.4.0
2426
golang.org/x/sys v0.3.0
2527
golang.org/x/term v0.3.0
26-
google.golang.org/grpc v1.49.0
28+
google.golang.org/grpc v1.51.0
2729
google.golang.org/protobuf v1.28.1
2830
gopkg.in/gcfg.v1 v1.2.3
2931
gopkg.in/godo.v2 v2.0.9
@@ -38,112 +40,112 @@ require (
3840
k8s.io/kms v0.26.0
3941
k8s.io/kubernetes v1.26.0
4042
k8s.io/mount-utils v0.26.0
41-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
42-
software.sslmate.com/src/go-pkcs12 v0.0.0-20190209200317-47dd539968c4
43+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
44+
software.sslmate.com/src/go-pkcs12 v0.2.0
4345
)
4446

4547
require (
4648
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4749
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
4850
github.com/NYTimes/gziphandler v1.1.1 // indirect
4951
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
50-
github.com/aws/aws-sdk-go v1.44.116 // indirect
52+
github.com/aws/aws-sdk-go v1.44.166 // indirect
5153
github.com/beorn7/perks v1.0.1 // indirect
5254
github.com/blang/semver/v4 v4.0.0 // indirect
53-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
54-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
55+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
56+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5557
github.com/coreos/go-semver v0.3.0 // indirect
56-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
58+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5759
github.com/davecgh/go-spew v1.1.1 // indirect
5860
github.com/docker/distribution v2.8.1+incompatible // indirect
59-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
60-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
61+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
62+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6163
github.com/felixge/httpsnoop v1.0.3 // indirect
6264
github.com/fsnotify/fsnotify v1.6.0 // indirect
6365
github.com/go-logr/logr v1.2.3 // indirect
6466
github.com/go-logr/stdr v1.2.2 // indirect
6567
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6668
github.com/go-openapi/jsonreference v0.20.0 // indirect
67-
github.com/go-openapi/swag v0.19.14 // indirect
69+
github.com/go-openapi/swag v0.22.3 // indirect
6870
github.com/gogo/protobuf v1.3.2 // indirect
6971
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7072
github.com/golang/protobuf v1.5.2 // indirect
71-
github.com/google/cel-go v0.12.5 // indirect
72-
github.com/google/gnostic v0.5.7-v3refs // indirect
73+
github.com/google/cel-go v0.13.0 // indirect
74+
github.com/google/gnostic v0.6.9 // indirect
7375
github.com/google/go-cmp v0.5.9 // indirect
74-
github.com/google/gofuzz v1.1.0 // indirect
76+
github.com/google/gofuzz v1.2.0 // indirect
7577
github.com/google/uuid v1.3.0 // indirect
7678
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
77-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
79+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
7880
github.com/hashicorp/hcl v1.0.0 // indirect
79-
github.com/imdario/mergo v0.3.7 // indirect
80-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
81+
github.com/imdario/mergo v0.3.13 // indirect
82+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8183
github.com/jmespath/go-jmespath v0.4.0 // indirect
8284
github.com/josharian/intern v1.0.0 // indirect
8385
github.com/json-iterator/go v1.1.12 // indirect
84-
github.com/magiconair/properties v1.8.6 // indirect
85-
github.com/mailru/easyjson v0.7.6 // indirect
86-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
86+
github.com/magiconair/properties v1.8.7 // indirect
87+
github.com/mailru/easyjson v0.7.7 // indirect
88+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8789
github.com/mgutz/str v1.2.0 // indirect
8890
github.com/moby/spdystream v0.2.0 // indirect
8991
github.com/moby/sys/mountinfo v0.6.2 // indirect
90-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
92+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
9193
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9294
github.com/modern-go/reflect2 v1.0.2 // indirect
9395
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9496
github.com/opencontainers/go-digest v1.0.0 // indirect
95-
github.com/opencontainers/selinux v1.10.0 // indirect
97+
github.com/opencontainers/selinux v1.10.2 // indirect
9698
github.com/pelletier/go-toml v1.9.5 // indirect
97-
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
99+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
98100
github.com/pkg/errors v0.9.1 // indirect
99101
github.com/pmezard/go-difflib v1.0.0 // indirect
100102
github.com/prometheus/client_golang v1.14.0 // indirect
101103
github.com/prometheus/client_model v0.3.0 // indirect
102-
github.com/prometheus/common v0.37.0 // indirect
103-
github.com/prometheus/procfs v0.8.0 // indirect
104-
github.com/spf13/afero v1.8.2 // indirect
104+
github.com/prometheus/common v0.39.0 // indirect
105+
github.com/prometheus/procfs v0.9.0 // indirect
106+
github.com/spf13/afero v1.9.3 // indirect
105107
github.com/spf13/cast v1.5.0 // indirect
106108
github.com/spf13/jwalterweatherman v1.1.0 // indirect
107109
github.com/stoewer/go-strcase v1.2.0 // indirect
108-
github.com/stretchr/objx v0.4.0 // indirect
109-
github.com/subosito/gotenv v1.3.0 // indirect
110-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
111-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
112-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
113-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
115-
go.opentelemetry.io/otel v1.10.0 // indirect
116-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
117-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
119-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
120-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
121-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
110+
github.com/stretchr/objx v0.5.0 // indirect
111+
github.com/subosito/gotenv v1.4.1 // indirect
112+
go.etcd.io/etcd/api/v3 v3.5.6 // indirect
113+
go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
114+
go.etcd.io/etcd/client/v3 v3.5.6 // indirect
115+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect
117+
go.opentelemetry.io/otel v1.11.2 // indirect
118+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2 // indirect
121+
go.opentelemetry.io/otel/metric v0.34.0 // indirect
122+
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
123+
go.opentelemetry.io/otel/trace v1.11.2 // indirect
122124
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
123-
go.uber.org/atomic v1.7.0 // indirect
124-
go.uber.org/multierr v1.6.0 // indirect
125-
go.uber.org/zap v1.19.0 // indirect
126-
golang.org/x/crypto v0.1.0 // indirect
127-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
128-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
125+
go.uber.org/atomic v1.10.0 // indirect
126+
go.uber.org/multierr v1.9.0 // indirect
127+
go.uber.org/zap v1.24.0 // indirect
128+
golang.org/x/crypto v0.4.0 // indirect
129+
golang.org/x/oauth2 v0.3.0 // indirect
130+
golang.org/x/sync v0.1.0 // indirect
129131
golang.org/x/text v0.5.0 // indirect
130-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
132+
golang.org/x/time v0.3.0 // indirect
131133
google.golang.org/appengine v1.6.7 // indirect
132-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
134+
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
133135
gopkg.in/inf.v0 v0.9.1 // indirect
134-
gopkg.in/ini.v1 v1.66.4 // indirect
136+
gopkg.in/ini.v1 v1.67.0 // indirect
135137
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
136138
gopkg.in/warnings.v0 v0.1.2 // indirect
137139
gopkg.in/yaml.v3 v3.0.1 // indirect
138-
k8s.io/apiextensions-apiserver v0.0.0 // indirect
140+
k8s.io/apiextensions-apiserver v0.26.0 // indirect
139141
k8s.io/component-helpers v0.26.0 // indirect
140142
k8s.io/controller-manager v0.26.0 // indirect
141143
k8s.io/csi-translation-lib v0.26.0 // indirect
142-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
143-
k8s.io/kubectl v0.0.0 // indirect
144-
k8s.io/pod-security-admission v0.0.0 // indirect
145-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
146-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
144+
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
145+
k8s.io/kubectl v0.26.0 // indirect
146+
k8s.io/pod-security-admission v0.26.0 // indirect
147+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.34 // indirect
148+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
147149
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
148150
sigs.k8s.io/yaml v1.3.0 // indirect
149151
)

0 commit comments

Comments
 (0)