remove the storageprofile apis

Signed-off-by: Nitin Goyal <[email protected]>
red-hat-storage · Feb 5, 2025 · 4d383b7 · 4d383b7
1 parent e2ee49f
commit 4d383b7
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 959 deletions.
diff --git a/PROJECT b/PROJECT
@@ -25,14 +25,6 @@ resources:
   kind: OCSInitialization
   path: github.com/red-hat-storage/ocs-operator/api/v4/v1
   version: v1
-- api:
-    crdVersion: v1
-    namespaced: true
-  domain: openshift.io
-  group: ocs
-  kind: StorageProfile
-  path: github.com/red-hat-storage/ocs-operator/api/v4/v1
-  version: v1
 - api:
     crdVersion: v1
     namespaced: true

diff --git a/api/v1/groupversion_info.go b/api/v1/groupversion_info.go
@@ -43,7 +43,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(GroupVersion,
 		&OCSInitialization{}, &OCSInitializationList{},
 		&StorageCluster{}, &StorageClusterList{},
-		&StorageProfile{}, &StorageProfileList{},
 		&StorageClusterPeer{}, &StorageClusterPeerList{},
 	)
 	metav1.AddToGroupVersion(scheme, GroupVersion)

diff --git a/api/v1/storageprofile_types.go b/api/v1/storageprofile_types.go
diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -6,7 +6,6 @@ resources:
 - bases/ocs.openshift.io_storageclusters.yaml
 - bases/ocs.openshift.io_storageconsumers.yaml
 - bases/ocs.openshift.io_storagerequests.yaml
-- bases/ocs.openshift.io_storageprofiles.yaml
 - bases/ocs.openshift.io_storageclusterpeers.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
@@ -17,7 +16,6 @@ resources:
 #- patches/webhook_in_storageclusters.yaml
 #- patches/webhook_in_storageconsumers.yaml
 #- patches/webhook_in_storagerequests.yaml
-#- patches/webhook_in_storageprofiles.yaml
 #- patches/webhook_in_storageclusterpeers.yaml
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
 
@@ -27,7 +25,6 @@ resources:
 #- patches/cainjection_in_storageclusters.yaml
 #- patches/cainjection_in_storageconsumers.yaml
 #- patches/cainjection_in_storagerequests.yaml
-#- patches/cainjection_in_storageprofiles.yaml
 #- patches/cainjection_in_storageclusterpeers.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 

diff --git a/config/crd/patches/cainjection_in_storageprofiles.yaml b/config/crd/patches/cainjection_in_storageprofiles.yaml
diff --git a/config/crd/patches/webhook_in_storageprofiles.yaml b/config/crd/patches/webhook_in_storageprofiles.yaml
diff --git a/config/manifests/ocs-operator/bases/ocs-operator.clusterserviceversion.yaml b/config/manifests/ocs-operator/bases/ocs-operator.clusterserviceversion.yaml
@@ -15,6 +15,11 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
+    - description: StorageProfile is the Schema for the storageprofiles API
+      displayName: Storage Profile
+      kind: StorageProfile
+      name: storageprofiles.ocs.openshift.io
+      version: v1
     - description: OCSInitialization represents the initial data to be created when
         the operator is installed.
       displayName: OCS Initialization
@@ -44,11 +49,6 @@ spec:
       kind: StorageConsumer
       name: storageconsumers.ocs.openshift.io
       version: v1alpha1
-    - description: StorageProfile is the Schema for the storageprofiles API
-      displayName: Storage Profile
-      kind: StorageProfile
-      name: storageprofiles.ocs.openshift.io
-      version: v1
     - description: StorageRequest is the Schema for the StorageRequests API
       displayName: Storage Request
       kind: StorageRequest

diff --git a/config/rbac/storageprofile_editor_role.yaml b/config/rbac/storageprofile_editor_role.yaml
diff --git a/config/rbac/storageprofile_viewer_role.yaml b/config/rbac/storageprofile_viewer_role.yaml
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -3,6 +3,5 @@ resources:
 - ocs_v1_ocsinitialization.yaml
 - ocs_v1_storagecluster.yaml
 - ocs_v1alpha1_storageconsumer.yaml
-- ocs_v1_storageprofile.yaml
 - ocs_v1_storageclusterpeer.yaml
 # +kubebuilder:scaffold:manifestskustomizesamples
diff --git a/config/samples/ocs_v1_storageprofile.yaml b/config/samples/ocs_v1_storageprofile.yaml
diff --git a/controllers/storagecluster/cephfilesystem_test.go b/controllers/storagecluster/cephfilesystem_test.go
@@ -22,33 +22,19 @@ func TestCephFileSystem(t *testing.T) {
 		remoteStorageConsumers bool
 	}{
 		{
-			label:                  "Not in provider mode",
-			createRuntimeObjects:   false,
-			remoteStorageConsumers: false,
-		},
-		{
-			label:                  "In provider mode",
-			createRuntimeObjects:   false,
-			remoteStorageConsumers: true,
+			label:                "case 1",
+			createRuntimeObjects: false,
 		},
 	}
-	spList := getMockStorageProfiles()
 
 	for _, c := range cases {
 		var objects []client.Object
+		t, reconciler, cr, request := initStorageClusterResourceCreateUpdateTest(t, objects, nil)
 
-		providerModeSpec := &api.StorageClusterSpec{
-			AllowRemoteStorageConsumers:  c.remoteStorageConsumers,
-			ProviderAPIServerServiceType: "",
-		}
-
-		t, reconcilerOCSInit, cr, requestOCSInit, _ := initStorageClusterResourceCreateUpdateTestProviderMode(
-			t, objects, providerModeSpec, spList, c.remoteStorageConsumers)
 		if c.createRuntimeObjects {
 			objects = createUpdateRuntimeObjects(t) //nolint:staticcheck //no need to use objects as they update in runtime
 		}
-		assertCephFileSystem(t, reconcilerOCSInit, cr, requestOCSInit)
-
+		assertCephFileSystem(t, reconciler, cr, request)
 	}
 }