Skip to content

Commit 913fca3

Browse files
stephenfinopenshift-cherrypick-robot
authored andcommitted
OCPBUGS-56128: openstack-cinder: Set --with-topology flag for node driver also
Failure to do so results in the node driver reporting topology information which the provisioner respects, preventing us attaching the created volume. Signed-off-by: Stephen Finucane <[email protected]>
1 parent 6bb1249 commit 913fca3

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ spec:
3838
- --provide-node-service=true
3939
- --endpoint=$(CSI_ENDPOINT)
4040
- --cloud-config=$(CLOUD_CONFIG)
41+
- --with-topology=$(ENABLE_TOPOLOGY)
4142
- --v=${LOG_LEVEL}
4243
env:
4344
- name: CSI_ENDPOINT
4445
value: unix://csi/csi.sock
4546
- name: CLOUD_CONFIG
4647
value: /etc/kubernetes/config/cloud.conf
48+
- name: ENABLE_TOPOLOGY
49+
valueFrom:
50+
configMapKeyRef:
51+
key: enable_topology
52+
name: cloud-conf
4753
image: ${DRIVER_IMAGE}
4854
imagePullPolicy: IfNotPresent
4955
livenessProbe:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ spec:
3838
- --provide-node-service=true
3939
- --endpoint=$(CSI_ENDPOINT)
4040
- --cloud-config=$(CLOUD_CONFIG)
41+
- --with-topology=$(ENABLE_TOPOLOGY)
4142
- --v=${LOG_LEVEL}
4243
env:
4344
- name: CSI_ENDPOINT
4445
value: unix://csi/csi.sock
4546
- name: CLOUD_CONFIG
4647
value: /etc/kubernetes/config/cloud.conf
48+
- name: ENABLE_TOPOLOGY
49+
valueFrom:
50+
configMapKeyRef:
51+
key: enable_topology
52+
name: cloud-conf
4753
image: ${DRIVER_IMAGE}
4854
imagePullPolicy: IfNotPresent
4955
livenessProbe:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,18 @@ spec:
2525
- "--provide-node-service=true"
2626
- "--endpoint=$(CSI_ENDPOINT)"
2727
- "--cloud-config=$(CLOUD_CONFIG)"
28+
- "--with-topology=$(ENABLE_TOPOLOGY)"
2829
- "--v=${LOG_LEVEL}"
2930
env:
3031
- name: CSI_ENDPOINT
3132
value: unix://csi/csi.sock
3233
- name: CLOUD_CONFIG
3334
value: /etc/kubernetes/config/cloud.conf
35+
- name: ENABLE_TOPOLOGY
36+
valueFrom:
37+
configMapKeyRef:
38+
key: enable_topology
39+
name: cloud-conf
3440
volumeMounts:
3541
- name: kubelet-dir
3642
mountPath: /var/lib/kubelet

0 commit comments

Comments
 (0)