Skip to content

Commit 3fbfbd5

Browse files
dkokkinostephenfin
authored andcommitted
Update manila assets for new authentication method
- Adding clouds.yaml as a secret mount volume. This will be used for authentication by the manila driver to match how cinder does authentication.
1 parent 9816f92 commit 3fbfbd5

File tree

6 files changed

+54
-0
lines changed

6 files changed

+54
-0
lines changed

assets/overlays/openstack-manila/generated/hypershift/controller.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ spec:
140140
name: socket-dir
141141
- mountPath: /etc/kubernetes/static-pod-resources/configmaps/cloud-config
142142
name: cacert
143+
- mountPath: /etc/openstack
144+
name: cloud-credentials
145+
readOnly: true
143146
- args:
144147
- --nodeid=$(NODE_ID)
145148
- --endpoint=unix://plugin/csi-nfs.sock
@@ -350,6 +353,12 @@ spec:
350353
- name: metrics-serving-cert
351354
secret:
352355
secretName: manila-csi-driver-controller-metrics-serving-cert
356+
- name: cloud-credentials
357+
secret:
358+
items:
359+
- key: clouds.yaml
360+
path: clouds.yaml
361+
secretName: manila-cloud-credentials
353362
- configMap:
354363
items:
355364
- key: ca-bundle.pem

assets/overlays/openstack-manila/generated/hypershift/node.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ spec:
8080
privileged: true
8181
terminationMessagePolicy: FallbackToLogsOnError
8282
volumeMounts:
83+
- mountPath: /etc/openstack
84+
name: cloud-credentials
85+
readOnly: true
8386
- mountPath: /var/lib/kubelet/plugins/manila.csi.openstack.org
8487
name: plugin-dir
8588
- mountPath: /var/lib/kubelet/plugins/csi-nfsplugin
@@ -184,6 +187,12 @@ spec:
184187
- name: metrics-serving-cert
185188
secret:
186189
secretName: manila-csi-driver-node-metrics-serving-cert
190+
- name: cloud-credentials
191+
secret:
192+
items:
193+
- key: clouds.yaml
194+
path: clouds.yaml
195+
secretName: manila-cloud-credentials
187196
- hostPath:
188197
path: /var/lib/kubelet/plugins/manila.csi.openstack.org
189198
type: DirectoryOrCreate

assets/overlays/openstack-manila/generated/standalone/controller.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ spec:
109109
name: socket-dir
110110
- mountPath: /etc/kubernetes/static-pod-resources/configmaps/cloud-config
111111
name: cacert
112+
- mountPath: /etc/openstack
113+
name: cloud-credentials
114+
readOnly: true
112115
- args:
113116
- --nodeid=$(NODE_ID)
114117
- --endpoint=unix://plugin/csi-nfs.sock
@@ -298,6 +301,12 @@ spec:
298301
- name: metrics-serving-cert
299302
secret:
300303
secretName: manila-csi-driver-controller-metrics-serving-cert
304+
- name: cloud-credentials
305+
secret:
306+
items:
307+
- key: clouds.yaml
308+
path: clouds.yaml
309+
secretName: manila-cloud-credentials
301310
- configMap:
302311
items:
303312
- key: ca-bundle.pem

assets/overlays/openstack-manila/generated/standalone/node.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ spec:
8080
privileged: true
8181
terminationMessagePolicy: FallbackToLogsOnError
8282
volumeMounts:
83+
- mountPath: /etc/openstack
84+
name: cloud-credentials
85+
readOnly: true
8386
- mountPath: /var/lib/kubelet/plugins/manila.csi.openstack.org
8487
name: plugin-dir
8588
- mountPath: /var/lib/kubelet/plugins/csi-nfsplugin
@@ -184,6 +187,12 @@ spec:
184187
- name: metrics-serving-cert
185188
secret:
186189
secretName: manila-csi-driver-node-metrics-serving-cert
190+
- name: cloud-credentials
191+
secret:
192+
items:
193+
- key: clouds.yaml
194+
path: clouds.yaml
195+
secretName: manila-cloud-credentials
187196
- hostPath:
188197
path: /var/lib/kubelet/plugins/manila.csi.openstack.org
189198
type: DirectoryOrCreate

assets/overlays/openstack-manila/patches/controller_add_driver.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ spec:
8282
mountPath: /plugin
8383
- name: cacert
8484
mountPath: /etc/kubernetes/static-pod-resources/configmaps/cloud-config
85+
- name: cloud-credentials
86+
mountPath: /etc/openstack
87+
readOnly: true
8588
resources:
8689
requests:
8790
cpu: 10m
@@ -109,6 +112,12 @@ spec:
109112
memory: 50Mi
110113
terminationMessagePolicy: FallbackToLogsOnError
111114
volumes:
115+
- name: cloud-credentials
116+
secret:
117+
secretName: manila-cloud-credentials
118+
items:
119+
- key: clouds.yaml
120+
path: clouds.yaml
112121
- name: socket-dir
113122
emptyDir: {}
114123
- name: cacert

assets/overlays/openstack-manila/patches/node_add_driver.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ spec:
5959
- name: MANILA_SHARE_PROTO
6060
value: NFS
6161
volumeMounts:
62+
- name: cloud-credentials
63+
mountPath: /etc/openstack
64+
readOnly: true
6265
- name: plugin-dir
6366
mountPath: /var/lib/kubelet/plugins/manila.csi.openstack.org
6467
- name: fwd-plugin-dir
@@ -88,6 +91,12 @@ spec:
8891
memory: 50Mi
8992
terminationMessagePolicy: FallbackToLogsOnError
9093
volumes:
94+
- name: cloud-credentials
95+
secret:
96+
secretName: manila-cloud-credentials
97+
items:
98+
- key: clouds.yaml
99+
path: clouds.yaml
91100
- name: registration-dir
92101
hostPath:
93102
path: /var/lib/kubelet/plugins_registry/

0 commit comments

Comments
 (0)