From 79d6c55ebf00ba6d906ee592f8c1ac7bcd7fec15 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 13 May 2025 18:51:28 +0100 Subject: [PATCH] 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 --- .../openstack-cinder/generated/hypershift/node.yaml | 6 ++++++ .../openstack-cinder/generated/standalone/node.yaml | 6 ++++++ .../overlays/openstack-cinder/patches/node_add_driver.yaml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/assets/overlays/openstack-cinder/generated/hypershift/node.yaml b/assets/overlays/openstack-cinder/generated/hypershift/node.yaml index f5b325f89..6a56f8646 100644 --- a/assets/overlays/openstack-cinder/generated/hypershift/node.yaml +++ b/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: diff --git a/assets/overlays/openstack-cinder/generated/standalone/node.yaml b/assets/overlays/openstack-cinder/generated/standalone/node.yaml index f5b325f89..6a56f8646 100644 --- a/assets/overlays/openstack-cinder/generated/standalone/node.yaml +++ b/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: diff --git a/assets/overlays/openstack-cinder/patches/node_add_driver.yaml b/assets/overlays/openstack-cinder/patches/node_add_driver.yaml index 8ef9b1ec2..87ccadfc1 100644 --- a/assets/overlays/openstack-cinder/patches/node_add_driver.yaml +++ b/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