Merge pull request #10994 from torchiaf/vgpu-integration-2-2-8

[2.8] Limit number of assigned vGPUs to 1 for each Machine Pool
rancher · May 9, 2024 · c8431af · c8431af
2 parents a8c6747 + 3d6b5e0
commit c8431af
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/pkg/harvester-manager/machine-config/harvester.vue b/pkg/harvester-manager/machine-config/harvester.vue
@@ -729,8 +729,8 @@ export default {
           .reduce((acc, v) => ({
             ...acc,
             [v.id]: {
-              type:    VGPU_PREFIX.NVIDIA + v.spec.vGPUTypeName.replace(' ', '_'),
-              profile: v.id.split('-')?.[2]
+              type: VGPU_PREFIX.NVIDIA + v.spec.vGPUTypeName?.replace(' ', '_'),
+              id:   v.id
             },
           }), {});
       }
@@ -1103,7 +1103,7 @@ export default {
     vGpuOptionLabel(opt) {
       const vGpu = this.vGpuEnabledDevices[opt];
 
-      return `${ vGpu?.type?.replace(VGPU_PREFIX.NVIDIA, '') } (profile: ${ vGpu?.profile } - allocatable: ${ this.vGpusAllocatable[vGpu?.type] })`;
+      return `${ vGpu?.type?.replace(VGPU_PREFIX.NVIDIA, '') } - ${ vGpu?.id } (allocatable: ${ this.vGpusAllocatable[vGpu?.type] })`;
     }
   }
 };
@@ -1368,7 +1368,12 @@ export default {
           <ArrayListSelect
             v-model="vGpus"
             class="mt-20"
-            :array-list-props="{ addAllowed: true, mode, disabled }"
+            :array-list-props="{
+              addAllowed: true,
+              addDisabled: vGpus.length > 0,
+              mode,
+              disabled
+            }"
             :select-props="{
               mode,
               disabled,

diff --git a/shell/components/form/ArrayList.vue b/shell/components/form/ArrayList.vue
@@ -56,6 +56,10 @@ export default {
       type:    Boolean,
       default: true,
     },
+    addDisabled: {
+      type:    Boolean,
+      default: false,
+    },
     removeLabel: {
       type: String,
       default() {
@@ -107,6 +111,9 @@ export default {
     showAdd() {
       return this.addAllowed;
     },
+    disableAdd() {
+      return this.addDisabled;
+    },
     showRemove() {
       return this.removeAllowed;
     },
@@ -338,7 +345,7 @@ export default {
         <button
           type="button"
           class="btn role-tertiary add"
-          :disabled="loading"
+          :disabled="loading || disableAdd"
           data-testid="array-list-button"
           @click="add()"
         >