Skip to content

Commit

Permalink
Merge pull request #1662 from vbnrh/multiple-deviceclass-feature
Browse files Browse the repository at this point in the history 
Epic: Support for multiple deviceClass on baremetal clusters
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Nov 14, 2024
2 parents 6b8d059 + 4eab654 commit cb13092
Show file tree
Hide file tree
Showing 18 changed files with 1,300 additions and 174 deletions.
20 changes: 19 additions & 1 deletion locales/en/plugin__odf-console.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,25 @@
"ObjectBucketClaim": "ObjectBucketClaim",
"Create new claim": "Create new claim",
"Address form errors to proceed": "Address form errors to proceed",
"Attach": "Attach",
"Attach Storage": "Attach Storage",
"Required data is not available. Please try again later.": "Required data is not available. Please try again later.",
"No Persistent Volumes are available.": "No Persistent Volumes are available.",
"No nodes data is available.": "No nodes data is available.",
"An unexpected error has occured.": "An unexpected error has occured.",
"Attach a new storage device class set to {{ resourceName }}": "Attach a new storage device class set to {{ resourceName }}",
"Attach Storage form": "Attach Storage form",
"LSO StorageClass": "LSO StorageClass",
"Enable encryption on device set": "Enable encryption on device set",
"Reclaim Policy": "Reclaim Policy",
"Select reclaim policy": "Select reclaim policy",
"Determines what happens to persistent volumes when the associated persistent volume claim is deleted. Defaults to 'Delete'": "Determines what happens to persistent volumes when the associated persistent volume claim is deleted. Defaults to 'Delete'",
"Volume Binding Mode": "Volume Binding Mode",
"Select VolumeBinding Mode": "Select VolumeBinding Mode",
"Determines what persistent volume claims will be provisioned and bound. Defaults to 'WaitForFirstCustomer'": "Determines what persistent volume claims will be provisioned and bound. Defaults to 'WaitForFirstCustomer'",
"New StorageClass name": "New StorageClass name",
"Enter a unique StorageClass name": "Enter a unique StorageClass name",
"Enable encryption on StorageClass": "Enable encryption on StorageClass",
"BucketName": "BucketName",
"Type": "Type",
"BackingStores": "BackingStores",
Expand Down Expand Up @@ -1371,7 +1390,6 @@
"Client Private Key": "Client Private Key",
"Attach OBC to a Deployment": "Attach OBC to a Deployment",
"Deployment Name": "Deployment Name",
"Attach": "Attach",
"Configure Ceph Monitor": "Configure Ceph Monitor",
"To enhance cluster resilience, align Ceph Monitors with the available node failure domains.": "To enhance cluster resilience, align Ceph Monitors with the available node failure domains.",
"Node failure domains: {{failureDomains}}": "Node failure domains: {{failureDomains}}",
Expand Down
285 changes: 140 additions & 145 deletions packages/ocs/storage-pool/body.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { AttachStorageAction } from '@odf/core/components/attach-storage-storagesystem/state';
import { checkArbiterCluster } from '@odf/core/utils';
import {
fieldRequirementsTranslations,
Expand Down Expand Up @@ -92,7 +93,7 @@ export type StoragePoolBodyProps = {
cephCluster: CephClusterKind;
state: StoragePoolState;
showPoolStatus: boolean;
dispatch: React.Dispatch<StoragePoolAction>;
dispatch: React.Dispatch<StoragePoolAction | AttachStorageAction>;
poolType: POOL_TYPE;
existingNames?: string[];
onPoolTypeChange?: (newPoolType: POOL_TYPE) => void;
Expand Down Expand Up @@ -248,159 +249,153 @@ export const StoragePoolBody: React.FC<StoragePoolBodyProps> = ({
);
});

return (
return isClusterReady || !showPoolStatus ? (
<>
{isClusterReady || !showPoolStatus ? (
<>
<FormGroup label={t('Volume type')} isRequired>
<div className="pf-v5-u-display-flex pf-v5-u-flex-direction-row ceph-pool__radio-flex">
<Radio
label={t('Filesystem')}
value="filesystem"
id="type-filesystem"
data-test="type-filesystem"
name="volume-type"
className="pf-v5-u-mr-4xl"
isChecked={poolType === POOL_TYPE.FILESYSTEM}
isDisabled={
disablePoolType && poolType !== POOL_TYPE.FILESYSTEM
}
onChange={() => {
onPoolTypeChange(POOL_TYPE.FILESYSTEM);
}}
/>
<Radio
label={t('Block')}
value="block"
id="type-block"
data-test="type-block"
name="volume-type"
isChecked={poolType === POOL_TYPE.BLOCK}
isDisabled={disablePoolType && poolType !== POOL_TYPE.BLOCK}
onChange={() => {
onPoolTypeChange(POOL_TYPE.BLOCK);
}}
/>
</div>
</FormGroup>
<TextInputWithFieldRequirements
control={control}
fieldRequirements={fieldRequirements}
defaultValue={state.poolName}
popoverProps={{
headerContent: t('Name requirements'),
footerContent: `${t('Example')}: my-pool`,
}}
formGroupProps={{
label: t('Pool name'),
fieldId: 'pool-name',
className: 'ceph-block-pool-body__input',
isRequired: true,
<FormGroup label={t('Volume type')} isRequired>
<div className="pf-v5-u-display-flex pf-v5-u-flex-direction-row ceph-pool__radio-flex">
<Radio
label={t('Filesystem')}
value="filesystem"
id="type-filesystem"
data-test="type-filesystem"
name="volume-type"
className="pf-v5-u-mr-4xl"
isChecked={poolType === POOL_TYPE.FILESYSTEM}
isDisabled={disablePoolType && poolType !== POOL_TYPE.FILESYSTEM}
onChange={() => {
onPoolTypeChange(POOL_TYPE.FILESYSTEM);
}}
textInputProps={{
id: 'pool-name',
name: 'newPoolName',
'data-test': 'new-pool-name-textbox',
'aria-describedby': t('pool-name-help'),
placeholder: t('my-pool'),
isDisabled: isUpdate,
/>
<Radio
label={t('Block')}
value="block"
id="type-block"
data-test="type-block"
name="volume-type"
isChecked={poolType === POOL_TYPE.BLOCK}
isDisabled={disablePoolType && poolType !== POOL_TYPE.BLOCK}
onChange={() => {
onPoolTypeChange(POOL_TYPE.BLOCK);
}}
infoElement={
poolType === POOL_TYPE.FILESYSTEM && (
<>
<Icon status="info">
<InfoCircleIcon />
</Icon>
<span className="pf-v5-u-disabled-color-100 pf-v5-u-font-size-sm pf-v5-u-ml-sm">
{t(
'The pool name comprises a prefix followed by the user-provided name.'
)}
</span>
</>
)
}
inputPrefixElement={
poolType === POOL_TYPE.FILESYSTEM && (
<>
<TextInput
id="cephfs-pool-prefix"
className="cephfs-pool-prefix"
value={fsName}
isDisabled={true}
/>
<div className="pf-v5-u-ml-sm pf-v5-u-mr-sm">-</div>
</>
)
}
/>
<div className="form-group ceph-block-pool-body__input">
<label
className="control-label co-required"
htmlFor="pool-replica-size"
>
{t('Data protection policy')}
</label>
<Dropdown
className="dropdown--full-width"
toggle={
<DropdownToggle
id="replica-dropdown"
data-test="replica-dropdown"
onToggle={() => setReplicaOpen(!isReplicaOpen)}
toggleIndicator={CaretDownIcon}
isDisabled={state.isArbiterCluster}
>
{state.replicaSize
? t('{{replica}} Replication', {
replica: OCS_DEVICE_REPLICA[state.replicaSize],
})
: t('Select replication')}
</DropdownToggle>
}
isOpen={isReplicaOpen}
dropdownItems={replicaDropdownItems}
onSelect={() => setReplicaOpen(false)}
id="pool-replica-size"
/>
</div>
<div className="form-group ceph-block-pool-body__input">
<label className="control-label" htmlFor="compression-check">
{t('Data compression')}
</label>
<div className="checkbox">
<label className="ceph-block-pool-body__compression">
<input
type="checkbox"
onChange={(event) =>
dispatch({
type: StoragePoolActionType.SET_POOL_COMPRESSED,
payload: event.target.checked,
})
}
checked={state.isCompressed}
name="compression-check"
data-test="compression-checkbox"
/>
</div>
</FormGroup>
<TextInputWithFieldRequirements
control={control}
fieldRequirements={fieldRequirements}
defaultValue={state.poolName}
popoverProps={{
headerContent: t('Name requirements'),
footerContent: `${t('Example')}: my-pool`,
}}
formGroupProps={{
label: t('Pool name'),
fieldId: 'pool-name',
className: 'ceph-block-pool-body__input',
isRequired: true,
}}
textInputProps={{
id: 'pool-name',
name: 'newPoolName',
'data-test': 'new-pool-name-textbox',
'aria-describedby': t('pool-name-help'),
placeholder: t('my-pool'),
isDisabled: isUpdate,
}}
infoElement={
poolType === POOL_TYPE.FILESYSTEM && (
<>
<Icon status="info">
<InfoCircleIcon />
</Icon>
<span className="pf-v5-u-disabled-color-100 pf-v5-u-font-size-sm pf-v5-u-ml-sm">
{t(
'Optimize storage efficiency by enabling data compression within replicas.'
'The pool name comprises a prefix followed by the user-provided name.'
)}
</label>
</div>
</div>
{state.isCompressed && (
<Alert
className="co-alert ceph-block-pool__alert"
variant="info"
title={t(
'Enabling compression may result in little or no space savings for encrypted or random data. Also, enabling compression may have an impact on I/O performance.'
)}
isInline
</span>
</>
)
}
inputPrefixElement={
poolType === POOL_TYPE.FILESYSTEM && (
<>
<TextInput
id="cephfs-pool-prefix"
className="cephfs-pool-prefix"
value={fsName}
isDisabled={true}
/>
<div className="pf-v5-u-ml-sm pf-v5-u-mr-sm">-</div>
</>
)
}
/>
<div className="form-group ceph-block-pool-body__input">
<label
className="control-label co-required"
htmlFor="pool-replica-size"
>
{t('Data protection policy')}
</label>
<Dropdown
className="dropdown--full-width"
toggle={
<DropdownToggle
id="replica-dropdown"
data-test="replica-dropdown"
onToggle={() => setReplicaOpen(!isReplicaOpen)}
toggleIndicator={CaretDownIcon}
isDisabled={state.isArbiterCluster}
>
{state.replicaSize
? t('{{replica}} Replication', {
replica: OCS_DEVICE_REPLICA[state.replicaSize],
})
: t('Select replication')}
</DropdownToggle>
}
isOpen={isReplicaOpen}
dropdownItems={replicaDropdownItems}
onSelect={() => setReplicaOpen(false)}
id="pool-replica-size"
/>
</div>
<div className="form-group ceph-block-pool-body__input">
<label className="control-label" htmlFor="compression-check">
{t('Data compression')}
</label>
<div className="checkbox">
<label className="ceph-block-pool-body__compression">
<input
type="checkbox"
onChange={(event) =>
dispatch({
type: StoragePoolActionType.SET_POOL_COMPRESSED,
payload: event.target.checked,
})
}
checked={state.isCompressed}
name="compression-check"
data-test="compression-checkbox"
/>
{t(
'Optimize storage efficiency by enabling data compression within replicas.'
)}
</label>
</div>
</div>
{state.isCompressed && (
<Alert
className="co-alert ceph-block-pool__alert"
variant="info"
title={t(
'Enabling compression may result in little or no space savings for encrypted or random data. Also, enabling compression may have an impact on I/O performance.'
)}
</>
) : (
<StoragePoolStatus status={POOL_PROGRESS.CLUSTERNOTREADY} />
isInline
/>
)}
</>
) : (
<StoragePoolStatus status={POOL_PROGRESS.CLUSTERNOTREADY} />
);
};
Loading

0 comments on commit cb13092

Please sign in to comment.