Update selected vGpus devices adding the provisioned devices

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com> (cherry picked from commit ca6ff46) # Conflicts: # pkg/harvester/config/labels-annotations.js # pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue # pkg/harvester/models/kubevirt.io.virtualmachine.js
harvester · Sep 25, 2024 · 0df2567 · 0df2567
1 parent 2dc297c
commit 0df2567
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 1 deletion.
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
@@ -1,4 +1,5 @@
 export const HCI = {
+<<<<<<< HEAD
   CLOUD_INIT:                   'harvesterhci.io/cloud-init-template',
   CURRENT_IP:                   'rke2.io/internal-ip',
   OWNED_BY:                     'harvesterhci.io/owned-by',
@@ -50,4 +51,60 @@ export const HCI = {
   NODE_NTP_SYNC_STATUS:         'node.harvesterhci.io/ntp-service',
   PARENT_SRIOV:                 'harvesterhci.io/parent-sriov-network-device',
   PARENT_SRIOV_GPU:             'harvesterhci.io/parentSRIOVGPUDevice',
+=======
+  CLOUD_INIT:                     'harvesterhci.io/cloud-init-template',
+  CURRENT_IP:                     'rke2.io/internal-ip',
+  IMAGE_ID:                       'harvesterhci.io/imageId',
+  SSH_NAMES:                      'harvesterhci.io/sshNames',
+  NETWORK_IPS:                    'network.harvesterhci.io/ips',
+  TEMPLATE_VERSION_CUSTOM_NAME:   'template-version.harvesterhci.io/customName',
+  CREATOR:                        'harvesterhci.io/creator',
+  OS:                             'harvesterhci.io/os',
+  NETWORK_TYPE:                   'network.harvesterhci.io/type',
+  VM_NAME:                        'harvesterhci.io/vmName',
+  VM_NAME_PREFIX:                 'harvesterhci.io/vmNamePrefix',
+  VM_RESERVED_MEMORY:             'harvesterhci.io/reservedMemory',
+  MAINTENANCE_STATUS:             'harvesterhci.io/maintain-status',
+  HOST_CUSTOM_NAME:               'harvesterhci.io/host-custom-name',
+  HOST_CONSOLE_URL:               'harvesterhci.io/host-console-url',
+  RESTORE_NAME:                   'restore.harvesterhci.io/name',
+  NODE_ROLE_MASTER:               'node-role.kubernetes.io/master',
+  NODE_ROLE_CONTROL_PLANE:        'node-role.kubernetes.io/control-plane',
+  NODE_ROLE_ETCD:                 'node-role.harvesterhci.io/witness',
+  PROMOTE_STATUS:                 'harvesterhci.io/promote-status',
+  MIGRATION_STATE:                'harvesterhci.io/migrationState',
+  VOLUME_CLAIM_TEMPLATE:          'harvesterhci.io/volumeClaimTemplates',
+  IMAGE_NAME:                     'harvesterhci.io/image-name',
+  INIT_IP:                        'etcd.rke2.cattle.io/node-address',
+  NODE_SCHEDULABLE:               'kubevirt.io/schedulable',
+  NETWORK_ROUTE:                  'network.harvesterhci.io/route',
+  MATCHED_NODES:                  'network.harvesterhci.io/matched-nodes',
+  OS_UPGRADE_IMAGE:               'harvesterhci.io/os-upgrade-image',
+  LATEST_UPGRADE:                 'harvesterhci.io/latestUpgrade',
+  UPGRADE_STATE:                  'harvesterhci.io/upgradeState',
+  REAY_MESSAGE:                   'harvesterhci.io/read-message',
+  DYNAMIC_SSHKEYS_NAMES:          'harvesterhci.io/dynamic-ssh-key-names',
+  DYNAMIC_SSHKEYS_USERS:          'harvesterhci.io/dynamic-ssh-key-users',
+  IMAGE_SUFFIX:                   'harvesterhci.io/image-type',
+  OS_TYPE:                        'harvesterhci.io/os-type',
+  STORAGE_PROVISIONER:            'harvesterhci.io/storageProvisioner',
+  HOST_REQUEST:                   'management.cattle.io/pod-requests',
+  STORAGE_CLASS:                  'harvesterhci.io/storageClassName',
+  STORAGE_NETWORK:                'storage-network.settings.harvesterhci.io',
+  ADDON_EXPERIMENTAL:             'addon.harvesterhci.io/experimental',
+  VOLUME_ERROR:                   'longhorn.io/volume-scheduling-error',
+  KVM_AMD_CPU:                    'cpu-feature.node.kubevirt.io/svm',
+  KVM_INTEL_CPU:                  'cpu-feature.node.kubevirt.io/vmx',
+  NODE_MANUFACTURER:              'manufacturer',
+  NODE_MODEL:                     'model',
+  NODE_SERIAL_NUMBER:             'serialNumber',
+  VM_INSUFFICIENT:                'harvesterhci.io/insufficient-resource-quota',
+  NODE_NTP_SYNC_STATUS:           'node.harvesterhci.io/ntp-service',
+  PARENT_SRIOV:                   'harvesterhci.io/parent-sriov-network-device',
+  PARENT_SRIOV_GPU:               'harvesterhci.io/parentSRIOVGPUDevice',
+  VM_MAINTENANCE_MODE_STRATEGY:   'harvesterhci.io/maintain-mode-strategy',
+  NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
+  CPU_MANAGER:                    'cpumanager',
+  VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
+>>>>>>> ca6ff4699 (Update selected vGpus devices adding the provisioned devices)
 };
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue
@@ -7,7 +7,12 @@ import Banner from '@components/Banner/Banner.vue';
 import VGpuDeviceList from './VGpuDeviceList';
 
 import remove from 'lodash/remove';
+<<<<<<< HEAD
 import { get, set } from '@shell/utils/object';
+=======
+import { set } from '@shell/utils/object';
+import { uniq } from '@shell/utils/array';
+>>>>>>> ca6ff4699 (Update selected vGpus devices adding the provisioned devices)
 
 export default {
   name:       'VirtualMachinedevices',
@@ -45,7 +50,10 @@ export default {
       this[key] = res[key];
     }
 
-    (this.value?.domain?.devices?.gpus || []).forEach(({ name }) => {
+    uniq([
+      ...(this.value?.domain?.devices?.gpus || []).map(({ name }) => name),
+      ...Object.values(this.vm?.provisionedVGpus).reduce((acc, gpus) => [...acc, ...gpus], [])
+    ]).forEach((name) => {
       if (this.enabledDevices.find(device => device?.metadata?.name === name)) {
         this.selectedDevices.push(name);
       }

diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@@ -1054,6 +1054,23 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
+<<<<<<< HEAD
+=======
+  get hostDevices() {
+    return this.spec?.template?.spec?.domain?.devices?.hostDevices || [];
+  }
+
+  get provisionedVGpus() {
+    try {
+      const deviceAllocationDetails = JSON.parse(this.metadata?.annotations[HCI_ANNOTATIONS.VM_DEVICE_ALLOCATION_DETAILS] || '{}');
+
+      return deviceAllocationDetails?.gpus || {};
+    } catch (error) {
+      return {};
+    }
+  }
+
+>>>>>>> ca6ff4699 (Update selected vGpus devices adding the provisioned devices)
   setInstanceLabels(val) {
     if ( !this.spec?.template?.metadata?.labels ) {
       set(this, 'spec.template.metadata.labels', {});