feat(console): create vm support set accessModes by sc Provisioner (#…

…2239) * feat(console): create vm support set accessModes by sc Provisioner * feat(console): add case * fix(console): change createVM volumeMode
tkestack · Mar 1, 2023 · e0699b4 · e0699b4
1 parent 44b0053
commit e0699b4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/web/console/src/modules/cluster/components/resource/virtual-machine/constants/index.tsx b/web/console/src/modules/cluster/components/resource/virtual-machine/constants/index.tsx
@@ -28,6 +28,7 @@ export interface DiskInterface {
   type: DiskTypeEnum;
   volumeMode: VolumeModeEnum;
   storageClass: string;
+  scProvisioner: string;
   size: number;
 }
 

diff --git a/...onsole/src/modules/cluster/components/resource/virtual-machine/pages/create/diskPanel.tsx b/...onsole/src/modules/cluster/components/resource/virtual-machine/pages/create/diskPanel.tsx
@@ -24,6 +24,7 @@ export const DiskPanel = () => {
         type: DiskTypeEnum.Data,
         volumeMode: VolumeModeEnum.Filesystem,
         storageClass: null,
+        scProvisioner: null,
         size: 50
       }
     ];
@@ -97,6 +98,9 @@ export const DiskPanel = () => {
               onChange={storageClass =>
                 modifyDiskItem({
                   storageClass,
+                  scProvisioner:
+                    storageClassListLoadable?.contents?.find(({ value }) => value === storageClass)?.provisioner ??
+                    null,
                   id
                 })
               }

diff --git a/web/console/src/modules/cluster/components/resource/virtual-machine/pages/create/index.tsx b/web/console/src/modules/cluster/components/resource/virtual-machine/pages/create/index.tsx
@@ -64,7 +64,9 @@ export const VMCreatePanel = () => {
       });
 
       history.back();
-    } catch (error) {}
+    } catch (error) {
+      console.log('createVm error --->', error);
+    }
   }
 
   return (

diff --git a/web/console/src/modules/cluster/components/resource/virtual-machine/store/creation.ts b/web/console/src/modules/cluster/components/resource/virtual-machine/store/creation.ts
@@ -33,6 +33,7 @@ export const diskListState = atom<DiskInterface[]>({
       type: DiskTypeEnum.System,
       volumeMode: VolumeModeEnum.Filesystem,
       storageClass: null,
+      scProvisioner: null,
       size: 50
     },
 
@@ -42,6 +43,7 @@ export const diskListState = atom<DiskInterface[]>({
       type: DiskTypeEnum.Data,
       volumeMode: VolumeModeEnum.Filesystem,
       storageClass: null,
+      scProvisioner: null,
       size: 50
     }
   ]
@@ -56,7 +58,7 @@ export const storageClassListState = selector({
 
     const { items } = await storageClassAPI.fetchStorageClassList(clusterId);
 
-    return items?.map(({ metadata }) => ({ value: metadata?.name })) ?? [];
+    return items?.map(({ metadata, provisioner }) => ({ value: metadata?.name, provisioner })) ?? [];
   }
 });
 

diff --git a/web/console/src/webApi/virtual-machine.ts b/web/console/src/webApi/virtual-machine.ts
@@ -1,3 +1,4 @@
+import { VolumeModeEnum } from '@src/modules/cluster/components/resource/virtual-machine/constants';
 import { Request, generateQueryString } from './request';
 
 const IMAGE_NAMESPACE = 'kube-public';
@@ -214,14 +215,16 @@ export function createVM({
 
         spec: {
           pvc: {
-            accessModes: ['ReadWriteOnce'],
+            accessModes: ['ReadWriteMany'],
             resources: {
               requests: {
                 storage: `${item.size}Gi`
               }
             },
 
-            volumeMode: item.volumeMode,
+            volumeMode: ['loopdevice.csi.infra.tce.io', 'rbd.csi.ceph.com'].includes(item?.scProvisioner)
+              ? VolumeModeEnum.Block
+              : VolumeModeEnum.Filesystem,
             storageClassName: item.storageClass
           },