Skip to content

Commit 72304e7

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #159 from shiftstack/merge-bot-master
Merge https://github.com/kubernetes/cloud-provider-openstack:master into master
2 parents 73913c2 + 9fde550 commit 72304e7

File tree

1,528 files changed

+235430
-60913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,528 files changed

+235430
-60913
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ QEMUVERSION := "v4.2.0-4"
4040
GOARCH :=
4141
GOFLAGS :=
4242
TAGS :=
43-
LDFLAGS := "-w -s -X 'k8s.io/component-base/version.gitVersion=$(VERSION)'"
43+
LDFLAGS := "-w -s -X 'k8s.io/component-base/version.gitVersion=$(GIT_VERSION)'"
4444
GOX_LDFLAGS := $(shell echo "$(LDFLAGS) -extldflags \"-static\"")
4545
REGISTRY ?= k8scloudprovider
4646
IMAGE_OS ?= linux

‎go.mod‎

Lines changed: 84 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module k8s.io/cloud-provider-openstack
33
go 1.19
44

55
require (
6-
github.com/container-storage-interface/spec v1.6.0
6+
github.com/container-storage-interface/spec v1.7.0
77
github.com/gophercloud/gophercloud v1.1.0
88
github.com/gophercloud/utils v0.0.0-20220307143606-8e7800759d16
99
github.com/gorilla/mux v1.8.0
@@ -16,75 +16,78 @@ require (
1616
github.com/onsi/gomega v1.24.0
1717
github.com/pborman/uuid v1.2.0
1818
github.com/sirupsen/logrus v1.8.1
19-
github.com/spf13/cobra v1.4.0
19+
github.com/spf13/cobra v1.6.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/spf13/viper v1.12.0
2222
github.com/stretchr/testify v1.8.0
23-
golang.org/x/net v0.1.0
24-
golang.org/x/sys v0.2.0
25-
golang.org/x/term v0.1.0
26-
google.golang.org/grpc v1.48.0
27-
google.golang.org/protobuf v1.28.0
23+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
24+
golang.org/x/sys v0.3.0
25+
golang.org/x/term v0.3.0
26+
google.golang.org/grpc v1.49.0
27+
google.golang.org/protobuf v1.28.1
2828
gopkg.in/gcfg.v1 v1.2.3
2929
gopkg.in/godo.v2 v2.0.9
3030
gopkg.in/yaml.v2 v2.4.0
31-
k8s.io/api v0.25.3
32-
k8s.io/apimachinery v0.25.3
33-
k8s.io/apiserver v0.25.3
34-
k8s.io/client-go v0.25.3
35-
k8s.io/cloud-provider v0.25.3
36-
k8s.io/component-base v0.25.3
37-
k8s.io/klog/v2 v2.70.1
38-
k8s.io/kubernetes v1.25.3
39-
k8s.io/mount-utils v0.25.3
40-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
31+
k8s.io/api v0.26.0
32+
k8s.io/apimachinery v0.26.0
33+
k8s.io/apiserver v0.26.0
34+
k8s.io/client-go v0.26.0
35+
k8s.io/cloud-provider v0.26.0
36+
k8s.io/component-base v0.26.0
37+
k8s.io/klog/v2 v2.80.1
38+
k8s.io/kms v0.26.0
39+
k8s.io/kubernetes v1.26.0
40+
k8s.io/mount-utils v0.26.0
41+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
4142
software.sslmate.com/src/go-pkcs12 v0.0.0-20190209200317-47dd539968c4
4243
)
4344

4445
require (
4546
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4647
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
4748
github.com/NYTimes/gziphandler v1.1.1 // indirect
48-
github.com/PuerkitoBio/purell v1.1.1 // indirect
49-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
50-
github.com/aws/aws-sdk-go v1.38.49 // indirect
49+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
50+
github.com/aws/aws-sdk-go v1.44.116 // indirect
5151
github.com/beorn7/perks v1.0.1 // indirect
5252
github.com/blang/semver/v4 v4.0.0 // indirect
53+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
5354
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5455
github.com/coreos/go-semver v0.3.0 // indirect
5556
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
5657
github.com/davecgh/go-spew v1.1.1 // indirect
5758
github.com/docker/distribution v2.8.1+incompatible // indirect
58-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
59+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
5960
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
60-
github.com/felixge/httpsnoop v1.0.1 // indirect
61-
github.com/fsnotify/fsnotify v1.5.4 // indirect
61+
github.com/felixge/httpsnoop v1.0.3 // indirect
62+
github.com/fsnotify/fsnotify v1.6.0 // indirect
6263
github.com/go-logr/logr v1.2.3 // indirect
64+
github.com/go-logr/stdr v1.2.2 // indirect
6365
github.com/go-openapi/jsonpointer v0.19.5 // indirect
64-
github.com/go-openapi/jsonreference v0.19.5 // indirect
66+
github.com/go-openapi/jsonreference v0.20.0 // indirect
6567
github.com/go-openapi/swag v0.19.14 // indirect
6668
github.com/gogo/protobuf v1.3.2 // indirect
6769
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6870
github.com/golang/protobuf v1.5.2 // indirect
71+
github.com/google/cel-go v0.12.5 // indirect
6972
github.com/google/gnostic v0.5.7-v3refs // indirect
7073
github.com/google/go-cmp v0.5.9 // indirect
7174
github.com/google/gofuzz v1.1.0 // indirect
7275
github.com/google/uuid v1.3.0 // indirect
7376
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
74-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
77+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
7578
github.com/hashicorp/hcl v1.0.0 // indirect
7679
github.com/imdario/mergo v0.3.7 // indirect
77-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
80+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
7881
github.com/jmespath/go-jmespath v0.4.0 // indirect
7982
github.com/josharian/intern v1.0.0 // indirect
8083
github.com/json-iterator/go v1.1.12 // indirect
8184
github.com/magiconair/properties v1.8.6 // indirect
8285
github.com/mailru/easyjson v0.7.6 // indirect
83-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
86+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
8487
github.com/mgutz/str v1.2.0 // indirect
8588
github.com/moby/spdystream v0.2.0 // indirect
86-
github.com/moby/sys/mountinfo v0.6.0 // indirect
87-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
89+
github.com/moby/sys/mountinfo v0.6.2 // indirect
90+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
8891
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8992
github.com/modern-go/reflect2 v1.0.2 // indirect
9093
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -94,36 +97,36 @@ require (
9497
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
9598
github.com/pkg/errors v0.9.1 // indirect
9699
github.com/pmezard/go-difflib v1.0.0 // indirect
97-
github.com/prometheus/client_golang v1.12.1 // indirect
98-
github.com/prometheus/client_model v0.2.0 // indirect
99-
github.com/prometheus/common v0.32.1 // indirect
100-
github.com/prometheus/procfs v0.7.3 // indirect
100+
github.com/prometheus/client_golang v1.14.0 // indirect
101+
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
101104
github.com/spf13/afero v1.8.2 // indirect
102105
github.com/spf13/cast v1.5.0 // indirect
103106
github.com/spf13/jwalterweatherman v1.1.0 // indirect
107+
github.com/stoewer/go-strcase v1.2.0 // indirect
104108
github.com/stretchr/objx v0.4.0 // indirect
105109
github.com/subosito/gotenv v1.3.0 // indirect
106-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
107-
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
108-
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
109-
go.opentelemetry.io/contrib v0.20.0 // indirect
110-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
111-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
112-
go.opentelemetry.io/otel v0.20.0 // indirect
113-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
114-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
115-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
116-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
117-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
118-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
119-
go.opentelemetry.io/proto/otlp v0.7.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
122+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
120123
go.uber.org/atomic v1.7.0 // indirect
121124
go.uber.org/multierr v1.6.0 // indirect
122125
go.uber.org/zap v1.19.0 // indirect
123-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
126+
golang.org/x/crypto v0.1.0 // indirect
124127
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
125128
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
126-
golang.org/x/text v0.4.0 // indirect
129+
golang.org/x/text v0.5.0 // indirect
127130
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
128131
google.golang.org/appengine v1.6.7 // indirect
129132
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
@@ -133,46 +136,45 @@ require (
133136
gopkg.in/warnings.v0 v0.1.2 // indirect
134137
gopkg.in/yaml.v3 v3.0.1 // indirect
135138
k8s.io/apiextensions-apiserver v0.0.0 // indirect
136-
k8s.io/component-helpers v0.25.3 // indirect
137-
k8s.io/controller-manager v0.25.3 // indirect
138-
k8s.io/csi-translation-lib v0.25.3 // indirect
139-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
139+
k8s.io/component-helpers v0.26.0 // indirect
140+
k8s.io/controller-manager v0.26.0 // indirect
141+
k8s.io/csi-translation-lib v0.26.0 // indirect
142+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
140143
k8s.io/kubectl v0.0.0 // indirect
141-
k8s.io/kubelet v0.0.0 // indirect
142144
k8s.io/pod-security-admission v0.0.0 // indirect
143145
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
144146
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
145147
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
146-
sigs.k8s.io/yaml v1.2.0 // indirect
148+
sigs.k8s.io/yaml v1.3.0 // indirect
147149
)
148150

149151
replace (
150152
google.golang.org/grpc v1.34.0 => google.golang.org/grpc v1.29.0
151-
k8s.io/api => k8s.io/api v0.25.3
152-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
153-
k8s.io/apimachinery => k8s.io/apimachinery v0.25.3
154-
k8s.io/apiserver => k8s.io/apiserver v0.25.3
155-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3
156-
k8s.io/client-go => k8s.io/client-go v0.25.3
157-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3
158-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3
159-
k8s.io/code-generator => k8s.io/code-generator v0.25.3
160-
k8s.io/component-base => k8s.io/component-base v0.25.3
161-
k8s.io/component-helpers => k8s.io/component-helpers v0.25.3
162-
k8s.io/controller-manager => k8s.io/controller-manager v0.25.3
163-
k8s.io/cri-api => k8s.io/cri-api v0.25.3
164-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3
165-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3
166-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3
167-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3
168-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3
169-
k8s.io/kubectl => k8s.io/kubectl v0.25.3
170-
k8s.io/kubelet => k8s.io/kubelet v0.25.3
171-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3
172-
k8s.io/metrics => k8s.io/metrics v0.25.3
173-
k8s.io/mount-utils => k8s.io/mount-utils v0.25.3
174-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3
175-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3
176-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.3
177-
k8s.io/sample-controller => k8s.io/sample-controller v0.25.3
153+
k8s.io/api => k8s.io/api v0.26.0
154+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
155+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
156+
k8s.io/apiserver => k8s.io/apiserver v0.26.0
157+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
158+
k8s.io/client-go => k8s.io/client-go v0.26.0
159+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
160+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
161+
k8s.io/code-generator => k8s.io/code-generator v0.26.0
162+
k8s.io/component-base => k8s.io/component-base v0.26.0
163+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
164+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
165+
k8s.io/cri-api => k8s.io/cri-api v0.26.0
166+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
167+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
168+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
169+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
170+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
171+
k8s.io/kubectl => k8s.io/kubectl v0.26.0
172+
k8s.io/kubelet => k8s.io/kubelet v0.26.0
173+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
174+
k8s.io/metrics => k8s.io/metrics v0.26.0
175+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
176+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
177+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
178+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0
179+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.0
178180
)

0 commit comments

Comments
 (0)