take storageClassConfigMap into account when creating disk patches (#555)

Signed-off-by: suomiy <[email protected]>

Author: suomiy

src/k8s/index.js

@@ -1,4 +1,5 @@
 export * from './request';
+export * from './requests/storageClass';
 export * from './selectors';
 
 export { getBootableDevicesInOrder } from './vmBuilder';

src/utils/patches.js

@@ -1,6 +1,16 @@
 import { get, has, findIndex } from 'lodash';
 
-import { getDisks, getInterfaces, getName, getDescription, getFlavor, getCpu, getMemory } from '../selectors';
+import {
+  getDisks,
+  getInterfaces,
+  getName,
+  getDescription,
+  getFlavor,
+  getCpu,
+  getMemory,
+  getDefaultSCAccessMode,
+  getDefaultSCVolumeMode,
+} from '../selectors';
 import { getBootDeviceIndex } from './utils';
 import {
   ANNOTATION_FIRST_BOOT,
@@ -9,7 +19,6 @@ import {
   TEMPLATE_FLAVOR_LABEL,
   deviceTypeToPathKey,
   DEVICE_TYPE_INTERFACE,
-  PVC_ACCESSMODE_RWM,
 } from '../constants';
 import { NETWORK_TYPE_POD } from '../components/Wizard/CreateVmWizard/constants';
 import { assignBootOrderIndex, getBootableDevicesInOrder, getDevices, addBindingToInterface } from '../k8s/vmBuilder';
@@ -47,7 +56,7 @@ export const getPxeBootPatch = vm => {
   return patches;
 };
 
-export const getAddDiskPatch = (vm, storage) => {
+export const getAddDiskPatch = (vm, storage, storageClassConfigMap) => {
   const disk = {
     name: storage.name,
     bootOrder: assignBootOrderIndex(vm),
@@ -69,7 +78,8 @@ export const getAddDiskPatch = (vm, storage) => {
     },
     spec: {
       pvc: {
-        accessModes: [PVC_ACCESSMODE_RWM],
+        accessModes: [getDefaultSCAccessMode(storageClassConfigMap, storage.storageClass)],
+        volumeMode: getDefaultSCVolumeMode(storageClassConfigMap, storage.storageClass),
         resources: {
           requests: {
             storage: `${storage.size}Gi`,

src/utils/tests/patches.test.js

@@ -4,7 +4,6 @@ import {
   ANNOTATION_FIRST_BOOT,
   BOOT_ORDER_SECOND,
   BOOT_ORDER_FIRST,
-  PVC_ACCESSMODE_RWM,
   TEMPLATE_FLAVOR_LABEL,
   POD_NETWORK,
   DISK_PATH_KEY,
@@ -24,6 +23,7 @@ import {
 } from '../patches';
 import { cloudInitTestVm } from '../../tests/mocks/vm/cloudInitTestVm.mock';
 import { NETWORK_TYPE_POD, NETWORK_TYPE_MULTUS } from '../../components/Wizard/CreateVmWizard/constants';
+import { getDefaultSCAccessMode, getDefaultSCVolumeMode } from '../../selectors/configmap';
 
 const getVM = firstBoot => ({
   metadata: {
@@ -86,7 +86,8 @@ const dataVolumeTemplate = {
   },
   spec: {
     pvc: {
-      accessModes: [PVC_ACCESSMODE_RWM],
+      accessModes: [getDefaultSCAccessMode()],
+      volumeMode: getDefaultSCVolumeMode(),
       resources: {
         requests: {
           storage: `${storageNoClass.size}Gi`,