Add CPU Pinning modal and functionality #3805
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| export const DEDICATED_RESOURCES = 'Dedicated Resources'; | ||
| export const RESOURCE_PINNED = 'Workload scheduled with dedicated resources (guaranteed policy)'; | ||
| export const RESOURCE_NOT_PINNED = 'No Dedicated resources applied'; | ||
| export const RESOURCE_NO_NODES_AVAILABLE = 'There are no qualified Nodes with the required labels'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| .kubevirt-cpu-pinning__checkbox { | ||
| margin-top: var(--pf-global--spacer--md); | ||
| margin-bottom: var(--pf-global--spacer--md); | ||
| } | ||
|
|
||
| .kubevirt-cpu-pinning__helper-text { | ||
| color: var(--pf-global--Color--200); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| import * as React from 'react'; | ||
| import { Checkbox, Modal, Text, TextVariants } from '@patternfly/react-core'; | ||
| import { k8sPatch } from '@console/internal/module/k8s'; | ||
| import { NodeModel } from '@console/internal/models'; | ||
| import { getLabel } from '@console/shared'; | ||
| import { | ||
| Firehose, | ||
| withHandlePromise, | ||
| HandlePromiseProps, | ||
| FirehoseResult, | ||
| Label, | ||
| } from '@console/internal/components/utils'; | ||
| import { ModalFooter } from '../modal/modal-footer'; | ||
| import { getVMLikeModel, isDedicatedCPUPlacement, asVM } from '../../../selectors/vm'; | ||
| import { getDedicatedCpuPatch } from '../../../k8s/patches/vm/vm-cpu-patches'; | ||
| import { VMLikeEntityKind } from '../../../types'; | ||
| import { getLoadedData, isLoaded, getLoadError } from '../../../utils'; | ||
| import { RESOURCE_NO_NODES_AVAILABLE, DEDICATED_RESOURCES } from './consts'; | ||
| import './dedicated-resources-modal.scss'; | ||
|
|
||
| const ResourceModal = withHandlePromise<ResourceModalProps>( | ||
| ({ vmLikeEntity, nodes, isOpen, setOpen, handlePromise, inProgress, errorMessage }) => { | ||
| const isLoading = !isLoaded(nodes); | ||
| const loadError = getLoadError(nodes, NodeModel); | ||
| const isCPUPinned = isDedicatedCPUPlacement(asVM(vmLikeEntity)); | ||
| const loadedNodes = getLoadedData(nodes, []); | ||
|
|
||
| const [isPinned, setIsPinned] = React.useState<boolean>(isCPUPinned); | ||
| const [showPatchError, setPatchError] = React.useState<boolean>(false); | ||
| const isNodeAvailable = loadedNodes.some((node) => getLabel(node, 'cpumanager') === 'true'); | ||
|
|
||
| const submit = async () => { | ||
| if (isPinned !== isCPUPinned) { | ||
| handlePromise( | ||
| k8sPatch( | ||
| getVMLikeModel(vmLikeEntity), | ||
| vmLikeEntity, | ||
| await getDedicatedCpuPatch(vmLikeEntity, isPinned), | ||
| ), | ||
| ) | ||
| .then(() => setOpen(false)) | ||
| .catch(() => setPatchError(true)); | ||
| } else { | ||
| setOpen(false); | ||
| } | ||
| }; | ||
| const footer = ( | ||
| <ModalFooter | ||
| className="" | ||
| warningMessage={!loadError && !isNodeAvailable && RESOURCE_NO_NODES_AVAILABLE} | ||
| errorMessage={showPatchError && errorMessage} | ||
| inProgress={inProgress || isLoading} | ||
| isSimpleError={!isNodeAvailable} | ||
| onSubmit={submit} | ||
| onCancel={() => setOpen(false)} | ||
| submitButtonText="Save" | ||
| /> | ||
| ); | ||
|
|
||
| return ( | ||
| <Modal | ||
| width="50%" | ||
| title={DEDICATED_RESOURCES} | ||
| isOpen={isOpen} | ||
| onClose={() => setOpen(false)} | ||
| footer={footer} | ||
| isFooterLeftAligned | ||
| > | ||
| <Checkbox | ||
| className="kubevirt-cpu-pinning__checkbox" | ||
| label="Schedule this workload with dedicated resources (guaranteed policy)" | ||
| isChecked={isPinned} | ||
| isDisabled={isLoading} | ||
| onChange={setIsPinned} | ||
| id="cpu-pinning-checkbox" | ||
| /> | ||
| <Text className="kubevirt-cpu-pinning__helper-text" component={TextVariants.small}> | ||
| Available only on Nodes with labels{' '} | ||
| <Label kind={NodeModel.kind} name="cpumanager" value="true" expand /> | ||
| </Text> | ||
| </Modal> | ||
| ); | ||
| }, | ||
| ); | ||
|
|
||
| type ResourceModalProps = HandlePromiseProps & { | ||
| vmLikeEntity: VMLikeEntityKind; | ||
| isOpen: boolean; | ||
| nodes?: FirehoseResult<VMLikeEntityKind[]>; | ||
| setOpen: (isOpen: boolean) => void; | ||
| }; | ||
|
|
||
| export const DedicatedResourcesModal: React.FC<DedicatedResourcesModalProps> = (props) => { | ||
| const { vmLikeEntity, ...restProps } = props; | ||
|
|
||
| const resources = [ | ||
| { | ||
| kind: NodeModel.kind, | ||
| isList: true, | ||
| namespaced: false, | ||
| prop: 'nodes', | ||
| }, | ||
| ]; | ||
|
|
||
| return ( | ||
| <Firehose resources={resources}> | ||
| <ResourceModal vmLikeEntity={vmLikeEntity} {...restProps} /> | ||
| </Firehose> | ||
| ); | ||
| }; | ||
|
|
||
| type DedicatedResourcesModalProps = { | ||
| vmLikeEntity: VMLikeEntityKind; | ||
| isOpen: boolean; | ||
| setOpen: (isOpen: boolean) => void; | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| .kubevirt-create-nic-modal__buttons { | ||
| padding: 0; | ||
| text-align: left; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { PatchBuilder, PatchOperation } from '@console/shared/src/k8s'; | ||
| import { Patch } from '@console/internal/module/k8s'; | ||
| import { VMLikeEntityKind } from '../../../types'; | ||
| import { getVMLikePatches } from '../vm-template'; | ||
| import { | ||
| getCPU, | ||
| getResourcesRequestsCPUCount, | ||
| getResourcesLimitsCPUCount, | ||
| asVM, | ||
| } from '../../../selectors/vm'; | ||
|
|
||
| export const getDedicatedCpuPatch = ( | ||
| vmLikeEntity: VMLikeEntityKind, | ||
| dedicatedCpuPlacement: boolean, | ||
| ): Patch[] => { | ||
| const vm = asVM(vmLikeEntity); | ||
| const isCPUAvailable = !!getCPU(vm); | ||
| const patches = []; | ||
|
|
||
| if (isCPUAvailable) { | ||
| patches.push( | ||
| new PatchBuilder('/spec/template/spec/domain/cpu/dedicatedCpuPlacement') | ||
| .setOperation(PatchOperation.REPLACE) | ||
| .setValue(dedicatedCpuPlacement) | ||
| .build(), | ||
| ); | ||
| } else { | ||
| const resourcesCPU = getResourcesRequestsCPUCount(vm) || getResourcesLimitsCPUCount(vm); | ||
| patches.push( | ||
| new PatchBuilder('/spec/template/spec/domain/cpu') | ||
| .setOperation(PatchOperation.REPLACE) | ||
| .setValue(resourcesCPU ? { dedicatedCpuPlacement } : { cores: 1, dedicatedCpuPlacement }) | ||
| .build(), | ||
| ); | ||
| } | ||
|
|
||
| return getVMLikePatches(vmLikeEntity, () => patches); | ||
|
||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it seems that its better to pass
onClosewhich wont take any parameter as input as you always callsetOpen(false).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually pass the name should be
closeas defined inModalComponentProps