csi: use different ports for controller and node plugins

Usubg host network produces port collisions. So we use different ports for controller plugin deployments and node plugin deamonsets to avoid collisions. Signed-off-by: Michael Adam <[email protected]>
ceph · Feb 6, 2025 · 6be915c · 6be915c
1 parent da919bd
commit 6be915c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/controller/driver_controller.go b/internal/controller/driver_controller.go
@@ -772,15 +772,15 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 										utils.PodContainerArg,
 										utils.PodUidContainerArg,
 										utils.CsiAddonsAddressContainerArg,
-										utils.ControllerPortContainerArg,
+										utils.ControllerPluginPortContainerArg,
 										utils.NamespaceContainerArg,
 										utils.If(logRotationEnabled, utils.LogToStdErrContainerArg, ""),
 										utils.If(logRotationEnabled, utils.AlsoLogToStdErrContainerArg, ""),
 										utils.If(logRotationEnabled, utils.LogFileContainerArg("csi-addons"), ""),
 									),
 								),
 								Ports: []corev1.ContainerPort{
-									utils.CsiAddonsContainerPort,
+									utils.ControllerPluginCsiAddonsContainerPort,
 								},
 								Env: []corev1.EnvVar{
 									utils.NodeIdEnvVar,
@@ -1122,7 +1122,7 @@ func (r *driverReconcile) reconcileNodePluginDeamonSet() error {
 										utils.CsiAddonsNodeIdContainerArg,
 										utils.LogVerbosityContainerArg(logVerbosity),
 										utils.CsiAddonsAddressContainerArg,
-										utils.ControllerPortContainerArg,
+										utils.NodePluginPortContainerArg,
 										utils.PodContainerArg,
 										utils.NamespaceContainerArg,
 										utils.PodUidContainerArg,
@@ -1133,7 +1133,7 @@ func (r *driverReconcile) reconcileNodePluginDeamonSet() error {
 									},
 								),
 								Ports: []corev1.ContainerPort{
-									utils.CsiAddonsContainerPort,
+									utils.NodePluginCsiAddonsContainerPort,
 								},
 								Env: []corev1.EnvVar{
 									utils.NodeIdEnvVar,

diff --git a/internal/utils/csi.go b/internal/utils/csi.go
@@ -337,10 +337,13 @@ var DriverNamespaceEnvVar = corev1.EnvVar{
 	},
 }
 
-// CSI Addons container port definition
-var CsiAddonsContainerPort = corev1.ContainerPort{
+// CSI Addons container port definitions
+var ControllerPluginCsiAddonsContainerPort = corev1.ContainerPort{
 	ContainerPort: int32(9070),
 }
+var NodePluginCsiAddonsContainerPort2 = corev1.ContainerPort{
+	ContainerPort: int32(9071),
+}
 
 // Ceph CSI common container arguments
 var CsiAddressContainerArg = fmt.Sprintf("--csi-address=%s", csiEndpoint)
@@ -359,7 +362,8 @@ var HandleVolumeInuseErrorContainerArg = "--handle-volume-inuse-error=false"
 var PodUidContainerArg = fmt.Sprintf("--pod-uid=$(%s)", PodUidEnvVar.Name)
 var PodContainerArg = fmt.Sprintf("--pod=$(%s)", PodNameEnvVar.Name)
 var NamespaceContainerArg = fmt.Sprintf("--namespace=$(%s)", PodNamespaceEnvVar.Name)
-var ControllerPortContainerArg = fmt.Sprintf("--controller-port=%d", CsiAddonsContainerPort.ContainerPort)
+var ControllerPluginPortContainerArg = fmt.Sprintf("--controller-port=%d", ControllerPluginCsiAddonsContainerPort.ContainerPort)
+var NodePluginPortContainerArg = fmt.Sprintf("--controller-port=%d", NodePluginCsiAddonsContainerPort.ContainerPort)
 var DriverNamespaceContainerArg = fmt.Sprintf("--drivernamespace=$(%s)", DriverNamespaceEnvVar.Name)
 var MetricsPathContainerArg = "--metricspath=/metrics"
 var PoolTimeContainerArg = "--polltime=60s"