Added network configuration setting for RGW

Signed-off-by: Rohan Gupta <[email protected]>
red-hat-storage · Dec 13, 2023 · 585fa14 · 585fa14
1 parent f2da20a
commit 585fa14
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/api/v1/storagecluster_types.go b/api/v1/storagecluster_types.go
@@ -237,6 +237,7 @@ type ManageCephObjectStores struct {
 	DisableStorageClass bool   `json:"disableStorageClass,omitempty"`
 	GatewayInstances    int    `json:"gatewayInstances,omitempty"`
 	DisableRoute        bool   `json:"disableRoute,omitempty"`
+	HostNetwork         *bool  `json:"hostNetwork,omitempty"`
 	// StorageClassName specifies the name of the storage class created for ceph obc's
 	// +kubebuilder:validation:MaxLength=253
 	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ocs.openshift.io_storageclusters.yaml b/config/crd/bases/ocs.openshift.io_storageclusters.yaml
@@ -757,6 +757,8 @@ spec:
                         type: boolean
                       gatewayInstances:
                         type: integer
+                      hostNetwork:
+                        type: boolean
                       reconcileStrategy:
                         type: string
                       storageClassName:

diff --git a/controllers/storagecluster/cephobjectstores.go b/controllers/storagecluster/cephobjectstores.go
@@ -198,6 +198,11 @@ func (r *StorageClusterReconciler) newCephObjectStoreInstances(initData *ocsv1.S
 			r.Log.Error(err, "Failed to set ControllerReference for CephObjectStore.", "CephObjectStore", klog.KRef(obj.Namespace, obj.Name))
 			return nil, err
 		}
+
+		if initData.Spec.ManagedResources.CephObjectStores.HostNetwork != nil {
+			obj.Spec.Gateway.HostNetwork = initData.Spec.ManagedResources.CephObjectStores.HostNetwork
+		}
+
 		// if kmsConfig is not 'nil', add the KMS details to ObjectStore spec
 		if kmsConfigMap != nil {
 

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml
@@ -757,6 +757,8 @@ spec:
                         type: boolean
                       gatewayInstances:
                         type: integer
+                      hostNetwork:
+                        type: boolean
                       reconcileStrategy:
                         type: string
                       storageClassName:

diff --git a/deploy/ocs-operator/manifests/storagecluster.crd.yaml b/deploy/ocs-operator/manifests/storagecluster.crd.yaml
@@ -756,6 +756,8 @@ spec:
                         type: boolean
                       gatewayInstances:
                         type: integer
+                      hostNetwork:
+                        type: boolean
                       reconcileStrategy:
                         type: string
                       storageClassName: