Merge pull request #1211 from bipuladh/remove-single-pool

Remove support for Single Replica pool from wizard flow
red-hat-storage · Feb 7, 2024 · 8b0c003 · 8b0c003
2 parents bbf25ab + 4ca8839
commit 8b0c003
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 81 deletions.
diff --git a/locales/en/plugin__odf-console.json b/locales/en/plugin__odf-console.json
@@ -672,8 +672,6 @@
   "If not labeled, the selected nodes are labeled <2>{{label}}</2> to make them target hosts for Data Foundation's components.": "If not labeled, the selected nodes are labeled <2>{{label}}</2> to make them target hosts for Data Foundation's components.",
   "Taint nodes": "Taint nodes",
   "Selected nodes will be dedicated to Data Foundation use only": "Selected nodes will be dedicated to Data Foundation use only",
-  "Add replica-1 pool": "Add replica-1 pool",
-  "Enabling this feature creates a single replica pool without data replication, increasing the risk of data loss, data corruption, and potential system instability.": "Enabling this feature creates a single replica pool without data replication, increasing the risk of data loss, data corruption, and potential system instability.",
   "Select capacity": "Select capacity",
   "Select nodes": "Select nodes",
   "Select at least 3 nodes preferably in 3 different zones. It is recommended to start with at least 14 CPUs and 34 GiB per node.": "Select at least 3 nodes preferably in 3 different zones. It is recommended to start with at least 14 CPUs and 34 GiB per node.",
@@ -773,7 +771,6 @@
   "Zone: {{zoneCount, number}} zone_other": "Zone: {{zoneCount, number}} zones",
   "Arbiter zone: {{zone}}": "Arbiter zone: {{zone}}",
   "Taint nodes: {{ocsTaintsStatus}}": "Taint nodes: {{ocsTaintsStatus}}",
-  "Replica-1 pool: {{singleReplicaPoolStatus}}": "Replica-1 pool: {{singleReplicaPoolStatus}}",
   "Security": "Security",
   "Encryption: Enabled": "Encryption: Enabled",
   "External key management service: {{kmsStatus}}": "External key management service: {{kmsStatus}}",

diff --git a/...ge-system/create-storage-system-steps/capacity-and-nodes-step/capacity-and-nodes-step.tsx b/...ge-system/create-storage-system-steps/capacity-and-nodes-step/capacity-and-nodes-step.tsx
@@ -122,40 +122,11 @@ type EnableTaintNodesProps = {
   enableTaint: WizardState['capacityAndNodes']['enableTaint'];
 };
 
-const EnableSingleReplicaPool: React.FC<EnableSingleReplicaPoolProps> = ({
-  dispatch,
-  enableSingleReplicaPool: isSingleReplicaPoolEnabled,
-}) => {
-  const { t } = useCustomTranslation();
-  return (
-    <Checkbox
-      label={t('Add replica-1 pool')}
-      description={t(
-        'Enabling this feature creates a single replica pool without data replication, increasing the risk of data loss, data corruption, and potential system instability.'
-      )}
-      id="single-replica-pool"
-      data-checked-state={isSingleReplicaPoolEnabled}
-      isChecked={isSingleReplicaPoolEnabled}
-      onChange={() =>
-        dispatch({
-          type: 'capacityAndNodes/enableSingleReplicaPool',
-          payload: !isSingleReplicaPoolEnabled,
-        })
-      }
-    />
-  );
-};
-type EnableSingleReplicaPoolProps = {
-  dispatch: WizardDispatch;
-  enableSingleReplicaPool: WizardState['capacityAndNodes']['enableSingleReplicaPool'];
-};
-
 type SelectCapacityAndNodesProps = {
   dispatch: WizardDispatch;
   capacity: WizardState['capacityAndNodes']['capacity'];
   nodes: WizardState['nodes'];
   enableTaint: WizardState['capacityAndNodes']['enableTaint'];
-  enableSingleReplicaPool: WizardState['capacityAndNodes']['enableSingleReplicaPool'];
   resourceProfile: WizardState['capacityAndNodes']['resourceProfile'];
   systemNamespace: WizardState['backingStorage']['systemNamespace'];
 };
@@ -165,7 +136,6 @@ const SelectCapacityAndNodes: React.FC<SelectCapacityAndNodesProps> = ({
   capacity,
   nodes,
   enableTaint,
-  enableSingleReplicaPool,
   resourceProfile,
   systemNamespace,
 }) => {
@@ -254,10 +224,6 @@ const SelectCapacityAndNodes: React.FC<SelectCapacityAndNodesProps> = ({
         selectedNodes={nodes}
       />
       <EnableTaintNodes dispatch={dispatch} enableTaint={enableTaint} />
-      <EnableSingleReplicaPool
-        dispatch={dispatch}
-        enableSingleReplicaPool={enableSingleReplicaPool}
-      />
     </>
   );
 };
@@ -270,7 +236,6 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
   arbiterLocation,
   dispatch,
   nodes,
-  enableSingleReplicaPool,
   resourceProfile,
   systemNamespace,
 }) => {
@@ -430,10 +395,6 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
           selectedNodes={nodes}
         />
         <EnableTaintNodes dispatch={dispatch} enableTaint={enableTaint} />
-        <EnableSingleReplicaPool
-          dispatch={dispatch}
-          enableSingleReplicaPool={enableSingleReplicaPool}
-        />
       </>
     </ErrorHandler>
   );
@@ -443,7 +404,6 @@ type SelectedCapacityAndNodesProps = {
   capacity: WizardState['capacityAndNodes']['capacity'];
   enableArbiter: WizardState['capacityAndNodes']['enableArbiter'];
   enableTaint: WizardState['capacityAndNodes']['enableTaint'];
-  enableSingleReplicaPool: WizardState['capacityAndNodes']['enableSingleReplicaPool'];
   storageClassName: string;
   arbiterLocation: WizardState['capacityAndNodes']['arbiterLocation'];
   dispatch: WizardDispatch;
@@ -465,7 +425,6 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
     enableArbiter,
     enableTaint,
     arbiterLocation,
-    enableSingleReplicaPool,
     resourceProfile,
   } = state;
 
@@ -488,7 +447,6 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
           dispatch={dispatch}
           nodes={nodes}
           capacity={capacity}
-          enableSingleReplicaPool={enableSingleReplicaPool}
           resourceProfile={resourceProfile}
           systemNamespace={systemNamespace}
         />
@@ -498,7 +456,6 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
           enableTaint={enableTaint}
           capacity={capacity}
           nodes={nodes}
-          enableSingleReplicaPool={enableSingleReplicaPool}
           resourceProfile={resourceProfile}
           systemNamespace={systemNamespace}
         />

diff --git a/...rage-system/create-storage-system-steps/review-and-create-step/review-and-create-step.tsx b/...rage-system/create-storage-system-steps/review-and-create-step/review-and-create-step.tsx
@@ -55,13 +55,8 @@ export const ReviewAndCreate: React.FC<ReviewAndCreateProps> = ({
     nodes,
     dataProtection,
   } = state;
-  const {
-    capacity,
-    arbiterLocation,
-    enableTaint,
-    enableArbiter,
-    enableSingleReplicaPool,
-  } = capacityAndNodes;
+  const { capacity, arbiterLocation, enableTaint, enableArbiter } =
+    capacityAndNodes;
   const { encryption, kms, networkType } = securityAndNetwork;
   const {
     deployment,
@@ -94,9 +89,6 @@ export const ReviewAndCreate: React.FC<ReviewAndCreateProps> = ({
 
   const encryptionStatus = hasEncryption ? t('Enabled') : t('Disabled');
   const ocsTaintsStatus = enableTaint ? t('Enabled') : t('Disabled');
-  const singleReplicaPoolStatus = enableSingleReplicaPool
-    ? t('Enabled')
-    : t('Disabled');
   const nfsStatus = enableNFS ? t('Enabled') : t('Disabled');
   const isCephRBDSetAsDefault = isRBDStorageClassDefault
     ? t('Enabled')
@@ -198,11 +190,6 @@ export const ReviewAndCreate: React.FC<ReviewAndCreateProps> = ({
               ocsTaintsStatus,
             })}
           </ListItem>
-          <ListItem>
-            {t('Replica-1 pool: {{singleReplicaPoolStatus}}', {
-              singleReplicaPoolStatus,
-            })}
-          </ListItem>
         </ReviewItem>
       )}
       {!isRhcs &&

diff --git a/packages/odf/components/create-storage-system/payloads.ts b/packages/odf/components/create-storage-system/payloads.ts
@@ -159,13 +159,8 @@ export const createStorageCluster = async (
     backingStorage,
     dataProtection,
   } = state;
-  const {
-    capacity,
-    enableArbiter,
-    arbiterLocation,
-    pvCount,
-    enableSingleReplicaPool,
-  } = capacityAndNodes;
+  const { capacity, enableArbiter, arbiterLocation, pvCount } =
+    capacityAndNodes;
   const { encryption, publicNetwork, clusterNetwork, kms } = securityAndNetwork;
   const {
     type,
@@ -221,7 +216,6 @@ export const createStorageCluster = async (
     isMCG,
     isNFSEnabled,
     shouldSetCephRBDAsDefault,
-    isSingleReplicaPoolEnabled: enableSingleReplicaPool,
     enableRDRPreparation,
     storageClusterNamespace,
     enableNoobaaClientSideCerts: externalPostgres.tls.enableClientSideCerts,

diff --git a/packages/odf/components/create-storage-system/reducer.ts b/packages/odf/components/create-storage-system/reducer.ts
@@ -64,7 +64,6 @@ export const initialState: CreateStorageSystemState = {
   },
   capacityAndNodes: {
     enableArbiter: false,
-    enableSingleReplicaPool: false,
     enableTaint: false,
     arbiterLocation: '',
     capacity: null,
@@ -139,7 +138,6 @@ type CreateStorageSystemState = {
   connectionDetails: ExternalCephState;
   capacityAndNodes: {
     enableArbiter: boolean;
-    enableSingleReplicaPool: boolean;
     enableTaint: boolean;
     arbiterLocation: string;
     // @TODO: Remove union types and use "number" as type.
@@ -370,9 +368,6 @@ export const reducer: WizardReducer = (prevState, action) => {
     case 'capacityAndNodes/enableTaint':
       newState.capacityAndNodes.enableTaint = action.payload;
       break;
-    case 'capacityAndNodes/enableSingleReplicaPool':
-      newState.capacityAndNodes.enableSingleReplicaPool = action.payload;
-      break;
     case 'securityAndNetwork/setKms':
       newState.securityAndNetwork.kms = action.payload;
       break;
@@ -479,10 +474,6 @@ export type CreateStorageSystemAction =
       type: 'capacityAndNodes/enableTaint';
       payload: WizardState['capacityAndNodes']['enableTaint'];
     }
-  | {
-      type: 'capacityAndNodes/enableSingleReplicaPool';
-      payload: WizardState['capacityAndNodes']['enableSingleReplicaPool'];
-    }
   | {
       type: 'securityAndNetwork/setKms';
       payload: WizardState['securityAndNetwork']['kms'];

diff --git a/packages/odf/components/utils/common.ts b/packages/odf/components/utils/common.ts
@@ -381,7 +381,6 @@ type OCSRequestData = {
   isMCG?: boolean;
   isNFSEnabled?: boolean;
   shouldSetCephRBDAsDefault?: boolean;
-  isSingleReplicaPoolEnabled?: boolean;
   enableRDRPreparation?: boolean;
   storageClusterNamespace: string;
   useExternalPostgres?: boolean;
@@ -406,7 +405,6 @@ export const getOCSRequestData = ({
   isMCG,
   isNFSEnabled,
   shouldSetCephRBDAsDefault,
-  isSingleReplicaPoolEnabled,
   enableRDRPreparation,
   storageClusterNamespace,
   useExternalPostgres,
@@ -475,7 +473,6 @@ export const getOCSRequestData = ({
         getNetworkField(publicNetwork, clusterNetwork, encryption.inTransit)
       ),
       managedResources: {
-        cephNonResilientPools: { enable: isSingleReplicaPoolEnabled },
         cephBlockPools: { defaultStorageClass: shouldSetCephRBDAsDefault },
       },
     };