Revert "rgw: add vhost style support for rgw in ocs-op" and related

Revert "Bug 2273553: initalise objectstore.spec.hosting for virtualHostnames" This reverts commit f9d3ce8. This reverts commit 1098627. Signed-off-by: Blaine Gardner <[email protected]>
red-hat-storage · Jun 14, 2024 · 2509d98 · 2509d98
1 parent 3886d23
commit 2509d98
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 58 deletions.
diff --git a/api/v1/storagecluster_types.go b/api/v1/storagecluster_types.go
@@ -290,8 +290,7 @@ type ManageCephObjectStores struct {
 	// 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])?)*$
-	StorageClassName string   `json:"storageClassName,omitempty"`
-	VirtualHostnames []string `json:"virtualHostnames,omitempty"`
+	StorageClassName string `json:"storageClassName,omitempty"`
 }
 
 // ManageCephObjectStoreUsers defines how to reconcile CephObjectStoreUsers

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
@@ -1813,10 +1813,6 @@ spec:
                         maxLength: 253
                         pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                         type: string
-                      virtualHostnames:
-                        items:
-                          type: string
-                        type: array
                     type: object
                   cephRBDMirror:
                     description: ManageCephRBDMirror defines how to reconcile Ceph

diff --git a/controllers/storagecluster/cephobjectstores.go b/controllers/storagecluster/cephobjectstores.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	routev1 "github.com/openshift/api/route/v1"
 	ocsv1 "github.com/red-hat-storage/ocs-operator/api/v4/v1"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/defaults"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/platform"
@@ -202,30 +201,6 @@ func (r *StorageClusterReconciler) newCephObjectStoreInstances(initData *ocsv1.S
 			return nil, err
 		}
 
-		if len(initData.Spec.ManagedResources.CephObjectStores.VirtualHostnames) > 0 {
-			obj.Spec.Hosting = &cephv1.ObjectStoreHostingSpec{
-				DNSNames: initData.Spec.ManagedResources.CephObjectStores.VirtualHostnames,
-			}
-			route := &routev1.Route{}
-			err := r.Client.Get(context.TODO(), types.NamespacedName{Name: obj.Name, Namespace: obj.Namespace}, route)
-			if err != nil {
-				if errors.IsNotFound(err) {
-					r.Log.Info("Ceph RGW Route not found.", "CephRGWRoute", klog.KRef(obj.Namespace, obj.Name))
-				}
-			} else {
-				obj.Spec.Hosting.DNSNames = append(obj.Spec.Hosting.DNSNames, route.Spec.Host)
-			}
-			secureRoute := &routev1.Route{}
-			err = r.Client.Get(context.TODO(), types.NamespacedName{Name: obj.Name + "-secure", Namespace: obj.Namespace}, secureRoute)
-			if err != nil {
-				if errors.IsNotFound(err) {
-					r.Log.Info("Ceph RGW Route not found.", "CephRGWRoute", klog.KRef(obj.Namespace, obj.Name+"-secure"))
-				}
-			} else {
-				obj.Spec.Hosting.DNSNames = append(obj.Spec.Hosting.DNSNames, secureRoute.Spec.Host)
-			}
-		}
-
 		if initData.Spec.ManagedResources.CephObjectStores.HostNetwork != nil {
 			obj.Spec.Gateway.HostNetwork = initData.Spec.ManagedResources.CephObjectStores.HostNetwork
 		}

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusters.yaml
@@ -1813,10 +1813,6 @@ spec:
                         maxLength: 253
                         pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                         type: string
-                      virtualHostnames:
-                        items:
-                          type: string
-                        type: array
                     type: object
                   cephRBDMirror:
                     description: ManageCephRBDMirror defines how to reconcile Ceph

diff --git a/deploy/ocs-operator/manifests/storagecluster.crd.yaml b/deploy/ocs-operator/manifests/storagecluster.crd.yaml
@@ -1812,10 +1812,6 @@ spec:
                         maxLength: 253
                         pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                         type: string
-                      virtualHostnames:
-                        items:
-                          type: string
-                        type: array
                     type: object
                   cephRBDMirror:
                     description: ManageCephRBDMirror defines how to reconcile Ceph

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/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.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
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go