Merge pull request #11 from bertinatto/node-ports2

Fix node ports in Azure File controller
openshift · Oct 21, 2021 · 5551396 · 5551396
2 parents 926a679 + 9a1fc5c
commit 5551396
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/assets/controller.yaml b/assets/controller.yaml
@@ -83,8 +83,9 @@ spec:
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
           ports:
             - name: healthz
-              # Due to hostNetwork, this port is open on a node!
-              containerPort: 10311
+              # Due to hostNetwork, this port is open on a node and cannot
+              # conflict with any port used by other CSI drivers.
+              containerPort: 10303
               protocol: TCP
           livenessProbe:
             httpGet:
@@ -119,6 +120,8 @@ spec:
           image: ${KUBE_RBAC_PROXY_IMAGE}
           imagePullPolicy: IfNotPresent
           ports:
+          # Due to hostNetwork, this port is open on a node and cannot
+          # conflict with any port used by other CSI drivers.
           - containerPort: 9211
             name: driver-m
             protocol: TCP
@@ -164,6 +167,8 @@ spec:
           image: ${KUBE_RBAC_PROXY_IMAGE}
           imagePullPolicy: IfNotPresent
           ports:
+          # Due to hostNetwork, this port is open on a node and cannot
+          # conflict with any port used by other CSI drivers.
           - containerPort: 9212
             name: provisioner-m
             protocol: TCP
@@ -206,6 +211,8 @@ spec:
           image: ${KUBE_RBAC_PROXY_IMAGE}
           imagePullPolicy: IfNotPresent
           ports:
+          # Due to hostNetwork, this port is open on a node and cannot
+          # conflict with any port used by other CSI drivers.
           - containerPort: 9213
             name: attacher-m
             protocol: TCP
@@ -248,6 +255,8 @@ spec:
           image: ${KUBE_RBAC_PROXY_IMAGE}
           imagePullPolicy: IfNotPresent
           ports:
+          # Due to hostNetwork, this port is open on a node and cannot
+          # conflict with any port used by other CSI drivers.
           - containerPort: 9214
             name: resizer-m
             protocol: TCP
@@ -289,6 +298,8 @@ spec:
           image: ${KUBE_RBAC_PROXY_IMAGE}
           imagePullPolicy: IfNotPresent
           ports:
+          # Due to hostNetwork, this port is open on a node and cannot
+          # conflict with any port used by other CSI drivers.
           - containerPort: 9215
             name: snapshotter-m
             protocol: TCP
@@ -305,7 +316,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --probe-timeout=3s
-            - --health-port=10301
+            - --health-port=10303
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/assets/node.yaml b/assets/node.yaml
@@ -93,8 +93,9 @@ spec:
               name: scsi-host-dir
           ports:
             - name: healthz
-              # Due to hostNetwork, this port is open on all nodes!
-              containerPort: 10301
+              # Due to hostNetwork, this port is open on a node and cannot
+              # conflict with any port used by other CSI drivers.
+              containerPort: 10302
               protocol: TCP
           livenessProbe:
             httpGet:
@@ -141,7 +142,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
-            - --health-port=10301
+            - --health-port=10302
           volumeMounts:
             - name: socket-dir
               mountPath: /csi