Merge pull request #2294 from openshift-cherrypick-robot/cherry-pick-…

…2273-to-release-4.17 [release-4.17] CNV-49651: put a default disk size if user have no access to the pvcs
kubevirt-ui · Dec 2, 2024 · d4d3f53 · d4d3f53
2 parents 9bdb973 + 77ff168
commit d4d3f53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...views/catalog/CreateFromInstanceTypes/components/VMDetailsSection/components/DiskSize.tsx b/...views/catalog/CreateFromInstanceTypes/components/VMDetailsSection/components/DiskSize.tsx
@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 
 import { useInstanceTypeVMStore } from '@catalog/CreateFromInstanceTypes/state/useInstanceTypeVMStore';
 import CapacityInput from '@kubevirt-utils/components/CapacityInput/CapacityInput';
+import { DEFAULT_DISK_SIZE } from '@kubevirt-utils/components/DiskModal/utils/constants';
 import { getVolumeSnapshotSize } from '@kubevirt-utils/resources/bootableresources/selectors';
 import { convertToBaseValue, humanizeBinaryBytes } from '@kubevirt-utils/utils/humanize.js';
 
@@ -12,9 +13,7 @@ const DiskSize: FC = () => {
 
   const pvcDiskSize =
     pvcSource?.spec?.resources?.requests?.storage || getVolumeSnapshotSize(volumeSnapshotSource);
-  const sizeData = humanizeBinaryBytes(convertToBaseValue(pvcDiskSize)).string;
-
-  if (!pvcDiskSize) return null;
+  const sizeData = humanizeBinaryBytes(convertToBaseValue(pvcDiskSize || DEFAULT_DISK_SIZE)).string;
 
   return <CapacityInput onChange={setCustomDiskSize} size={customDiskSize || sizeData} />;
 };

diff --git a/src/views/catalog/CreateFromInstanceTypes/utils/utils.ts b/src/views/catalog/CreateFromInstanceTypes/utils/utils.ts
@@ -10,6 +10,7 @@ import {
   CloudInitUserData,
   convertUserDataObjectToYAML,
 } from '@kubevirt-utils/components/CloudinitModal/utils/cloudinit-utils';
+import { DEFAULT_DISK_SIZE } from '@kubevirt-utils/components/DiskModal/utils/constants';
 import { InterfaceTypes } from '@kubevirt-utils/components/DiskModal/utils/types';
 import { addSecretToVM } from '@kubevirt-utils/components/SSHSecretModal/utils/utils';
 import { sysprepDisk, sysprepVolume } from '@kubevirt-utils/components/SysprepModal/sysprep-utils';
@@ -144,7 +145,11 @@ export const generateVM = (
                       storage: pvcSource?.spec?.resources?.requests?.storage,
                     },
                   }
-                : {},
+                : {
+                    requests: {
+                      storage: DEFAULT_DISK_SIZE,
+                    },
+                  },
               storageClassName,
             },
           },