From 60ce358092072e083db6f69e23bd57dd73c9729e Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 9 Dec 2024 12:27:43 +0000 Subject: [PATCH] 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] https://github.com/kubernetes/cloud-provider-openstack/pull/2734 Signed-off-by: Stephen Finucane --- assets/overlays/openstack-manila/base/node_nfs.yaml | 6 +++--- .../generated/hypershift/controller.yaml | 5 ----- .../openstack-manila/generated/hypershift/node.yaml | 5 ----- .../generated/standalone/controller.yaml | 5 ----- .../openstack-manila/generated/standalone/node.yaml | 5 ----- .../patches/controller_add_driver.yaml | 11 +++-------- .../openstack-manila/patches/node_add_driver.yaml | 13 ++++--------- 7 files changed, 10 insertions(+), 40 deletions(-) diff --git a/assets/overlays/openstack-manila/base/node_nfs.yaml b/assets/overlays/openstack-manila/base/node_nfs.yaml index 2b0caad38..b14308716 100644 --- 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 index 60aa85b2e..aad06bcc8 100644 --- a/assets/overlays/openstack-manila/generated/hypershift/controller.yaml +++ b/assets/overlays/openstack-manila/generated/hypershift/controller.yaml @@ -92,7 +92,6 @@ 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) @@ -100,10 +99,6 @@ spec: 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 diff --git a/assets/overlays/openstack-manila/generated/hypershift/node.yaml b/assets/overlays/openstack-manila/generated/hypershift/node.yaml index dc7fdbf09..5a70b657f 100644 --- a/assets/overlays/openstack-manila/generated/hypershift/node.yaml +++ b/assets/overlays/openstack-manila/generated/hypershift/node.yaml @@ -38,7 +38,6 @@ 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) @@ -46,10 +45,6 @@ spec: 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 diff --git a/assets/overlays/openstack-manila/generated/standalone/controller.yaml b/assets/overlays/openstack-manila/generated/standalone/controller.yaml index 07ef51ba8..a0dd74557 100644 --- a/assets/overlays/openstack-manila/generated/standalone/controller.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/controller.yaml @@ -62,7 +62,6 @@ 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) @@ -70,10 +69,6 @@ spec: 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 diff --git a/assets/overlays/openstack-manila/generated/standalone/node.yaml b/assets/overlays/openstack-manila/generated/standalone/node.yaml index dc7fdbf09..5a70b657f 100644 --- a/assets/overlays/openstack-manila/generated/standalone/node.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/node.yaml @@ -38,7 +38,6 @@ 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) @@ -46,10 +45,6 @@ spec: 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 diff --git a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml index 009ee7dff..9ba35ac0f 100644 --- a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml +++ b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml @@ -42,7 +42,6 @@ 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) @@ -50,10 +49,6 @@ spec: 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: diff --git a/assets/overlays/openstack-manila/patches/node_add_driver.yaml b/assets/overlays/openstack-manila/patches/node_add_driver.yaml index d131b6c9c..7dad154d3 100644 --- a/assets/overlays/openstack-manila/patches/node_add_driver.yaml +++ b/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