Skip to content

Commit f7e7099

Browse files
stephenfinstephenfin
committed
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 <stephenfin@redhat.com>
1 parent a22ac11 commit f7e7099

File tree

7 files changed

+10
-40
lines changed

7 files changed

+10
-40
lines changed

‎assets/overlays/openstack-manila/base/node_nfs.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ spec:
3838
cpu: 10m
3939
args:
4040
- --v=${LOG_LEVEL}
41-
- "--nodeid=$(NODE_ID)"
42-
- "--endpoint=unix://plugin/csi.sock"
43-
- "--mount-permissions=0777"
41+
- --nodeid=$(NODE_ID)
42+
- --endpoint=unix://plugin/csi.sock
43+
- --mount-permissions=0777
4444
env:
4545
- name: NODE_ID
4646
valueFrom:

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,13 @@ spec:
9191
- args:
9292
- --v=${LOG_LEVEL}
9393
- --cluster-id=${CLUSTER_ID}
94-
- --nodeid=$(NODE_ID)
9594
- --endpoint=$(CSI_ENDPOINT)
9695
- --drivername=$(DRIVER_NAME)
9796
- --share-protocol-selector=$(MANILA_SHARE_PROTO)
9897
- --fwdendpoint=$(FWD_CSI_ENDPOINT)
9998
env:
10099
- name: DRIVER_NAME
101100
value: manila.csi.openstack.org
102-
- name: NODE_ID
103-
valueFrom:
104-
fieldRef:
105-
fieldPath: spec.nodeName
106101
- name: CSI_ENDPOINT
107102
value: unix:///plugin/csi.sock
108103
- name: MANILA_SHARE_PROTO

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@ spec:
3636
containers:
3737
- args:
3838
- --v=${LOG_LEVEL}
39-
- --nodeid=$(NODE_ID)
4039
- --endpoint=$(CSI_ENDPOINT)
4140
- --drivername=$(DRIVER_NAME)
4241
- --share-protocol-selector=$(MANILA_SHARE_PROTO)
4342
- --fwdendpoint=$(FWD_CSI_ENDPOINT)
4443
env:
4544
- name: DRIVER_NAME
4645
value: manila.csi.openstack.org
47-
- name: NODE_ID
48-
valueFrom:
49-
fieldRef:
50-
fieldPath: spec.nodeName
5146
- name: CSI_ENDPOINT
5247
value: unix:///var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock
5348
- name: FWD_CSI_ENDPOINT

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,13 @@ spec:
6161
- args:
6262
- --v=${LOG_LEVEL}
6363
- --cluster-id=${CLUSTER_ID}
64-
- --nodeid=$(NODE_ID)
6564
- --endpoint=$(CSI_ENDPOINT)
6665
- --drivername=$(DRIVER_NAME)
6766
- --share-protocol-selector=$(MANILA_SHARE_PROTO)
6867
- --fwdendpoint=$(FWD_CSI_ENDPOINT)
6968
env:
7069
- name: DRIVER_NAME
7170
value: manila.csi.openstack.org
72-
- name: NODE_ID
73-
valueFrom:
74-
fieldRef:
75-
fieldPath: spec.nodeName
7671
- name: CSI_ENDPOINT
7772
value: unix:///plugin/csi.sock
7873
- name: MANILA_SHARE_PROTO

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@ spec:
3636
containers:
3737
- args:
3838
- --v=${LOG_LEVEL}
39-
- --nodeid=$(NODE_ID)
4039
- --endpoint=$(CSI_ENDPOINT)
4140
- --drivername=$(DRIVER_NAME)
4241
- --share-protocol-selector=$(MANILA_SHARE_PROTO)
4342
- --fwdendpoint=$(FWD_CSI_ENDPOINT)
4443
env:
4544
- name: DRIVER_NAME
4645
value: manila.csi.openstack.org
47-
- name: NODE_ID
48-
valueFrom:
49-
fieldRef:
50-
fieldPath: spec.nodeName
5146
- name: CSI_ENDPOINT
5247
value: unix:///var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock
5348
- name: FWD_CSI_ENDPOINT

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,13 @@ spec:
4040
args:
4141
- --v=${LOG_LEVEL}
4242
- --cluster-id=${CLUSTER_ID}
43-
- --nodeid=$(NODE_ID)
4443
- --endpoint=$(CSI_ENDPOINT)
4544
- --drivername=$(DRIVER_NAME)
4645
- --share-protocol-selector=$(MANILA_SHARE_PROTO)
4746
- --fwdendpoint=$(FWD_CSI_ENDPOINT)
4847
env:
4948
- name: DRIVER_NAME
5049
value: manila.csi.openstack.org
51-
- name: NODE_ID
52-
valueFrom:
53-
fieldRef:
54-
fieldPath: spec.nodeName
5550
- name: CSI_ENDPOINT
5651
value: unix:///plugin/csi.sock
5752
- name: MANILA_SHARE_PROTO
@@ -86,9 +81,9 @@ spec:
8681
image: ${NFS_DRIVER_IMAGE}
8782
imagePullPolicy: IfNotPresent
8883
args:
89-
- "--nodeid=$(NODE_ID)"
90-
- "--endpoint=unix://plugin/csi-nfs.sock"
91-
- "--mount-permissions=0777"
84+
- --nodeid=$(NODE_ID)
85+
- --endpoint=unix://plugin/csi-nfs.sock
86+
- --mount-permissions=0777
9287
env:
9388
- name: NODE_ID
9489
valueFrom:

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,13 @@ spec:
3838
imagePullPolicy: IfNotPresent
3939
args:
4040
- --v=${LOG_LEVEL}
41-
- "--nodeid=$(NODE_ID)"
42-
- "--endpoint=$(CSI_ENDPOINT)"
43-
- "--drivername=$(DRIVER_NAME)"
44-
- "--share-protocol-selector=$(MANILA_SHARE_PROTO)"
45-
- "--fwdendpoint=$(FWD_CSI_ENDPOINT)"
41+
- --endpoint=$(CSI_ENDPOINT)
42+
- --drivername=$(DRIVER_NAME)
43+
- --share-protocol-selector=$(MANILA_SHARE_PROTO)
44+
- --fwdendpoint=$(FWD_CSI_ENDPOINT)
4645
env:
4746
- name: DRIVER_NAME
4847
value: manila.csi.openstack.org
49-
- name: NODE_ID
50-
valueFrom:
51-
fieldRef:
52-
fieldPath: spec.nodeName
5348
- name: CSI_ENDPOINT
5449
value: unix:///var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock
5550
- name: FWD_CSI_ENDPOINT

0 commit comments

Comments
 (0)