openstack-manila: Remove --nodeid parameter

This option is deprecated as the driver can now auto-configure this [1]. We can also remove some unnecessary quoting. Note that we don't remove the option from the NFS driver as that is a separate binary that doesn't support this auto-configuration. [1] kubernetes/cloud-provider-openstack#2734 Signed-off-by: Stephen Finucane <[email protected]>
shiftstack · Dec 9, 2024 · fe91592 · fe91592
1 parent c4b3e22
commit fe91592
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/assets/overlays/openstack-manila/base/node_nfs.yaml b/assets/overlays/openstack-manila/base/node_nfs.yaml
@@ -38,9 +38,9 @@ spec:
               cpu: 10m
           args:
             - --v=${LOG_LEVEL}
-            - "--nodeid=$(NODE_ID)"
-            - "--endpoint=unix://plugin/csi.sock"
-            - "--mount-permissions=0777"
+            - --nodeid=$(NODE_ID)
+            - --endpoint=unix://plugin/csi.sock
+            - --mount-permissions=0777
           env:
             - name: NODE_ID
               valueFrom:

diff --git a/assets/overlays/openstack-manila/generated/hypershift/controller.yaml b/assets/overlays/openstack-manila/generated/hypershift/controller.yaml
@@ -91,7 +91,6 @@ spec:
       - args:
         - --v=${LOG_LEVEL}
         - --cluster-id=${CLUSTER_ID}
-        - --nodeid=$(NODE_ID)
         - --endpoint=$(CSI_ENDPOINT)
         - --drivername=$(DRIVER_NAME)
         - --share-protocol-selector=$(MANILA_SHARE_PROTO)

diff --git a/assets/overlays/openstack-manila/generated/hypershift/node.yaml b/assets/overlays/openstack-manila/generated/hypershift/node.yaml
@@ -36,7 +36,6 @@ spec:
       containers:
       - args:
         - --v=${LOG_LEVEL}
-        - --nodeid=$(NODE_ID)
         - --endpoint=$(CSI_ENDPOINT)
         - --drivername=$(DRIVER_NAME)
         - --share-protocol-selector=$(MANILA_SHARE_PROTO)

diff --git a/assets/overlays/openstack-manila/generated/standalone/controller.yaml b/assets/overlays/openstack-manila/generated/standalone/controller.yaml
@@ -61,7 +61,6 @@ spec:
       - args:
         - --v=${LOG_LEVEL}
         - --cluster-id=${CLUSTER_ID}
-        - --nodeid=$(NODE_ID)
         - --endpoint=$(CSI_ENDPOINT)
         - --drivername=$(DRIVER_NAME)
         - --share-protocol-selector=$(MANILA_SHARE_PROTO)

diff --git a/assets/overlays/openstack-manila/generated/standalone/node.yaml b/assets/overlays/openstack-manila/generated/standalone/node.yaml
@@ -36,7 +36,6 @@ spec:
       containers:
       - args:
         - --v=${LOG_LEVEL}
-        - --nodeid=$(NODE_ID)
         - --endpoint=$(CSI_ENDPOINT)
         - --drivername=$(DRIVER_NAME)
         - --share-protocol-selector=$(MANILA_SHARE_PROTO)

diff --git a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml
@@ -40,7 +40,6 @@ spec:
           args:
             - --v=${LOG_LEVEL}
             - --cluster-id=${CLUSTER_ID}
-            - --nodeid=$(NODE_ID)
             - --endpoint=$(CSI_ENDPOINT)
             - --drivername=$(DRIVER_NAME)
             - --share-protocol-selector=$(MANILA_SHARE_PROTO)
@@ -86,9 +85,9 @@ spec:
           image: ${NFS_DRIVER_IMAGE}
           imagePullPolicy: IfNotPresent
           args:
-            - "--nodeid=$(NODE_ID)"
-            - "--endpoint=unix://plugin/csi-nfs.sock"
-            - "--mount-permissions=0777"
+            - --nodeid=$(NODE_ID)
+            - --endpoint=unix://plugin/csi-nfs.sock
+            - --mount-permissions=0777
           env:
             - name: NODE_ID
               valueFrom:

diff --git a/assets/overlays/openstack-manila/patches/node_add_driver.yaml b/assets/overlays/openstack-manila/patches/node_add_driver.yaml
@@ -38,11 +38,10 @@ spec:
           imagePullPolicy: IfNotPresent
           args:
             - --v=${LOG_LEVEL}
-            - "--nodeid=$(NODE_ID)"
-            - "--endpoint=$(CSI_ENDPOINT)"
-            - "--drivername=$(DRIVER_NAME)"
-            - "--share-protocol-selector=$(MANILA_SHARE_PROTO)"
-            - "--fwdendpoint=$(FWD_CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --drivername=$(DRIVER_NAME)
+            - --share-protocol-selector=$(MANILA_SHARE_PROTO)
+            - --fwdendpoint=$(FWD_CSI_ENDPOINT)
           env:
             - name: DRIVER_NAME
               value: manila.csi.openstack.org