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]>

Author: stephenfin

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:

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

@@ -92,18 +92,13 @@ spec:
         - --provide-node-service=false
         - --v=${LOG_LEVEL}
         - --cluster-id=${CLUSTER_ID}
-        - --nodeid=$(NODE_ID)
         - --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
-        - name: NODE_ID
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix:///plugin/csi.sock
         - name: MANILA_SHARE_PROTO

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

@@ -38,18 +38,13 @@ spec:
         - --provide-controller-service=false
         - --provide-node-service=true
         - --v=${LOG_LEVEL}
-        - --nodeid=$(NODE_ID)
         - --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
-        - name: NODE_ID
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix:///var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock
         - name: FWD_CSI_ENDPOINT

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

@@ -62,18 +62,13 @@ spec:
         - --provide-node-service=false
         - --v=${LOG_LEVEL}
         - --cluster-id=${CLUSTER_ID}
-        - --nodeid=$(NODE_ID)
         - --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
-        - name: NODE_ID
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix:///plugin/csi.sock
         - name: MANILA_SHARE_PROTO

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

@@ -38,18 +38,13 @@ spec:
         - --provide-controller-service=false
         - --provide-node-service=true
         - --v=${LOG_LEVEL}
-        - --nodeid=$(NODE_ID)
         - --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
-        - name: NODE_ID
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix:///var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock
         - name: FWD_CSI_ENDPOINT

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

@@ -42,18 +42,13 @@ spec:
             - --provide-node-service=false
             - --v=${LOG_LEVEL}
             - --cluster-id=${CLUSTER_ID}
-            - --nodeid=$(NODE_ID)
             - --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
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix:///plugin/csi.sock
             - name: MANILA_SHARE_PROTO
@@ -88,9 +83,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:

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

@@ -40,18 +40,13 @@ spec:
             - "--provide-controller-service=false"
             - "--provide-node-service=true"
             - --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
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix:///var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock
             - name: FWD_CSI_ENDPOINT