dd a hostNetwork setting to the Driver and ControllerPlugin Specs

This bool setting can be added to the controllerPlugin section of the Driver Spec. It will be propagated to all controller plugin pods. This implements the following design: https://github.com/ceph/ceph-csi-operator/blob/main/docs/design/hostNetwork.md Signed-off-by: Michael Adam <[email protected]>
ceph · Nov 21, 2024 · cb6b8e7 · cb6b8e7
1 parent 47aebb6
commit cb6b8e7
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 0 deletions.
diff --git a/api/v1alpha1/driver_types.go b/api/v1alpha1/driver_types.go
@@ -210,6 +210,8 @@ type ControllerPluginResourcesSpec struct {
 }
 
 type ControllerPluginSpec struct {
+	// hostNetwork setting to be propagated to CSI controller plugin pods
+	HostNetwork *bool `json:"hostNetwork,omitempty"`
 	// Embedded common pods spec
 	PodCommonSpec `json:",inline"`
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/csi.ceph.io_drivers.yaml b/config/crd/bases/csi.ceph.io_drivers.yaml
@@ -1051,6 +1051,10 @@ spec:
                           Default is RollingUpdate.
                         type: string
                     type: object
+                  hostNetwork:
+                    description: hostNetwork setting to be propagated to CSI controller
+                      plugin pods
+                    type: boolean
                   imagePullPolicy:
                     description: To indicate the image pull policy to be applied to
                       all the containers in the csi driver pods.

diff --git a/config/crd/bases/csi.ceph.io_operatorconfigs.yaml b/config/crd/bases/csi.ceph.io_operatorconfigs.yaml
@@ -1060,6 +1060,10 @@ spec:
                               "RollingUpdate". Default is RollingUpdate.
                             type: string
                         type: object
+                      hostNetwork:
+                        description: hostNetwork setting to be propagated to CSI controller
+                          plugin pods
+                        type: boolean
                       imagePullPolicy:
                         description: To indicate the image pull policy to be applied
                           to all the containers in the csi driver pods.

diff --git a/deploy/all-in-one/install.yaml b/deploy/all-in-one/install.yaml
@@ -1301,6 +1301,10 @@ spec:
                           Default is RollingUpdate.
                         type: string
                     type: object
+                  hostNetwork:
+                    description: hostNetwork setting to be propagated to CSI controller
+                      plugin pods
+                    type: boolean
                   imagePullPolicy:
                     description: To indicate the image pull policy to be applied to
                       all the containers in the csi driver pods.
@@ -8161,6 +8165,10 @@ spec:
                               "RollingUpdate". Default is RollingUpdate.
                             type: string
                         type: object
+                      hostNetwork:
+                        description: hostNetwork setting to be propagated to CSI controller
+                          plugin pods
+                        type: boolean
                       imagePullPolicy:
                         description: To indicate the image pull policy to be applied
                           to all the containers in the csi driver pods.

diff --git a/deploy/multifile/crd.yaml b/deploy/multifile/crd.yaml
@@ -1292,6 +1292,10 @@ spec:
                           Default is RollingUpdate.
                         type: string
                     type: object
+                  hostNetwork:
+                    description: hostNetwork setting to be propagated to CSI controller
+                      plugin pods
+                    type: boolean
                   imagePullPolicy:
                     description: To indicate the image pull policy to be applied to
                       all the containers in the csi driver pods.
@@ -8152,6 +8156,10 @@ spec:
                               "RollingUpdate". Default is RollingUpdate.
                             type: string
                         type: object
+                      hostNetwork:
+                        description: hostNetwork setting to be propagated to CSI controller
+                          plugin pods
+                        type: boolean
                       imagePullPolicy:
                         description: To indicate the image pull policy to be applied
                           to all the containers in the csi driver pods.

diff --git a/internal/controller/driver_controller.go b/internal/controller/driver_controller.go
@@ -564,6 +564,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 			Strategy: ptr.Deref(pluginSpec.DeploymentStrategy, defaultDeploymentStrategy),
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
+
 					Labels: utils.Call(func() map[string]string {
 						podLabels := map[string]string{}
 						maps.Copy(podLabels, pluginSpec.Labels)
@@ -575,6 +576,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 				Spec: corev1.PodSpec{
 					ServiceAccountName: serviceAccountName,
 					PriorityClassName:  ptr.Deref(pluginSpec.PrioritylClassName, ""),
+					HostNetwork:        ptr.Deref(pluginSpec.HostNetwork, false),
 					Affinity:           getControllerPluginPodAffinity(pluginSpec, &appSelector),
 					Tolerations:        pluginSpec.Tolerations,
 					Containers: utils.Call(func() []corev1.Container {

diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/driver_types.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/driver_types.go
diff --git a/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/zz_generated.deepcopy.go