CNV-43096: Customize disk size instancetype

kubevirt-ui · Jul 16, 2024 · efb3778 · efb3778
1 parent 2ec57bf
commit efb3778
Show file tree

Hide file tree

Showing 12 changed files with 180 additions and 32 deletions.
diff --git a/src/utils/components/DiskModal/DiskModal.tsx b/src/utils/components/DiskModal/DiskModal.tsx
@@ -31,6 +31,7 @@ import { DiskFormState, DiskModalProps } from './utils/types';
 
 const DiskModal: FC<DiskModalProps> = ({
   createOwnerReference = true,
+  customize = false,
   headerText,
   initialFormData = null,
   isEditingCreatedDisk = false,
@@ -69,7 +70,8 @@ const DiskModal: FC<DiskModalProps> = ({
         }}
         onSubmit={() =>
           handleSubmit((data) => {
-            if (isEditingCreatedDisk) return editVMDisk(vm, initialFormData, data, onSubmit);
+            if (isEditingCreatedDisk || customize)
+              return editVMDisk(vm, initialFormData, data, onSubmit);
 
             if (!isEmpty(initialFormData))
               return editDisk(initialFormData, data, uploadData, {
@@ -111,7 +113,7 @@ const DiskModal: FC<DiskModalProps> = ({
             relevantUpload={upload}
             vm={vm}
           />
-          <DiskSizeInput isEditingCreatedDisk={isEditingCreatedDisk} />
+          <DiskSizeInput customize={customize} isEditingCreatedDisk={isEditingCreatedDisk} />
           <DiskTypeSelect isVMRunning={isVMRunning} />
           <DiskInterfaceSelect isVMRunning={isVMRunning} />
           <StorageClassAndPreallocation

diff --git a/src/utils/components/DiskModal/components/DiskSizeInput/DiskSizeInput.tsx b/src/utils/components/DiskModal/components/DiskSizeInput/DiskSizeInput.tsx
@@ -9,14 +9,14 @@ import { diskSizeField, diskSourceField } from '../utils/constants';
 
 import DynamicSize from './DynamicSize';
 
-type DiskSizeInputProps = { isEditingCreatedDisk: boolean };
+type DiskSizeInputProps = { customize?: boolean; isEditingCreatedDisk: boolean };
 
-const DiskSizeInput: FC<DiskSizeInputProps> = ({ isEditingCreatedDisk }) => {
+const DiskSizeInput: FC<DiskSizeInputProps> = ({ customize, isEditingCreatedDisk }) => {
   const { t } = useKubevirtTranslation();
   const { control, watch } = useFormContext<DiskFormState>();
   const diskSource = watch(diskSourceField);
 
-  if (SourceTypes.PVC === diskSource || SourceTypes.OTHER === diskSource) {
+  if (SourceTypes.PVC === diskSource || (SourceTypes.OTHER === diskSource && !customize)) {
     return null;
   }
 

diff --git a/src/utils/components/DiskModal/utils/helpers.ts b/src/utils/components/DiskModal/utils/helpers.ts
@@ -676,6 +676,20 @@ export const editVMDisk = (
       delete vmDisks[diskIndexEdited].bootOrder;
     }
 
+    if (
+      initialDiskFormState.diskSize !== newDiskFormState.diskSize &&
+      newDiskFormState.diskSource === SourceTypes.OTHER
+    ) {
+      const sourceDataVolume = getDataVolumeTemplates(vmDraft)?.find(
+        (dv) => getName(dv) === volumeEdited?.dataVolume?.name,
+      );
+
+      if (sourceDataVolume)
+        sourceDataVolume.spec.storage = {
+          resources: { requests: { storage: newDiskFormState.diskSize } },
+        };
+    }
+
     return vmDraft;
   });
 

diff --git a/src/utils/components/DiskModal/utils/types.ts b/src/utils/components/DiskModal/utils/types.ts
@@ -68,6 +68,7 @@ export type DiskFormState = {
 
 export type DiskModalProps = {
   createOwnerReference?: boolean;
+  customize?: boolean;
   headerText: string;
   initialFormData?: DiskFormState;
   isEditingCreatedDisk?: boolean;

diff --git a/src/utils/resources/vm/hooks/disk/useDisksSources.ts b/src/utils/resources/vm/hooks/disk/useDisksSources.ts
@@ -0,0 +1,95 @@
+import { useMemo } from 'react';
+
+import { V1beta1DataSource } from '@kubevirt-ui/kubevirt-api/containerized-data-importer/models';
+import { IoK8sApiCoreV1PersistentVolume } from '@kubevirt-ui/kubevirt-api/kubernetes';
+import { V1VirtualMachine } from '@kubevirt-ui/kubevirt-api/kubevirt';
+import {
+  DataSourceModelGroupVersionKind,
+  modelToGroupVersionKind,
+  PersistentVolumeClaimModel,
+} from '@kubevirt-utils/models';
+import { isEmpty } from '@kubevirt-utils/utils/utils';
+import { useK8sWatchResources } from '@openshift-console/dynamic-plugin-sdk';
+
+import { getDataVolumeTemplates } from '../../utils';
+
+const PersistentVolumeClaimGroupVersionKind = modelToGroupVersionKind(PersistentVolumeClaimModel);
+
+const useDisksSources = (vm: V1VirtualMachine) => {
+  const dataSourcesWatch = useMemo(
+    () =>
+      getDataVolumeTemplates(vm)
+        ?.map((dataVolume) => dataVolume?.spec?.sourceRef)
+        .filter((sourceRef) => Boolean(sourceRef))
+        .reduce((acc, dataSource) => {
+          acc[`${dataSource.name}-${dataSource.namespace}`] = {
+            groupVersionKind: DataSourceModelGroupVersionKind,
+            name: dataSource.name,
+            namespace: dataSource.namespace,
+          };
+
+          return acc;
+        }, {}),
+    [vm],
+  );
+
+  const dataSourcesWatchResult = useK8sWatchResources<{ [key: string]: V1beta1DataSource }>(
+    dataSourcesWatch,
+  );
+
+  const dataSources = useMemo(
+    () =>
+      Object.values(dataSourcesWatchResult || [])
+        .map((watch) => watch.data)
+        .filter((data) => !isEmpty(data)),
+    [dataSourcesWatchResult],
+  );
+
+  const pvcWatches = useMemo(() => {
+    const pvcSources = getDataVolumeTemplates(vm)
+      ?.map((dataVolume) => dataVolume?.spec?.source?.pvc)
+      .filter((pvcSource) => !isEmpty(pvcSource));
+
+    pvcSources.push(
+      ...dataSources
+        .map((dataSource) => dataSource?.spec?.source?.pvc)
+        .filter((pvcSource) => !isEmpty(pvcSource)),
+    );
+
+    return pvcSources.reduce((acc, pvcSource) => {
+      acc[`${pvcSource.name}-${pvcSource.namespace}`] = {
+        groupVersionKind: PersistentVolumeClaimGroupVersionKind,
+        name: pvcSource.name,
+        namespace: pvcSource.namespace,
+      };
+
+      return acc;
+    }, {});
+  }, [vm, dataSources]);
+
+  const pvcWatchesResult = useK8sWatchResources<{ [key: string]: IoK8sApiCoreV1PersistentVolume }>(
+    pvcWatches,
+  );
+
+  const pvcs = useMemo(
+    () =>
+      Object.values(pvcWatchesResult || [])
+        .map((watch) => watch.data)
+        .filter((data) => !isEmpty(data)),
+    [pvcWatchesResult],
+  );
+
+  const loaded = [
+    ...Object.values(dataSourcesWatchResult),
+    ...Object.values(pvcWatchesResult),
+  ].every((watch) => watch.loaded);
+
+  const loadingError = [
+    ...Object.values(dataSourcesWatchResult),
+    ...Object.values(pvcWatchesResult),
+  ].find((watch) => watch.loadError);
+
+  return { dataSources, loaded, loadingError, pvcs };
+};
+
+export default useDisksSources;
diff --git a/src/utils/resources/vm/hooks/disk/useDisksTableData.ts b/src/utils/resources/vm/hooks/disk/useDisksTableData.ts
@@ -1,20 +1,26 @@
 import { useMemo } from 'react';
 import { isRunning } from 'src/views/virtualmachines/utils';
 
-import { IoK8sApiCoreV1PersistentVolumeClaim } from '@kubevirt-ui/kubevirt-api/kubernetes';
 import { V1VirtualMachine, V1VirtualMachineInstance } from '@kubevirt-ui/kubevirt-api/kubevirt';
 import {
   getRunningVMMissingDisksFromVMI,
   getRunningVMMissingVolumesFromVMI,
 } from '@kubevirt-utils/components/DiskModal/utils/helpers';
 import { ROOTDISK } from '@kubevirt-utils/constants/constants';
-import { PersistentVolumeClaimModel } from '@kubevirt-utils/models';
+import { getName, getNamespace } from '@kubevirt-utils/resources/shared';
 import { DiskRawData, DiskRowDataLayout } from '@kubevirt-utils/resources/vm/utils/disk/constants';
-import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 
-import { getBootDisk, getDisks, getInstanceTypeMatcher, getVolumes } from '../../utils';
+import {
+  getBootDisk,
+  getDataVolumeTemplates,
+  getDisks,
+  getInstanceTypeMatcher,
+  getVolumes,
+} from '../../utils';
 import { getDiskRowDataLayout } from '../../utils/disk/rowData';
 
+import useDisksSources from './useDisksSources';
+
 type UseDisksTableDisks = (
   vm: V1VirtualMachine,
   vmi: V1VirtualMachineInstance,
@@ -47,12 +53,7 @@ const useDisksTableData: UseDisksTableDisks = (vm, vmi) => {
     [vm, vmi, isVMRunning],
   );
 
-  const [pvcs, loaded, loadingError] = useK8sWatchResource<IoK8sApiCoreV1PersistentVolumeClaim[]>({
-    isList: true,
-    kind: PersistentVolumeClaimModel.kind,
-    namespace: vm?.metadata?.namespace,
-    namespaced: true,
-  });
+  const { dataSources, loaded, loadingError, pvcs } = useDisksSources(vm);
 
   const disks = useMemo(() => {
     const isInstanceTypeVM = Boolean(getInstanceTypeMatcher(vm));
@@ -63,16 +64,29 @@ const useDisksTableData: UseDisksTableDisks = (vm, vmi) => {
           ? { name: ROOTDISK }
           : vmDisks?.find(({ name }) => name === volume?.name);
 
+      const dataVolumeTemplate = volume?.dataVolume?.name
+        ? getDataVolumeTemplates(vm)?.find((dv) => getName(dv) === volume.dataVolume.name)
+        : null;
+
+      const sourceRef = dataVolumeTemplate?.spec?.sourceRef;
+
+      const dataSource = dataSources.find(
+        (ds) => getName(ds) === sourceRef?.name && getNamespace(ds) === sourceRef?.namespace,
+      );
+
       const pvc = pvcs?.find(
         ({ metadata }) =>
           metadata?.name === volume?.persistentVolumeClaim?.claimName ||
-          metadata?.name === volume?.dataVolume?.name,
+          metadata?.name === volume?.dataVolume?.name ||
+          (dataSource?.spec?.source?.pvc?.name === metadata?.name &&
+            dataSource?.spec?.source?.pvc?.namespace === metadata?.namespace),
       );
-      return { disk, pvc, volume };
+
+      return { dataVolumeTemplate, disk, pvc, volume };
     });
 
     return getDiskRowDataLayout(diskDevices, getBootDisk(vm));
-  }, [vmVolumes, vm, vmDisks, pvcs]);
+  }, [vm, vmVolumes, vmDisks, pvcs, dataSources]);
 
   return [disks || [], loaded, loadingError, isVMRunning ? vmi : null];
 };

diff --git a/src/utils/resources/vm/utils/disk/rowData.ts b/src/utils/resources/vm/utils/disk/rowData.ts
@@ -4,7 +4,7 @@ import {
   DYNAMIC,
   OTHER,
 } from '@kubevirt-utils/components/DiskModal/components/utils/constants';
-import { SourceTypes } from '@kubevirt-utils/components/DiskModal/utils/types';
+import { VolumeTypes } from '@kubevirt-utils/components/DiskModal/utils/types';
 import { DiskRawData, DiskRowDataLayout } from '@kubevirt-utils/resources/vm/utils/disk/constants';
 import {
   getPrintableDiskDrive,
@@ -47,12 +47,15 @@ export const getDiskRowDataLayout = (
       diskRowDataObject.source = device?.pvc?.metadata?.name;
       diskRowDataObject.sourceStatus = device?.pvc?.status?.phase;
       diskRowDataObject.size = humanizeBinaryBytes(
-        convertToBaseValue(device?.pvc?.spec?.resources?.requests?.storage),
+        convertToBaseValue(
+          device?.dataVolumeTemplate?.spec?.storage?.resources?.requests?.storage ||
+            device?.pvc?.spec?.resources?.requests?.storage,
+        ),
       ).string;
       diskRowDataObject.storageClass = device?.pvc?.spec?.storageClassName;
     }
 
-    if (volumeSource === SourceTypes.EPHEMERAL) {
+    if (volumeSource === VolumeTypes.CONTAINER_DISK) {
       diskRowDataObject.source = CONTAINER_EPHERMAL;
       diskRowDataObject.size = DYNAMIC;
     }

diff --git a/...g/CustomizeInstanceType/tabs/configuration/utils/tabs/CustomizeInstanceTypeStorageTab.tsx b/...g/CustomizeInstanceType/tabs/configuration/utils/tabs/CustomizeInstanceTypeStorageTab.tsx
@@ -42,6 +42,7 @@ const CustomizeInstanceTypeStorageTab = () => {
 
               return Promise.resolve(vmModified);
             }}
+            customize
             vm={vm}
           />
         </PageSection>

diff --git a/...ws/virtualmachines/details/tabs/configuration/storage/components/tables/disk/DiskList.tsx b/...ws/virtualmachines/details/tabs/configuration/storage/components/tables/disk/DiskList.tsx
@@ -26,12 +26,13 @@ import DiskRow from './DiskRow';
 import './disklist.scss';
 
 type DiskListProps = {
+  customize?: boolean;
   onDiskUpdate?: (updatedVM: V1VirtualMachine) => Promise<V1VirtualMachine>;
   vm: V1VirtualMachine;
   vmi?: V1VirtualMachineInstance;
 };
 
-const DiskList: FC<DiskListProps> = ({ onDiskUpdate, vm, vmi }) => {
+const DiskList: FC<DiskListProps> = ({ customize = false, onDiskUpdate, vm, vmi }) => {
   const { t } = useKubevirtTranslation();
   const { createModal } = useModal();
   const columns = useDiskColumns();
@@ -88,7 +89,7 @@ const DiskList: FC<DiskListProps> = ({ onDiskUpdate, vm, vmi }) => {
         loaded={loaded}
         loadError={loadError}
         Row={DiskRow}
-        rowData={{ onSubmit, provisioningPercentages, vm, vmi }}
+        rowData={{ customize, onSubmit, provisioningPercentages, vm, vmi }}
         unfilteredData={data}
       />
     </div>

diff --git a/...ews/virtualmachines/details/tabs/configuration/storage/components/tables/disk/DiskRow.tsx b/...ews/virtualmachines/details/tabs/configuration/storage/components/tables/disk/DiskRow.tsx
@@ -17,13 +17,18 @@ const DiskRow: FC<
   RowProps<
     DiskRowDataLayout,
     {
+      customize?: boolean;
       onSubmit?: (updatedVM: V1VirtualMachine) => Promise<V1VirtualMachine>;
       provisioningPercentages: NameWithPercentages;
       vm: V1VirtualMachine;
       vmi?: V1VirtualMachineInstance;
     }
   >
-> = ({ activeColumnIDs, obj, rowData: { onSubmit, provisioningPercentages, vm, vmi } }) => {
+> = ({
+  activeColumnIDs,
+  obj,
+  rowData: { customize = false, onSubmit, provisioningPercentages, vm, vmi },
+}) => {
   const { t } = useKubevirtTranslation();
 
   const provisioningPercentage = provisioningPercentages?.[obj?.source];
@@ -94,7 +99,7 @@ const DiskRow: FC<
         className="dropdown-kebab-pf pf-v5-c-table__action"
         id=""
       >
-        <DiskRowActions obj={obj} onDiskUpdate={onSubmit} vm={vm} vmi={vmi} />
+        <DiskRowActions customize={customize} obj={obj} onDiskUpdate={onSubmit} vm={vm} vmi={vmi} />
       </TableData>
     </>
   );

diff --git a/...tualmachines/details/tabs/configuration/storage/components/tables/disk/DiskRowActions.tsx b/...tualmachines/details/tabs/configuration/storage/components/tables/disk/DiskRowActions.tsx
@@ -19,13 +19,20 @@ import { getEditDiskStates } from './utils/getEditDiskStates';
 import { isHotplugVolume, isPVCSource, isPVCStatusBound } from './utils/helpers';
 
 type DiskRowActionsProps = {
+  customize?: boolean;
   obj: DiskRowDataLayout;
   onDiskUpdate?: (updatedVM: V1VirtualMachine) => Promise<V1VirtualMachine>;
   vm: V1VirtualMachine;
   vmi?: V1VirtualMachineInstance;
 };
 
-const DiskRowActions: FC<DiskRowActionsProps> = ({ obj, onDiskUpdate, vm, vmi }) => {
+const DiskRowActions: FC<DiskRowActionsProps> = ({
+  customize = false,
+  obj,
+  onDiskUpdate,
+  vm,
+  vmi,
+}) => {
   const { t } = useKubevirtTranslation();
   const { createModal } = useModal();
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
@@ -38,7 +45,7 @@ const DiskRowActions: FC<DiskRowActionsProps> = ({ obj, onDiskUpdate, vm, vmi })
   const isHotplug = isHotplugVolume(vm, diskName, vmi);
   const isEditDisabled = isVMRunning;
 
-  const initialFormState = !isEditDisabled && getEditDiskStates(vm, diskName, vmi);
+  const initialFormState = !isEditDisabled && getEditDiskStates(vm, obj, vmi);
   const volumes = isVMRunning ? vmi?.spec?.volumes : getVolumes(vm);
   const volume = volumes?.find(({ name }) => name === diskName);
 
@@ -56,9 +63,10 @@ const DiskRowActions: FC<DiskRowActionsProps> = ({ obj, onDiskUpdate, vm, vmi })
   const createEditDiskModal = () =>
     createModal(({ isOpen, onClose }) => (
       <DiskModal
+        customize={customize}
         headerText={t('Edit disk')}
         initialFormData={initialFormState}
-        isEditingCreatedDisk={pvcResourceExists}
+        isEditingCreatedDisk={!customize && pvcResourceExists}
         isOpen={isOpen}
         onClose={onClose}
         onSubmit={onDiskUpdate || updateDisks}
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ const CustomizeInstanceTypeStorageTab = () => { @@
                   return Promise.resolve(vmModified);
                 }}
+                customize
                 vm={vm}
               />
             </PageSection>
@@ Expand Down @@