Skip to content

Commit 7df7f16

Browse files
bipuladhbipuladh
committed
Makes changes to converge provider mode with standard deployments
Signed-off-by: Bipul Adhikari <[email protected]>
1 parent 81b021a commit 7df7f16

File tree

14 files changed

+211
-176
lines changed

14 files changed

+211
-176
lines changed

‎packages/odf/components/create-storage-system/create-steps.tsx

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export const createSteps = (
3939
const { encryption, kms } = securityAndNetwork;
4040

4141
const isMCG = deployment === DeploymentType.MCG;
42-
const isProviderMode = deployment === DeploymentType.PROVIDER_MODE;
4342

4443
const commonSteps = {
4544
capacityAndNodes: {
@@ -76,7 +75,6 @@ export const createSteps = (
7675
kms={kms}
7776
dispatch={dispatch}
7877
isMCG={isMCG}
79-
isProviderMode={isProviderMode}
8078
systemNamespace={systemNamespace}
8179
/>
8280
),
@@ -167,24 +165,6 @@ export const createSteps = (
167165
...commonSteps.reviewAndCreate,
168166
},
169167
];
170-
} else if (isProviderMode) {
171-
return [
172-
{
173-
id: 2,
174-
canJumpTo: stepIdReached >= 2,
175-
...commonSteps.capacityAndNodes,
176-
},
177-
{
178-
id: 3,
179-
canJumpTo: stepIdReached >= 3,
180-
...commonSteps.security,
181-
},
182-
{
183-
id: 4,
184-
canJumpTo: stepIdReached >= 4,
185-
...commonSteps.reviewAndCreate,
186-
},
187-
];
188168
} else
189169
return [
190170
{
@@ -218,25 +198,6 @@ export const createSteps = (
218198
...commonSteps.reviewAndCreate,
219199
},
220200
];
221-
} else if (isProviderMode) {
222-
return [
223-
createLocalVolumeSetStep,
224-
{
225-
canJumpTo: stepIdReached >= 3,
226-
...commonSteps.capacityAndNodes,
227-
id: 3,
228-
},
229-
{
230-
id: 4,
231-
canJumpTo: stepIdReached >= 4,
232-
...commonSteps.security,
233-
},
234-
{
235-
id: 5,
236-
canJumpTo: stepIdReached >= 5,
237-
...commonSteps.reviewAndCreate,
238-
},
239-
];
240201
}
241202
return [
242203
createLocalVolumeSetStep,

‎packages/odf/components/create-storage-system/create-storage-system-steps/backing-storage-step/select-deployment.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { BackingStorageType, DeploymentType } from '@odf/core/types';
2+
import { DeploymentType } from '@odf/core/types';
33
import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
44
import {
55
Select,
@@ -48,12 +48,6 @@ export const SelectDeployment: React.FC<SelectDeploymentProps> = ({
4848
// 'value' on SelectProps['onSelect'] is string hence does not match with payload of type "DeploymentType"
4949
payload: value as DeploymentType,
5050
});
51-
if (value === DeploymentType.PROVIDER_MODE) {
52-
dispatch({
53-
type: 'backingStorage/setType',
54-
payload: BackingStorageType.EXISTING,
55-
});
56-
}
5751
setIsSelectOpen(false);
5852
};
5953

‎packages/odf/components/create-storage-system/create-storage-system-steps/capacity-and-nodes-step/capacity-and-nodes-step.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
433433
} = state;
434434

435435
const isNoProvisioner = storageClass.provisioner === NO_PROVISIONER;
436-
const isProviderMode = deploymentMode === DeploymentType.PROVIDER_MODE;
437436
const flexibleScaling = isFlexibleScaling(
438437
nodes,
439438
isNoProvisioner,
@@ -487,16 +486,14 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
487486
)}
488487
{(!isNoProvisioner || nodes.length > 0) && (
489488
<>
490-
{!isProviderMode && (
491-
<ConfigurePerformance
492-
onResourceProfileChange={onProfileChange}
493-
resourceProfile={resourceProfile}
494-
headerText={PerformanceHeaderText}
495-
profileRequirementsText={ProfileRequirementsText}
496-
selectedNodes={nodes}
497-
osdAmount={osdAmount}
498-
/>
499-
)}
489+
<ConfigurePerformance
490+
onResourceProfileChange={onProfileChange}
491+
resourceProfile={resourceProfile}
492+
headerText={PerformanceHeaderText}
493+
profileRequirementsText={ProfileRequirementsText}
494+
selectedNodes={nodes}
495+
osdAmount={osdAmount}
496+
/>
500497
<EnableTaintNodes dispatch={dispatch} enableTaint={enableTaint} />
501498
</>
502499
)}

‎packages/odf/components/create-storage-system/create-storage-system-steps/review-and-create-step/review-and-create-step.tsx

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export const ReviewAndCreate: React.FC<ReviewAndCreateProps> = ({
6767

6868
// NooBaa standalone deployment
6969
const isMCG = deployment === DeploymentType.MCG;
70-
const isProviderMode = deployment === DeploymentType.PROVIDER_MODE;
7170
// External Red Hat Ceph Storage deployment
7271
const isRhcs = !_.isEmpty(connectionDetails);
7372
// External IBM deployment without ODF
@@ -164,13 +163,11 @@ export const ReviewAndCreate: React.FC<ReviewAndCreateProps> = ({
164163
memory: humanizeBinaryBytes(totalMemory).string,
165164
})}
166165
</ListItem>
167-
{!isProviderMode && (
168-
<ListItem>
169-
{t('Performance profile: {{resourceProfile}}', {
170-
resourceProfile: _.capitalize(capacityAndNodes.resourceProfile),
171-
})}
172-
</ListItem>
173-
)}
166+
<ListItem>
167+
{t('Performance profile: {{resourceProfile}}', {
168+
resourceProfile: _.capitalize(capacityAndNodes.resourceProfile),
169+
})}
170+
</ListItem>
174171
<ListItem>
175172
{t('Zone: {{zoneCount, number}} zone', {
176173
zoneCount: zones.size,
@@ -219,13 +216,11 @@ export const ReviewAndCreate: React.FC<ReviewAndCreateProps> = ({
219216
})}
220217
</ListItem>
221218
)}
222-
{!isProviderMode && (
223-
<ListItem>
224-
{t('Network: {{networkType}}', {
225-
networkType: NetworkTypeLabels[networkType],
226-
})}
227-
</ListItem>
228-
)}
219+
<ListItem>
220+
{t('Network: {{networkType}}', {
221+
networkType: NetworkTypeLabels[networkType],
222+
})}
223+
</ListItem>
229224
</ReviewItem>
230225
))}
231226
{isRhcs && (

‎packages/odf/components/create-storage-system/create-storage-system-steps/security-and-network-step/configure.tsx

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,30 @@ import * as React from 'react';
22
import { FieldLevelHelp } from '@odf/shared/generic/FieldLevelHelp';
33
import { NetworkAttachmentDefinitionKind } from '@odf/shared/types';
44
import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
5+
import { useFlag } from '@openshift-console/dynamic-plugin-sdk';
56
import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk-internal/lib/extensions/console-types';
67
import * as _ from 'lodash-es';
78
import { FormGroup, Radio } from '@patternfly/react-core';
9+
import { FDF_FLAG } from '../../../../redux';
810
import { NetworkType, NADSelectorType } from '../../../../types';
911
import { WizardState } from '../../reducer';
10-
import './configure.scss';
1112
import { MultusNetworkConfigurationComponent } from './multus';
1213
import { NICSelectComponent } from './nic';
14+
import './configure.scss';
1315

1416
export const NetworkFormGroup: React.FC<NetworkFormGroupProps> = ({
1517
setNetworkType,
1618
networkType,
1719
setMultusNetwork,
1820
setCIDRNetwork,
19-
cepPlublicCIDR,
21+
cephPublicCIDR,
2022
cephClusterCIDR,
2123
clusterNetwork,
2224
publicNetwork,
2325
systemNamespace,
2426
}) => {
2527
const { t } = useCustomTranslation();
28+
const isFDF = useFlag(FDF_FLAG);
2629

2730
return (
2831
<>
@@ -51,23 +54,25 @@ export const NetworkFormGroup: React.FC<NetworkFormGroupProps> = ({
5154
value={NetworkType.DEFAULT}
5255
id={NetworkType.DEFAULT}
5356
/>
54-
<Radio
55-
isChecked={networkType === NetworkType.HOST}
56-
name="custom-network"
57-
label={
58-
<div className="ceph__multus-radio--width">
59-
{t('Host')}
60-
<FieldLevelHelp>
61-
{t(
62-
'Multus allows a network seperation between the data operations and the control plane operations.'
63-
)}
64-
</FieldLevelHelp>
65-
</div>
66-
}
67-
onChange={() => setNetworkType(NetworkType.HOST)}
68-
value={NetworkType.MULTUS}
69-
id={NetworkType.MULTUS}
70-
/>
57+
{isFDF && (
58+
<Radio
59+
isChecked={networkType === NetworkType.HOST}
60+
name="custom-network"
61+
label={
62+
<div className="ceph__multus-radio--width">
63+
{t('Host')}
64+
<FieldLevelHelp>
65+
{t(
66+
'Multus allows a network seperation between the data operations and the control plane operations.'
67+
)}
68+
</FieldLevelHelp>
69+
</div>
70+
}
71+
onChange={() => setNetworkType(NetworkType.HOST)}
72+
value={NetworkType.MULTUS}
73+
id={NetworkType.MULTUS}
74+
/>
75+
)}
7176
</FormGroup>
7277
{networkType === NetworkType.MULTUS ||
7378
networkType === NetworkType.DEFAULT ? (
@@ -82,9 +87,9 @@ export const NetworkFormGroup: React.FC<NetworkFormGroupProps> = ({
8287
) : (
8388
<NICSelectComponent
8489
cephClusterCIDR={cephClusterCIDR}
85-
cephPlublicCIDR={cepPlublicCIDR}
90+
cephPublicCIDR={cephPublicCIDR}
8691
setCephCIDR={(cephCIDR: string) =>
87-
setCIDRNetwork(cephCIDR, cepPlublicCIDR)
92+
setCIDRNetwork(cephCIDR, cephPublicCIDR)
8893
}
8994
setPublicCIDR={(publicCIDR: string) =>
9095
setCIDRNetwork(cephClusterCIDR, publicCIDR)
@@ -108,6 +113,6 @@ type NetworkFormGroupProps = {
108113
clusterNetwork: NetworkAttachmentDefinitionKind;
109114
publicNetwork: NetworkAttachmentDefinitionKind;
110115
cephClusterCIDR: string;
111-
cepPlublicCIDR: string;
116+
cephPublicCIDR: string;
112117
systemNamespace: WizardState['backingStorage']['systemNamespace'];
113118
};

‎packages/odf/components/create-storage-system/create-storage-system-steps/security-and-network-step/encryption.tsx

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ const EncryptionLabel: React.FC<{ label: string }> = ({ label }) => (
2828
const EncryptionLevel: React.FC<EncryptionLevelProps> = ({
2929
encryption,
3030
dispatch,
31-
isProviderMode,
3231
}) => {
3332
const { t } = useCustomTranslation();
3433

@@ -76,29 +75,26 @@ const EncryptionLevel: React.FC<EncryptionLevelProps> = ({
7675
handleClusterWideEncryption(isChecked)
7776
}
7877
/>
79-
{!isProviderMode && (
80-
<Checkbox
81-
id="storage-class-encryption"
82-
className="odf-security-encryption"
83-
isChecked={encryption.storageClass}
84-
data-checked-state={encryption.storageClass}
85-
label={<EncryptionLabel label={t('StorageClass encryption')} />}
86-
description={t(
87-
'An encryption key will be generated for each persistent volume (block) created using an encryption enabled StorageClass.'
88-
)}
89-
onChange={(_event, isChecked: boolean) =>
90-
handleStorageClassEncryption(isChecked)
91-
}
92-
/>
93-
)}
78+
<Checkbox
79+
id="storage-class-encryption"
80+
className="odf-security-encryption"
81+
isChecked={encryption.storageClass}
82+
data-checked-state={encryption.storageClass}
83+
label={<EncryptionLabel label={t('StorageClass encryption')} />}
84+
description={t(
85+
'An encryption key will be generated for each persistent volume (block) created using an encryption enabled StorageClass.'
86+
)}
87+
onChange={(_event, isChecked: boolean) =>
88+
handleStorageClassEncryption(isChecked)
89+
}
90+
/>
9491
</FormGroup>
9592
);
9693
};
9794

9895
type EncryptionLevelProps = {
9996
encryption: WizardState['securityAndNetwork']['encryption'];
10097
dispatch: WizardDispatch;
101-
isProviderMode?: boolean;
10298
};
10399

104100
const KMSConnection: React.FC<EncryptionProps> = ({
@@ -171,7 +167,6 @@ export const Encryption: React.FC<EncryptionProps> = ({
171167
isMCG,
172168
isExternal,
173169
systemNamespace,
174-
isProviderMode,
175170
}) => {
176171
const { t } = useCustomTranslation();
177172
const [encryptionChecked, setEncryptionChecked] = React.useState(
@@ -274,7 +269,6 @@ export const Encryption: React.FC<EncryptionProps> = ({
274269
<EncryptionLevel
275270
encryption={encryption}
276271
dispatch={dispatch}
277-
isProviderMode={isProviderMode}
278272
/>
279273
)}
280274
<KMSConnection

0 commit comments

Comments
 (0)