Merge pull request #2633 from openshift-cherrypick-robot/cherry-pick-…

…2632-to-release-4.16 Bug 2283797:[release-4.16] noobaa: provide denyHTTP option to NooBaa CR
red-hat-storage · May 29, 2024 · 79ee747 · 79ee747
2 parents f21b3c9 + a8ee948
commit 79ee747
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 0 deletions.
diff --git a/api/v1/storagecluster_types.go b/api/v1/storagecluster_types.go
@@ -411,6 +411,10 @@ type MultiCloudGatewaySpec struct {
 	// Allows Noobaa to connect to an external Postgres server
 	// +optional
 	ExternalPgConfig *ExternalPGSpec `json:"externalPgConfig,omitempty"`
+
+	// DenyHTTP (optional) if given will deny access to the NooBaa S3 service using HTTP (only HTTPS)
+	// +optional
+	DenyHTTP bool `json:"denyHTTP,omitempty"`
 }
 
 type ExternalPGSpec struct {

diff --git a/config/crd/bases/ocs.openshift.io_storageclusters.yaml b/config/crd/bases/ocs.openshift.io_storageclusters.yaml
@@ -2254,6 +2254,10 @@ spec:
                     description: DbStorageClassName specifies the default storage
                       class for nooba-db pods
                     type: string
+                  denyHTTP:
+                    description: DenyHTTP (optional) if given will deny access to
+                      the NooBaa S3 service using HTTP (only HTTPS)
+                    type: boolean
                   disableLoadBalancerService:
                     description: DisableLoadBalancerService (optional) sets the service
                       type to ClusterIP instead of LoadBalancer

diff --git a/controllers/storagecluster/noobaa_system_reconciler.go b/controllers/storagecluster/noobaa_system_reconciler.go
@@ -183,6 +183,8 @@ func (r *StorageClusterReconciler) setNooBaaDesiredState(nb *nbv1.NooBaa, sc *oc
 
 	// Override with MCG options specified in the storage cluster spec
 	if sc.Spec.MultiCloudGateway != nil {
+		nb.Spec.DenyHTTP = sc.Spec.MultiCloudGateway.DenyHTTP
+
 		dbStorageClass := sc.Spec.MultiCloudGateway.DbStorageClassName
 		if dbStorageClass != "" {
 			nb.Spec.DBStorageClass = &dbStorageClass

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml
@@ -2254,6 +2254,10 @@ spec:
                     description: DbStorageClassName specifies the default storage
                       class for nooba-db pods
                     type: string
+                  denyHTTP:
+                    description: DenyHTTP (optional) if given will deny access to
+                      the NooBaa S3 service using HTTP (only HTTPS)
+                    type: boolean
                   disableLoadBalancerService:
                     description: DisableLoadBalancerService (optional) sets the service
                       type to ClusterIP instead of LoadBalancer

diff --git a/deploy/ocs-operator/manifests/storagecluster.crd.yaml b/deploy/ocs-operator/manifests/storagecluster.crd.yaml
@@ -2253,6 +2253,10 @@ spec:
                     description: DbStorageClassName specifies the default storage
                       class for nooba-db pods
                     type: string
+                  denyHTTP:
+                    description: DenyHTTP (optional) if given will deny access to
+                      the NooBaa S3 service using HTTP (only HTTPS)
+                    type: boolean
                   disableLoadBalancerService:
                     description: DisableLoadBalancerService (optional) sets the service
                       type to ClusterIP instead of LoadBalancer

diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go