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

…1149-to-release-4.15-compatibility Bug 2256566: [release-4.15-compatibility] Fix default RBD StorageClass option for external mode
red-hat-storage · Jan 10, 2024 · d3c5d0f · d3c5d0f
2 parents e2b7ce5 + 43aadea
commit d3c5d0f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/packages/odf-plugin-sdk/extensions/external-storage/external-storage.ts b/packages/odf-plugin-sdk/extensions/external-storage/external-storage.ts
@@ -61,6 +61,7 @@ export type CreatePayload<S = ExternalState> = (payloadOptions: {
   namespace: string;
   storageClassName?: string;
   inTransitStatus?: boolean;
+  shouldSetCephRBDAsDefault?: boolean;
 }) => Payload[];
 
 export type Payload = { model: Model; payload: K8sResourceKind };

diff --git a/.../odf/components/create-storage-system/external-ceph-storage/system-connection-details.tsx b/.../odf/components/create-storage-system/external-ceph-storage/system-connection-details.tsx
@@ -166,6 +166,7 @@ export const rhcsPayload: CreatePayload<RHCSState> = ({
   model,
   namespace,
   inTransitStatus,
+  shouldSetCephRBDAsDefault,
 }) => {
   return [
     {
@@ -204,6 +205,9 @@ export const rhcsPayload: CreatePayload<RHCSState> = ({
           externalStorage: {
             enable: true,
           },
+          managedResources: {
+            cephBlockPools: { defaultStorageClass: shouldSetCephRBDAsDefault },
+          },
           labelSelector: {
             matchExpressions: [],
           },

diff --git a/packages/odf/components/create-storage-system/footer.tsx b/packages/odf/components/create-storage-system/footer.tsx
@@ -30,6 +30,7 @@ import { getExternalStorage, getTotalCpu, getTotalMemoryInGiB } from '../utils';
 import {
   createExternalSubSystem,
   createNoobaaExternalPostgresResources,
+  setCephRBDAsDefault,
   createStorageCluster,
   createStorageSystem,
   labelNodes,
@@ -187,6 +188,7 @@ const handleReviewAndCreateNext = async (
   } = state;
   const {
     systemNamespace,
+    isRBDStorageClassDefault,
     externalStorage,
     deployment,
     type,
@@ -278,13 +280,18 @@ const handleReviewAndCreateNext = async (
       const subSystemState = isRhcs ? connectionDetails : createStorageClass;
       const subSystemKind = getGVKLabel(model);
 
+      const shouldSetCephRBDAsDefault = setCephRBDAsDefault(
+        isRBDStorageClassDefault,
+        deployment
+      );
       const subSystemPayloads = createPayload({
         systemName: subSystemName,
         state: subSystemState,
         model,
         namespace: systemNamespace,
         storageClassName: storageClass.name,
         inTransitStatus: inTransitChecked,
+        shouldSetCephRBDAsDefault: shouldSetCephRBDAsDefault,
       });
 
       await createStorageSystem(subSystemName, subSystemKind, systemNamespace);

diff --git a/packages/odf/components/create-storage-system/payloads.ts b/packages/odf/components/create-storage-system/payloads.ts
@@ -141,6 +141,11 @@ export const createNoobaaExternalPostgresResources = (
   return secretResources;
 };
 
+export const setCephRBDAsDefault = (
+  isRBDStorageClassDefault: boolean,
+  deployment: DeploymentType
+): boolean => isRBDStorageClassDefault && deployment === DeploymentType.FULL;
+
 export const createStorageCluster = async (
   state: WizardState,
   storageClusterNamespace: string,
@@ -195,8 +200,10 @@ export const createStorageCluster = async (
     deployment === DeploymentType.FULL &&
     type !== BackingStorageType.EXTERNAL;
 
-  const shouldSetCephRBDAsDefault =
-    isRBDStorageClassDefault && deployment === DeploymentType.FULL;
+  const shouldSetCephRBDAsDefault = setCephRBDAsDefault(
+    isRBDStorageClassDefault,
+    deployment
+  );
 
   const payload = getOCSRequestData({
     storageClass,