Skip to content

Commit e128917

Browse files
lingxiankonglingxiankong
authored
[All] Update Kubernetes dependency to v1.18.0 (#991)
1 parent 78691ef commit e128917

File tree

123 files changed

+301
-6918
lines changed

Some content is hidden

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

123 files changed

+301
-6918
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- [ ] client-keystone-auth
1414
- [ ] octavia-ingress-controller
1515
- [ ] manila-csi-plugin
16-
- [ ] manila-provisioner
1716
- [ ] magnum-auto-healer
1817
- [ ] barbican-kms-plugin
1918

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,10 @@ zz_generated.openapi.go
138138

139139
# binaries
140140
/openstack-cloud-controller-manager
141-
/cinder-flex-volume-driver
142-
/cinder-provisioner
143141
/k8s-keystone-auth
144142
/cinder-csi-plugin
145143
/octavia-ingress-controller
146144
/client-keystone-auth
147-
/manila-provisioner
148145
/barbican-kms-plugin
149146
/magnum-auto-healer
150147
/manila-csi-plugin

‎.zuul.yaml‎

Lines changed: 38 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
- pkg/cloudprovider/.*
1818
- pkg/util/.*
1919
- tests/e2e/cloudprovider/.*
20-
- ^go.mod$
21-
- ^go.sum$
22-
- ^Makefile$
20+
- go.mod$
21+
- go.sum$
22+
- Makefile$
2323
irrelevant-files:
2424
- docs/.*$
2525
- ^.*\.md$
@@ -40,38 +40,18 @@
4040
jobs:
4141
- cloud-provider-openstack-acceptance-test-keystone-authentication-authorization:
4242
files:
43-
- ^cmd/k8s-keystone-auth/.*
44-
- ^pkg/identity/.*
45-
- ^go.mod$
46-
- ^go.sum$
47-
- ^Makefile$
43+
- cmd/k8s-keystone-auth/.*
44+
- pkg/identity/.*
45+
- go.mod$
46+
- go.sum$
47+
- Makefile$
4848
- tests/e2e/k8s-keystone-auth/.*
4949
irrelevant-files:
5050
- ^docs/.*$
5151
- ^.*\.md$
5252
- ^OWNERS$
5353
- ^SECURITY_CONTACTS$
5454
- ^.gitignore$
55-
# Disable the job for Kubernetes in-tree cinder function.
56-
# cloud-provider-openstack-acceptance-test-k8s-cinder:
57-
# jobs:
58-
# - cloud-provider-openstack-acceptance-test-k8s-cinder:
59-
# irrelevant-files:
60-
# - ^docs/.*$
61-
# - ^.*\.md$
62-
# - ^OWNERS$
63-
# - ^SECURITY_CONTACTS$
64-
# - ^.gitignore$
65-
# Disable Standalone Cinder Driver Job as it is deprecated
66-
# cloud-provider-openstack-acceptance-test-standalone-cinder:
67-
# jobs:
68-
# - cloud-provider-openstack-acceptance-test-standalone-cinder:
69-
# irrelevant-files:
70-
# - ^docs/.*$
71-
# - ^.*\.md$
72-
# - ^OWNERS$
73-
# - ^SECURITY_CONTACTS$
74-
# - ^.gitignore$
7555
cloud-provider-openstack-acceptance-test-csi-cinder:
7656
jobs:
7757
- cloud-provider-openstack-acceptance-test-csi-cinder:
@@ -82,9 +62,9 @@
8262
- pkg/cloudprovider/providers/openstack/.*
8363
- test/.*
8464
- cmd/tests/.*
85-
- ^go.mod$
86-
- ^go.sum$
87-
- ^Makefile$
65+
- go.mod$
66+
- go.sum$
67+
- Makefile$
8868
irrelevant-files:
8969
- ^docs/.*$
9070
- ^.*\.md$
@@ -95,37 +75,27 @@
9575
jobs:
9676
- cloud-provider-openstack-e2e-test-csi-cinder:
9777
files:
98-
- ^cmd/cinder-csi-plugin/.*
99-
- ^pkg/csi/cinder/.*
100-
- ^pkg/util/.*
101-
- ^test/.*
102-
- ^cmd/tests/.*
103-
- ^go.mod$
104-
- ^go.sum$
105-
- ^Makefile$
106-
# Disable Cinder FlexVolume Driver Job as it is deprecated in cloud-provider-openstack repo.
107-
# cloud-provider-openstack-acceptance-test-flexvolume-cinder:
108-
# jobs:
109-
# - cloud-provider-openstack-acceptance-test-flexvolume-cinder:
110-
# irrelevant-files:
111-
# - ^docs/.*$
112-
# - ^.*\.md$
113-
# - ^OWNERS$
114-
# - ^SECURITY_CONTACTS$
115-
# - ^.gitignore$
78+
- cmd/cinder-csi-plugin/.*
79+
- pkg/csi/cinder/.*
80+
- pkg/util/.*
81+
- test/.*
82+
- cmd/tests/.*
83+
- go.mod$
84+
- go.sum$
85+
- Makefile$
11686
cloud-provider-openstack-acceptance-test-csi-manila:
11787
jobs:
11888
- cloud-provider-openstack-acceptance-test-csi-manila:
11989
files:
120-
- ^cmd/manila-csi-plugin/.*
121-
- ^examples/manila-csi-plugin/.*
122-
- ^pkg/csi/manila/.*
123-
- ^pkg/util/errors/.*
124-
- ^pkg/cloudprovider/providers/openstack/.*
125-
- ^pkg/share/manila/shareoptions/validator/.*
126-
- ^go.mod$
127-
- ^go.sum$
128-
- ^Makefile$
90+
- cmd/manila-csi-plugin/.*
91+
- examples/manila-csi-plugin/.*
92+
- pkg/csi/manila/.*
93+
- pkg/util/errors/.*
94+
- pkg/cloudprovider/providers/openstack/.*
95+
- pkg/share/manila/shareoptions/validator/.*
96+
- go.mod$
97+
- go.sum$
98+
- Makefile$
12999
irrelevant-files:
130100
- ^docs/.*$
131101
- ^.*\.md$
@@ -136,23 +106,10 @@
136106
jobs:
137107
- cloud-provider-openstack-acceptance-test-e2e-conformance:
138108
files:
139-
- ^pkg/cloudprovider/.*
140-
- ^go.mod$
141-
- ^go.sum$
142-
- ^Makefile$
143-
irrelevant-files:
144-
- ^docs/.*$
145-
- ^.*\.md$
146-
- ^OWNERS$
147-
- ^SECURITY_CONTACTS$
148-
- ^.gitignore$
149-
cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.15:
150-
jobs:
151-
- cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.15:
152-
files:
153-
- ^pkg/cloudprovider/.*
154-
- ^go.mod$
155-
- ^go.sum$
109+
- pkg/cloudprovider/.*
110+
- go.mod$
111+
- go.sum$
112+
- Makefile$
156113
irrelevant-files:
157114
- ^docs/.*$
158115
- ^.*\.md$
@@ -163,9 +120,9 @@
163120
jobs:
164121
- cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.16:
165122
files:
166-
- ^pkg/cloudprovider/.*
167-
- ^go.mod$
168-
- ^go.sum$
123+
- pkg/cloudprovider/.*
124+
- go.mod$
125+
- go.sum$
169126
irrelevant-files:
170127
- ^docs/.*$
171128
- ^.*\.md$
@@ -176,9 +133,9 @@
176133
jobs:
177134
- cloud-provider-openstack-acceptance-test-e2e-conformance-stable-branch-v1.17:
178135
files:
179-
- ^pkg/cloudprovider/.*
180-
- ^go.mod$
181-
- ^go.sum$
136+
- pkg/cloudprovider/.*
137+
- go.mod$
138+
- go.sum$
182139
irrelevant-files:
183140
- ^docs/.*$
184141
- ^.*\.md$

‎Makefile‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,23 @@ TAGS :=
4343
LDFLAGS := "-w -s -X 'k8s.io/cloud-provider-openstack/pkg/version.Version=${VERSION}'"
4444
REGISTRY ?= k8scloudprovider
4545
IMAGE_OS ?= linux
46-
IMAGE_NAMES ?= openstack-cloud-controller-manager cinder-flex-volume-driver \
47-
cinder-provisioner cinder-csi-plugin k8s-keystone-auth \
48-
octavia-ingress-controller manila-provisioner manila-csi-plugin \
49-
barbican-kms-plugin magnum-auto-healer
46+
IMAGE_NAMES ?= openstack-cloud-controller-manager \
47+
cinder-csi-plugin \
48+
k8s-keystone-auth \
49+
octavia-ingress-controller \
50+
manila-csi-plugin \
51+
barbican-kms-plugin \
52+
magnum-auto-healer
5053
ARCH ?= amd64
5154
ARCHS ?= amd64 arm arm64 ppc64le s390x
52-
BUILD_CMDS ?= openstack-cloud-controller-manager cinder-provisioner \
53-
cinder-flex-volume-driver cinder-csi-plugin k8s-keystone-auth \
54-
client-keystone-auth octavia-ingress-controller manila-provisioner \
55-
manila-csi-plugin barbican-kms-plugin magnum-auto-healer
55+
BUILD_CMDS ?= openstack-cloud-controller-manager \
56+
cinder-csi-plugin \
57+
k8s-keystone-auth \
58+
octavia-ingress-controller \
59+
manila-csi-plugin \
60+
barbican-kms-plugin \
61+
magnum-auto-healer \
62+
client-keystone-auth
5663

5764
# This option is for running docker manifest command
5865
export DOCKER_CLI_EXPERIMENTAL := enabled
@@ -297,13 +304,10 @@ ifndef HAS_GOX
297304
GO111MODULE=off go get -u github.com/mitchellh/gox
298305
endif
299306
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/openstack-cloud-controller-manager/
300-
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/cinder-provisioner/
301307
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/cinder-csi-plugin/
302-
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/cinder-flex-volume-driver/
303308
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/k8s-keystone-auth/
304309
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/client-keystone-auth/
305310
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/octavia-ingress-controller/
306-
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/manila-provisioner/
307311
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/manila-csi-plugin/
308312
CGO_ENABLED=0 gox -parallel=$(GOX_PARALLEL) -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) $(if $(TAGS),-tags '$(TAGS)',) -ldflags '$(LDFLAGS)' $(GIT_HOST)/$(BASE_DIR)/cmd/magnum-auto-healer/
309313

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ This Repository hosts various plugins relevant to OpenStack and Kubernetes Integ
99
* [Cinder CSI Plugin](/docs/using-cinder-csi-plugin.md/)
1010
* [Keystone Webhook Authentication Authorization](/docs/using-keystone-webhook-authenticator-and-authorizer.md/)
1111
* [Client Keystone](/docs/using-client-keystone-auth.md/)
12-
* [Cinder Standalone Provisioner](/docs/using-cinder-standalone-provisioner.md/) - **DEPRECATED**
1312
* [Manila CSI Plugin](/docs/using-manila-csi-plugin.md/)
14-
* [Manila Provisioner](/docs/using-manila-provisioner.md/)
1513
* [Barbican KMS Plugin](/docs/using-barbican-kms-plugin.md/)
1614
* [Magnum Auto Healer](/docs/using-magnum-auto-healer.md/)
17-
* Cinder FlexVolume Driver - **DEPRECATED**
15+
16+
> NOTE: Cinder Standalone Provisioner, Manila Provisioner and Cinder FlexVolume Driver were removed since release v1.18.0.
1817
1918
## Developing
2019

‎cluster/images/cinder-flex-volume-driver/Dockerfile‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎cluster/images/cinder-flex-volume-driver/Dockerfile.build‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎cluster/images/cinder-flex-volume-driver/cinder.conf.default‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)