Merge pull request #384 from openshift-cherrypick-robot/cherry-pick-383-to-release-4.19

[release-4.19] OCPBUGS-56527: openstack-cinder: Set --with-topology flag for node driver also

Author: openshift-merge-bot[bot]

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

@@ -38,12 +38,18 @@ spec:
         - --provide-node-service=true
         - --endpoint=$(CSI_ENDPOINT)
         - --cloud-config=$(CLOUD_CONFIG)
+        - --with-topology=$(ENABLE_TOPOLOGY)
         - --v=${LOG_LEVEL}
         env:
         - name: CSI_ENDPOINT
           value: unix://csi/csi.sock
         - name: CLOUD_CONFIG
           value: /etc/kubernetes/config/cloud.conf
+        - name: ENABLE_TOPOLOGY
+          valueFrom:
+            configMapKeyRef:
+              key: enable_topology
+              name: cloud-conf
         image: ${DRIVER_IMAGE}
         imagePullPolicy: IfNotPresent
         livenessProbe:

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

@@ -38,12 +38,18 @@ spec:
         - --provide-node-service=true
         - --endpoint=$(CSI_ENDPOINT)
         - --cloud-config=$(CLOUD_CONFIG)
+        - --with-topology=$(ENABLE_TOPOLOGY)
         - --v=${LOG_LEVEL}
         env:
         - name: CSI_ENDPOINT
           value: unix://csi/csi.sock
         - name: CLOUD_CONFIG
           value: /etc/kubernetes/config/cloud.conf
+        - name: ENABLE_TOPOLOGY
+          valueFrom:
+            configMapKeyRef:
+              key: enable_topology
+              name: cloud-conf
         image: ${DRIVER_IMAGE}
         imagePullPolicy: IfNotPresent
         livenessProbe:

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

@@ -25,12 +25,18 @@ spec:
             - "--provide-node-service=true"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--cloud-config=$(CLOUD_CONFIG)"
+            - "--with-topology=$(ENABLE_TOPOLOGY)"
             - "--v=${LOG_LEVEL}"
           env:
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock
             - name: CLOUD_CONFIG
               value: /etc/kubernetes/config/cloud.conf
+            - name: ENABLE_TOPOLOGY
+              valueFrom:
+                configMapKeyRef:
+                  key: enable_topology
+                  name: cloud-conf
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet