docs: update install instruction doc link (#753)

Signed-off-by: Andy Lee <andy.lee@suse.com>

.github/workflows/run-lint.yaml

@@ -1,7 +1,7 @@
 name: Tests
 
 on:
-  workflow_call:  # This tells GH that the workflow is reusable 
+  workflow_call:  # This tells GH that the workflow is reusable
   push:
     branches:
       - main

README.md

@@ -7,7 +7,7 @@ The Harvester UI Extension is a Rancher extension that provides the user interfa
 
 ## Installation
 
-For detailed installation instructions, please refer to the [official Harvester documentation](https://docs.harvesterhci.io/v1.5/rancher/harvester-ui-extension#installation-on-rancher-210).
+For Harvester UI extension installation instructions, please refer to the page **Rancher Integration** -> **Harvester UI Extension** in [official Harvester documentation](https://docs.harvesterhci.io).
 
 
 ## Development Setup

package.json

@@ -1,17 +1,22 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.8.0-dev",
+  "version": "1.8.0-rc2",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
   },
   "dependencies": {
     "@babel/plugin-transform-class-static-block": "7.28.6",
-    "@rancher/shell": "3.0.9-rc.1",
+    "@rancher/shell": "3.0.9-rc.6",
+    "@vue-flow/background": "^1.3.0",
+    "@vue-flow/controls": "^1.1.1",
+    "@vue-flow/core": "^1.33.5",
+    "@vue-flow/minimap": "^1.4.0",
     "cache-loader": "^4.1.0",
     "color": "4.2.3",
     "ip": "2.0.1",
     "node-polyfill-webpack-plugin": "^3.0.0",
+    "elkjs": "^0.11.0",
     "vue-draggable-next": "^2.2.1",
     "yaml": "^2.5.1"
   },
@@ -24,7 +29,7 @@
     "glob": "7.2.3",
     "glob-parent": "6.0.2",
     "json5": "2.2.3",
-    "@types/lodash": "4.17.23",
+    "@types/lodash": "4.17.24",
     "merge": "2.1.1",
     "node-forge": "1.3.3",
     "nth-check": "2.1.1",

pkg/harvester/README.md

@@ -7,8 +7,7 @@ The Harvester UI Extension is a Rancher extension that provides the user interfa
 
 ## Installation
 
-For detailed installation instructions, please refer to the [official Harvester documentation](https://docs.harvesterhci.io/v1.5/rancher/harvester-ui-extension#installation-on-rancher-210).
-
+For Harvester UI extension installation instructions, please refer to the page **Rancher Integration** -> **Harvester UI Extension** in [official Harvester documentation](https://docs.harvesterhci.io).
 
 ## Development Setup
 

pkg/harvester/components/settings/cluster-registration-url.vue

@@ -0,0 +1,123 @@
+<script>
+import MessageLink from '@shell/components/MessageLink';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { HCI_SETTING } from '../../config/settings';
+import { Checkbox } from '@components/Form/Checkbox';
+import { Banner } from '@components/Banner';
+
+export default {
+  name: 'HarvesterEditClusterRegistrationURL',
+
+  components: {
+    LabeledInput, MessageLink, Checkbox, Banner
+  },
+
+  mixins: [CreateEditView],
+
+  data() {
+    let parseDefaultValue = {};
+
+    try {
+      parseDefaultValue = JSON.parse(this.value.value);
+    } catch (error) {
+      parseDefaultValue.url = this.value.value;
+      parseDefaultValue.insecureSkipTLSVerify = true;
+    }
+
+    return {
+      parseDefaultValue,
+      errors: []
+    };
+  },
+
+  computed: {
+    toCA() {
+      return `${ HCI_SETTING.ADDITIONAL_CA }?mode=edit`;
+    },
+    clusterRegistrationTLSVerifyEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('clusterRegistrationTLSVerify');
+    },
+    registrationURL: {
+      get() {
+        return this.clusterRegistrationTLSVerifyEnabled ? this.parseDefaultValue.url : this.parseDefaultValue;
+      },
+
+      set(value) {
+        if (this.clusterRegistrationTLSVerifyEnabled) {
+          this.parseDefaultValue.url = value;
+        } else {
+          this.parseDefaultValue = value;
+        }
+      }
+    }
+  },
+
+  methods: {
+    getDefaultValue() {
+      if (this.clusterRegistrationTLSVerifyEnabled) {
+        return { url: '', insecureSkipTLSVerify: false };
+      } else {
+        return '';
+      }
+    },
+
+    updateUrl() {
+      this.update();
+    },
+
+    update() {
+      if (this.clusterRegistrationTLSVerifyEnabled) {
+        this.value['value'] = JSON.stringify(this.parseDefaultValue);
+      } else {
+        this.value['value'] = this.parseDefaultValue;
+      }
+    },
+
+    useDefault() {
+      this.parseDefaultValue = this.getDefaultValue();
+    },
+
+    updateInsecureSkipTLSVerify(newValue) {
+      const { url = '' } = this.parseDefaultValue;
+
+      this.parseDefaultValue = { url, insecureSkipTLSVerify: newValue };
+      this.update();
+    },
+  }
+};
+</script>
+
+<template>
+  <div
+    class="row"
+  >
+    <div class="col span-12">
+      <Banner color="info">
+        <MessageLink
+          :to="toCA"
+          target="_blank"
+          prefix-label="harvester.setting.clusterRegistrationUrl.tip.prefix"
+          middle-label="harvester.setting.clusterRegistrationUrl.tip.middle"
+          suffix-label="harvester.setting.clusterRegistrationUrl.tip.suffix"
+        />
+      </Banner>
+      <LabeledInput
+        v-model:value="registrationURL"
+        class="mb-20"
+        :mode="mode"
+        :label="t('harvester.setting.clusterRegistrationUrl.url')"
+        @update:value="updateUrl"
+      />
+      <div v-if="clusterRegistrationTLSVerifyEnabled">
+        <Checkbox
+          v-model:value="parseDefaultValue.insecureSkipTLSVerify"
+          class="check mb-5"
+          type="checkbox"
+          :label="t('harvester.setting.clusterRegistrationUrl.insecureSkipTLSVerify')"
+          @update:value="updateInsecureSkipTLSVerify"
+        />
+      </div>
+    </div>
+  </div>
+</template>

pkg/harvester/components/settings/instance-manager-resources.vue

@@ -0,0 +1,104 @@
+<script>
+import UnitInput from '@shell/components/form/UnitInput';
+import { Banner } from '@components/Banner';
+
+export default {
+  name: 'HarvesterInstanceManagerResources',
+
+  components: {
+    UnitInput,
+    Banner,
+  },
+
+  props: {
+    value: {
+      type:    Object,
+      default: () => ({
+        value:   '',
+        default: '{}'
+      })
+    },
+  },
+
+  data() {
+    const resources = this.parseJSON(this.value?.value) || this.parseJSON(this.value?.default) || {};
+
+    return {
+      resources,
+      parseError: null,
+    };
+  },
+
+  methods: {
+    parseJSON(string) {
+      try {
+        return JSON.parse(string);
+      } catch (e) {
+        this.parseError = this.t('harvester.setting.instanceManagerResources.parseError', { error: e.message });
+
+        return null;
+      }
+    },
+
+    update() {
+      if (!this.value) return;
+
+      const cpu = { ...this.resources?.cpu };
+
+      if (cpu.v1 !== null) cpu.v1 = String(cpu.v1);
+      if (cpu.v2 !== null) cpu.v2 = String(cpu.v2);
+
+      this.value.value = JSON.stringify({ ...this.resources, cpu });
+    },
+
+    useDefault() {
+      if (this.value?.default) {
+        this.resources = this.parseJSON(this.value.default) || {};
+        this.update();
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div>
+    <Banner
+      v-if="parseError"
+      color="error"
+    >
+      {{ parseError }}
+    </Banner>
+
+    <div class="row">
+      <div class="col span-12">
+        <UnitInput
+          v-model:value="resources.cpu.v1"
+          :label="t('harvester.setting.instanceManagerResources.v1')"
+          suffix="%"
+          :delay="0"
+          type="number"
+          min="0"
+          max="100"
+          required
+          :mode="mode"
+          class="mb-20"
+          @update:value="update"
+        />
+        <UnitInput
+          v-model:value="resources.cpu.v2"
+          :label="t('harvester.setting.instanceManagerResources.v2')"
+          suffix="%"
+          :delay="0"
+          type="number"
+          min="0"
+          max="100"
+          required
+          :mode="mode"
+          class="mb-20"
+          @update:value="update"
+        />
+      </div>
+    </div>
+  </div>
+</template>

pkg/harvester/components/settings/rwx-network.vue

@@ -0,0 +1,371 @@
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
+import { RadioGroup } from '@components/Form/Radio';
+import ArrayList from '@shell/components/form/ArrayList';
+import { isValidCIDR } from '@shell/utils/validators/cidr';
+import { _EDIT } from '@shell/config/query-params';
+import { Banner } from '@components/Banner';
+import { allHash } from '@shell/utils/promise';
+import { HCI } from '../../types';
+import { NETWORK_TYPE } from '../../config/types';
+
+const { L2VLAN, UNTAGGED } = NETWORK_TYPE;
+const SHARE_STORAGE_NETWORK = 'share-storage-network';
+const NETWORK = 'network';
+
+const DEFAULT_DEDICATED_NETWORK = {
+  vlan:           '',
+  clusterNetwork: '',
+  range:          '',
+  exclude:        [],
+};
+
+export default {
+  name: 'RwxNetworkSetting',
+
+  components: {
+    RadioGroup,
+    Banner,
+    ArrayList,
+    LabeledInput,
+    LabeledSelect,
+  },
+
+  props: {
+    registerBeforeHook: {
+      type:     Function,
+      required: true,
+    },
+
+    mode: {
+      type:    String,
+      default: _EDIT,
+    },
+
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    await allHash({
+      clusterNetworks: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER_NETWORK }),
+      vlanStatus:      this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VLAN_STATUS }),
+    });
+  },
+
+  data() {
+    let enabled = false; // enabled / disabled options
+    let shareStorageNetwork = false; // shareStorageNetwork / dedicatedRwxNetwork options
+    let dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
+    let networkType = L2VLAN;
+    let exclude = [];
+
+    try {
+      const parsedValue = JSON.parse(this.value.value || this.value.default || '{}');
+      const parsedNetwork = parsedValue?.[NETWORK] || parsedValue || {};
+
+      if (parsedValue && typeof parsedValue === 'object') {
+        shareStorageNetwork = !!parsedValue[SHARE_STORAGE_NETWORK];
+        networkType = 'vlan' in parsedNetwork ? L2VLAN : UNTAGGED;
+        dedicatedNetwork = {
+          vlan:           parsedNetwork.vlan || '',
+          clusterNetwork: parsedNetwork.clusterNetwork || '',
+          range:          parsedNetwork.range || '',
+        };
+        exclude = parsedNetwork?.exclude?.toString().split(',') || [];
+        enabled = shareStorageNetwork || !!(parsedNetwork.vlan || parsedNetwork.clusterNetwork || parsedNetwork.range);
+      }
+    } catch (error) {
+      enabled = false;
+      shareStorageNetwork = false;
+      dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
+    }
+
+    return {
+      enabled,
+      shareStorageNetwork,
+      dedicatedNetwork,
+      networkType,
+      exclude,
+      defaultAddValue: '',
+    };
+  },
+
+  created() {
+    if (this.registerBeforeHook) {
+      this.registerBeforeHook(this.willSave, 'willSave');
+    }
+  },
+
+  computed: {
+    showDedicatedNetworkConfig() {
+      return this.enabled && !this.shareStorageNetwork;
+    },
+
+    showVlan() {
+      return this.networkType === L2VLAN;
+    },
+
+    networkTypes() {
+      return [L2VLAN, UNTAGGED];
+    },
+
+    clusterNetworkOptions() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
+      const clusterNetworksOptions = this.networkType === UNTAGGED ? clusterNetworks.filter((network) => network.id !== 'mgmt') : clusterNetworks;
+
+      return clusterNetworksOptions.map((network) => {
+        const disabled = !network.isReadyForStorageNetwork;
+
+        return {
+          label: disabled ? `${ network.id } (${ this.t('generic.notReady') })` : network.id,
+          value: network.id,
+          disabled,
+        };
+      });
+    },
+  },
+
+  methods: {
+    onUpdateEnabled() {
+      if (!this.enabled) {
+        this.shareStorageNetwork = false;
+        this.dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
+      }
+
+      this.update();
+    },
+
+    onUpdateNetworkType() {
+      if (this.shareStorageNetwork) {
+        this.dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
+      }
+
+      this.update();
+    },
+
+    onUpdateDedicatedType(neu) {
+      this.dedicatedNetwork.clusterNetwork = '';
+
+      if (neu === L2VLAN) {
+        this.dedicatedNetwork.vlan = '';
+      } else {
+        delete this.dedicatedNetwork.vlan;
+      }
+
+      this.update();
+    },
+
+    inputVlan(neu) {
+      if (neu === '') {
+        this.dedicatedNetwork.vlan = '';
+        this.update();
+
+        return;
+      }
+
+      const newValue = Number(neu);
+
+      if (newValue > 4094) {
+        this.dedicatedNetwork.vlan = 4094;
+      } else if (newValue < 1) {
+        this.dedicatedNetwork.vlan = 1;
+      } else {
+        this.dedicatedNetwork.vlan = newValue;
+      }
+
+      this.update();
+    },
+
+    useDefault() {
+      this.enabled = false;
+      this.shareStorageNetwork = false;
+      this.dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
+      this.update();
+    },
+
+    update() {
+      const value = { [SHARE_STORAGE_NETWORK]: false };
+
+      if (this.enabled && this.shareStorageNetwork) {
+        value[SHARE_STORAGE_NETWORK] = true;
+      }
+
+      if (this.showDedicatedNetworkConfig) {
+        value[NETWORK] = {};
+
+        if (this.showVlan) {
+          value[NETWORK].vlan = this.dedicatedNetwork.vlan;
+        }
+
+        value[NETWORK].clusterNetwork = this.dedicatedNetwork.clusterNetwork;
+        value[NETWORK].range = this.dedicatedNetwork.range;
+
+        const excludeList = this.exclude.filter((ip) => ip);
+
+        if (Array.isArray(excludeList) && excludeList.length > 0) {
+          value[NETWORK].exclude = excludeList;
+        }
+      }
+
+      this.value.value = JSON.stringify(value);
+    },
+
+    willSave() {
+      this.update();
+
+      if (!this.showDedicatedNetworkConfig) {
+        return Promise.resolve();
+      }
+
+      const errors = [];
+
+      if (this.showVlan && !this.dedicatedNetwork.vlan) {
+        errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.vlan') }, true));
+      }
+
+      if (!this.dedicatedNetwork.clusterNetwork) {
+        errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.clusterNetwork') }, true));
+      }
+
+      if (!this.dedicatedNetwork.range) {
+        errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.range.label') }, true));
+      } else if (!isValidCIDR(this.dedicatedNetwork.range)) {
+        errors.push(this.t('harvester.setting.storageNetwork.range.invalid', null, true));
+      }
+
+      if (this.exclude) {
+        const hasInvalidCIDR = this.exclude.find((cidr) => {
+          return cidr && !isValidCIDR(cidr);
+        });
+
+        if (hasInvalidCIDR) {
+          errors.push(this.t('harvester.setting.storageNetwork.exclude.invalid', null, true));
+        }
+      }
+
+      if (errors.length > 0) {
+        return Promise.reject(errors);
+      }
+
+      return Promise.resolve();
+    },
+  },
+};
+</script>
+
+<template>
+  <div :class="mode">
+    <Banner color="warning">
+      <t
+        k="harvester.setting.rwxNetwork.warning"
+        :raw="true"
+      />
+    </Banner>
+    <RadioGroup
+      v-model:value="enabled"
+      class="mb-20"
+      name="rwx-network-enable"
+      :options="[true,false]"
+      :labels="[t('generic.enabled'), t('generic.disabled')]"
+      @update:value="onUpdateEnabled"
+    />
+
+    <RadioGroup
+      v-if="enabled"
+      v-model:value="shareStorageNetwork"
+      class="mb-20"
+      name="rwx-network-type"
+      :options="[true,false]"
+      :labels="[t('harvester.setting.rwxNetwork.shareStorageNetwork'), t('harvester.setting.rwxNetwork.dedicatedRwxNetwork')]"
+      @update:value="onUpdateNetworkType"
+    />
+    <Banner
+      v-if="shareStorageNetwork"
+      class="mb-20"
+      color="warning"
+    >
+      <t
+        k="harvester.setting.rwxNetwork.shareStorageNetworkWarning"
+        :raw="true"
+      />
+    </Banner>
+    <template v-if="showDedicatedNetworkConfig">
+      <LabeledSelect
+        v-model:value="networkType"
+        class="mb-20"
+        :options="networkTypes"
+        :mode="mode"
+        :label="t('harvester.fields.type')"
+        required
+        @update:value="onUpdateDedicatedType"
+      />
+
+      <LabeledInput
+        v-if="showVlan"
+        v-model:value.number="dedicatedNetwork.vlan"
+        type="number"
+        class="mb-20"
+        :mode="mode"
+        required
+        placeholder="e.g. 1 - 4094"
+        label-key="harvester.setting.storageNetwork.vlan"
+        @update:value="inputVlan"
+      />
+
+      <LabeledSelect
+        v-model:value="dedicatedNetwork.clusterNetwork"
+        label-key="harvester.setting.storageNetwork.clusterNetwork"
+        class="mb-20"
+        required
+        :options="clusterNetworkOptions"
+        @update:value="update"
+      />
+
+      <LabeledInput
+        v-model:value="dedicatedNetwork.range"
+        class="mb-5"
+        :mode="mode"
+        required
+        :placeholder="t('harvester.setting.storageNetwork.range.placeholder')"
+        label-key="harvester.setting.storageNetwork.range.label"
+        @update:value="update"
+      />
+
+      <ArrayList
+        v-model:value="exclude"
+        :show-header="true"
+        :default-add-value="defaultAddValue"
+        :mode="mode"
+        :add-label="t('harvester.setting.storageNetwork.exclude.addIp')"
+        class="mt-20"
+        @update:value="update"
+      >
+        <template #column-headers>
+          <div class="box mb-10">
+            <div class="key">
+              {{ t('harvester.setting.storageNetwork.exclude.label') }}
+            </div>
+          </div>
+        </template>
+        <template #columns="scope">
+          <div class="key">
+            <input
+              v-model="scope.row.value"
+              :placeholder="t('harvester.setting.storageNetwork.exclude.placeholder')"
+              @update:value="update"
+            />
+          </div>
+        </template>
+      </ArrayList>
+    </template>
+  </div>
+</template>

pkg/harvester/components/settings/vm-force-reset-policy.vue

@@ -69,6 +69,15 @@ export default {
         :mode="mode"
         label-key="harvester.setting.vmForceDeletionPolicy.period"
       />
+
+      <LabeledInput
+        v-if="parseDefaultValue.enable"
+        v-model:value.number="parseDefaultValue.vmMigrationTimeout"
+        class="mb-20"
+        type="number"
+        :mode="mode"
+        label-key="harvester.setting.vmForceDeletionPolicy.vmMigrationTimeout"
+      />
     </div>
   </div>
 </template>

pkg/harvester/config/feature-flags.js

@@ -60,6 +60,11 @@ const FEATURE_FLAGS = {
   'v1.7.1': [],
   'v1.8.0': [
     'hotplugCdRom',
+    'supportBundleFileNameSetting',
+    'clusterRegistrationTLSVerify',
+    'vGPUAsPCIDevice',
+    'instanceManagerResourcesSetting',
+    'rwxNetworkSetting',
   ],
 };
 

pkg/harvester/config/labels-annotations.js

@@ -28,6 +28,7 @@ export const HCI = {
   NODE_ROLE_CONTROL_PLANE:          'node-role.kubernetes.io/control-plane',
   NODE_ROLE_ETCD:                   'node-role.harvesterhci.io/witness',
   PROMOTE_STATUS:                   'harvesterhci.io/promote-status',
+  CLONE_BACKEND_STORAGE_STATUS:     'harvesterhci.io/clone-backend-storage-status',
   MIGRATION_STATE:                  'harvesterhci.io/migrationState',
   VOLUME_CLAIM_TEMPLATE:            'harvesterhci.io/volumeClaimTemplates',
   IMAGE_NAME:                       'harvesterhci.io/image-name',

pkg/harvester/config/settings.ts

@@ -16,9 +16,11 @@ export const HCI_SETTING = {
   DEFAULT_STORAGE_CLASS:                  'default-storage-class',
   SUPPORT_BUNDLE_TIMEOUT:                 'support-bundle-timeout',
   SUPPORT_BUNDLE_EXPIRATION:              'support-bundle-expiration',
+  SUPPORT_BUNDLE_FILE_NAME:               'support-bundle-file-name',
   SUPPORT_BUNDLE_IMAGE:                   'support-bundle-image',
   SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT: 'support-bundle-node-collection-timeout',
   STORAGE_NETWORK:                        'storage-network',
+  RWX_NETWORK:                            'rwx-network',
   VM_FORCE_RESET_POLICY:                  'vm-force-reset-policy',
   SSL_CERTIFICATES:                       'ssl-certificates',
   SSL_PARAMETERS:                         'ssl-parameters',
@@ -38,7 +40,8 @@ export const HCI_SETTING = {
   VM_MIGRATION_NETWORK:                   'vm-migration-network',
   RANCHER_CLUSTER:                        'rancher-cluster',
   MAX_HOTPLUG_RATIO:                      'max-hotplug-ratio',
-  KUBEVIRT_MIGRATION:                     'kubevirt-migration'
+  KUBEVIRT_MIGRATION:                     'kubevirt-migration',
+  INSTANCE_MANAGER_RESOURCES:             'instance-manager-resources'
 };
 
 export const HCI_ALLOWED_SETTINGS = {
@@ -71,11 +74,17 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.OVERCOMMIT_CONFIG]:                      { kind: 'json', from: 'import' },
   [HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]:                 { kind: 'number' },
   [HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]:              { kind: 'number' },
+  [HCI_SETTING.SUPPORT_BUNDLE_FILE_NAME]:               {
+    kind: 'string', canReset: true, featureFlag: 'supportBundleFileNameSetting'
+  },
   [HCI_SETTING.SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT]: { kind: 'number', featureFlag: 'supportBundleNodeCollectionTimeoutSetting' },
   [HCI_SETTING.SUPPORT_BUNDLE_IMAGE]:                   { kind: 'json', from: 'import' },
   [HCI_SETTING.STORAGE_NETWORK]:                        {
     kind: 'custom', from: 'import', canReset: true
   },
+  [HCI_SETTING.RWX_NETWORK]:                            {
+    kind: 'json', from: 'import', canReset: true, featureFlag: 'rwxNetworkSetting'
+  },
   [HCI_SETTING.VM_FORCE_RESET_POLICY]:                  { kind: 'json', from: 'import' },
   [HCI_SETTING.SSL_CERTIFICATES]:                       { kind: 'json', from: 'import' },
   [HCI_SETTING.SSL_PARAMETERS]:                         {
@@ -118,12 +127,16 @@ export const HCI_ALLOWED_SETTINGS = {
   },
   [HCI_SETTING.KUBEVIRT_MIGRATION]: {
     kind: 'json', from: 'import', canReset: true, featureFlag: 'kubevirtMigration',
+  },
+  [HCI_SETTING.INSTANCE_MANAGER_RESOURCES]: {
+    kind: 'json', from: 'import', featureFlag: 'instanceManagerResourcesSetting'
   }
 };
 
 export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
   [HCI_SETTING.CLUSTER_REGISTRATION_URL]: {
-    kind:     'url',
+    kind:     'custom',
+    from:     'import',
     canReset: true,
   },
   [HCI_SETTING.UI_PL]: {

pkg/harvester/dialog/HarvesterStorageMigrationDialog.vue

@@ -0,0 +1,239 @@
+<script>
+import { mapGetters } from 'vuex';
+
+import { PVC } from '@shell/config/types';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { sortBy } from '@shell/utils/sort';
+import { HCI } from '../types';
+import { parseVolumeClaimTemplates } from '@pkg/harvester/utils/vm';
+
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import AsyncButton from '@shell/components/AsyncButton';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+
+export default {
+  name: 'HarvesterStorageMigrationDialog',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton, Banner, Card, LabeledSelect
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  async fetch() {
+    this.allPVCs = await this.$store.dispatch('harvester/findAll', { type: PVC });
+  },
+
+  data() {
+    return {
+      sourceVolume: '',
+      targetVolume: '',
+      errors:       [],
+      allPVCs:      [],
+    };
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources[0];
+    },
+
+    sourceVolumeOptions() {
+      const volumes = this.actionResource.spec?.template?.spec?.volumes || [];
+
+      return sortBy(
+        volumes
+          .map((v) => v.persistentVolumeClaim?.claimName)
+          .filter((name) => !!name)
+          .map((name) => ({
+            label: name,
+            value: name
+          })),
+        'label'
+      );
+    },
+
+    namespacePVCs() {
+      return this.allPVCs.filter((pvc) => pvc.metadata.namespace === this.actionResource.metadata.namespace);
+    },
+
+    vmUsedVolumeNames() {
+      const allVMs = this.$store.getters['harvester/all'](HCI.VM) || [];
+      const names = new Set();
+
+      allVMs.forEach((vm) => {
+        // Collect volume names from spec.template.spec.volumes (both PVC and DataVolume references)
+        const volumes = vm.spec?.template?.spec?.volumes || [];
+
+        volumes.forEach((v) => {
+          const name = v.persistentVolumeClaim?.claimName || v.dataVolume?.name;
+
+          if (name) {
+            names.add(`${ vm.metadata.namespace }/${ name }`);
+          }
+        });
+
+        // Collect volume names from volumeClaimTemplates annotation
+        const templates = parseVolumeClaimTemplates(vm);
+
+        templates.forEach((t) => {
+          if (t.metadata?.name) {
+            names.add(`${ vm.metadata.namespace }/${ t.metadata.name }`);
+          }
+        });
+      });
+
+      return names;
+    },
+
+    targetVolumeOptions() {
+      return sortBy(
+        this.namespacePVCs
+          .filter((pvc) => {
+            // Exclude volumes used by any VM (via spec.volumes or volumeClaimTemplates)
+            if (this.vmUsedVolumeNames.has(`${ pvc.metadata.namespace }/${ pvc.metadata.name }`)) {
+              return false;
+            }
+
+            return true;
+          })
+          .map((pvc) => ({
+            label: pvc.metadata.name,
+            value: pvc.metadata.name
+          })),
+        'label'
+      );
+    },
+
+    disableSave() {
+      return !this.sourceVolume || !this.targetVolume;
+    },
+  },
+
+  methods: {
+    close() {
+      this.sourceVolume = '';
+      this.targetVolume = '';
+      this.errors = [];
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      if (!this.actionResource) {
+        buttonDone(false);
+
+        return;
+      }
+
+      if (!this.sourceVolume) {
+        const name = this.t('harvester.modal.storageMigration.fields.sourceVolume.label');
+
+        this['errors'] = [this.t('validation.required', { key: name })];
+        buttonDone(false);
+
+        return;
+      }
+
+      if (!this.targetVolume) {
+        const name = this.t('harvester.modal.storageMigration.fields.targetVolume.label');
+
+        this['errors'] = [this.t('validation.required', { key: name })];
+        buttonDone(false);
+
+        return;
+      }
+
+      try {
+        await this.actionResource.doAction('storageMigration', {
+          sourceVolume: this.sourceVolume,
+          targetVolume: this.targetVolume
+        }, {}, false);
+
+        buttonDone(true);
+        this.close();
+      } catch (err) {
+        const error = err?.data || err;
+
+        this['errors'] = exceptionToErrorsArray(error);
+        buttonDone(false);
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <template #title>
+      {{ t('harvester.modal.storageMigration.title') }}
+    </template>
+
+    <template #body>
+      <LabeledSelect
+        v-model:value="sourceVolume"
+        :label="t('harvester.modal.storageMigration.fields.sourceVolume.label')"
+        :placeholder="t('harvester.modal.storageMigration.fields.sourceVolume.placeholder')"
+        :options="sourceVolumeOptions"
+        class="mb-20"
+        required
+      />
+
+      <LabeledSelect
+        v-model:value="targetVolume"
+        :label="t('harvester.modal.storageMigration.fields.targetVolume.label')"
+        :placeholder="t('harvester.modal.storageMigration.fields.targetVolume.placeholder')"
+        :options="targetVolumeOptions"
+        required
+      />
+
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :label="err"
+      />
+    </template>
+
+    <template
+      #actions
+      class="actions"
+    >
+      <div class="buttons">
+        <button
+          class="btn role-secondary mr-10"
+          @click="close"
+        >
+          {{ t('generic.cancel') }}
+        </button>
+
+        <AsyncButton
+          mode="apply"
+          :disabled="disableSave"
+          @click="apply"
+        />
+      </div>
+    </template>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue

@@ -31,6 +31,7 @@ export default {
     const _hash = {
       pciclaims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.PCI_CLAIM }),
       sriovs:    this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOV }),
+      srigpuovs:    this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOVGPU_DEVICE }),
     };
 
     await allHash(_hash);
@@ -106,19 +107,32 @@ export default {
   },
 
   computed: {
-    parentSriovOptions() {
+    allSriovs() {
       const inStore = this.$store.getters['currentProduct'].inStore;
-      const allSriovs = this.$store.getters[`${ inStore }/all`](HCI.SR_IOV) || [];
 
-      return allSriovs.map((sriov) => {
-        return sriov.id;
-      });
+      return this.$store.getters[`${ inStore }/all`](HCI.SR_IOV) || [];
+    },
+    allSriovGPUs() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return this.$store.getters[`${ inStore }/all`](HCI.SR_IOVGPU_DEVICE) || [];
+    },
+    parentSriovOptions() {
+      return this.allSriovs.map((sriov) => sriov.id);
+    },
+    parentSriovGPUOptions() {
+      return this.allSriovGPUs.map((sriovgpu) => sriovgpu.id);
     },
     parentSriovLabel() {
       return HCI_ANNOTATIONS.PARENT_SRIOV;
-    }
+    },
+    parentSriovGPULabel() {
+      return HCI_ANNOTATIONS.PARENT_SRIOV_GPU;
+    },
+    vGPUAsPCIDeviceEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+    },
   },
-
   methods: {
     enableGroup(rows = []) {
       const row = rows[0];
@@ -206,6 +220,15 @@ export default {
         :rows="rows"
         @change-rows="changeRows"
       />
+      <FilterBySriov
+        v-if="vGPUAsPCIDeviceEnabled"
+        ref="filterByParentSRIOVGPU"
+        :parent-sriov-options="parentSriovGPUOptions"
+        :parent-sriov-label="parentSriovGPULabel"
+        :label="t('harvester.sriov.parentSriovGPU')"
+        :rows="rows"
+        @change-rows="changeRows"
+      />
     </template>
   </ResourceTable>
 </template>

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue

@@ -8,6 +8,7 @@ import { set } from '@shell/utils/object';
 import { HCI } from '../../../types';
 import DeviceList from './DeviceList';
 import CompatibilityMatrix from '../CompatibilityMatrix';
+import MessageLink from '@shell/components/MessageLink';
 
 export default {
   name:       'VirtualMachinePCIDevices',
@@ -15,7 +16,8 @@ export default {
     LabeledSelect,
     DeviceList,
     CompatibilityMatrix,
-    Banner
+    Banner,
+    MessageLink
   },
   props: {
     mode: {
@@ -138,6 +140,13 @@ export default {
       return inUse;
     },
 
+    toVGpuDevicesPage() {
+      return {
+        name:   'harvester-c-cluster-resource',
+        params: { cluster: this.$store.getters['clusterId'], resource: HCI.VGPU_DEVICE },
+      };
+    },
+
     devicesByNode() {
       return this.enabledDevices?.reduce((acc, device) => {
         const nodeName = device.status?.nodeName;
@@ -232,7 +241,12 @@ export default {
       <div class="row">
         <div class="col span-12">
           <Banner color="info">
-            <t k="harvester.pci.howToUseDevice" />
+            <MessageLink
+              :to="toVGpuDevicesPage"
+              prefix-label="harvester.pci.howToUseDevice.prefix"
+              middle-label="harvester.pci.howToUseDevice.middle"
+              suffix-label="harvester.pci.howToUseDevice.suffix"
+            />
           </Banner>
           <Banner
             v-if="selectedDevices.length > 0"

pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue

@@ -211,6 +211,10 @@ export default {
 
       return false;
     },
+
+    vGPUAsPCIDeviceEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+    },
     usbPassthroughEnabled() {
       return this.$store.getters['harvester-common/getFeatureEnabled']('usbPassthrough');
     },
@@ -740,7 +744,7 @@ export default {
       </Tab>
 
       <Tab
-        v-if="enabledSriovgpu"
+        v-if="enabledSriovgpu && !vGPUAsPCIDeviceEnabled"
         :label="t('harvester.tab.vGpuDevices')"
         name="vGpuDevices"
         :weight="-6"

pkg/harvester/index.ts

@@ -7,6 +7,7 @@ import harvesterStore from './store/harvester-store';
 import customValidators from './validators';
 import { PRODUCT_NAME } from './config/harvester';
 import { defineAsyncComponent } from 'vue';
+import './styles/vue-flow.scss';
 
 // Init the package
 export default function (plugin: IPlugin) {

pkg/harvester/l10n/en-us.yaml

@@ -123,6 +123,15 @@ harvester:
       namespace: Namespace
       message:
         success: 'Image { name } created successfully.'
+    storageMigration:
+      title: Storage Migration
+      fields:
+        sourceVolume:
+          label: Source Volume
+          placeholder: Select a source volume
+        targetVolume:
+          label: Target Volume
+          placeholder: Select a target volume
     migration:
       failedMessage: Latest migration failed!
       title: Migration
@@ -195,7 +204,6 @@ harvester:
       title: Restart Virtual Machine
       tip: Restart the virtual machine for configuration changes to take effect.
       cancel: Save
-
   notification:
     title:
       succeed: Succeed
@@ -233,6 +241,8 @@ harvester:
     migrate: Migrate
     cpuAndMemoryHotplug: Edit CPU and Memory
     abortMigration: Abort Migration
+    storageMigration: Storage Migration
+    cancelStorageMigration: Cancel Storage Migration
     createTemplate: Generate Template
     enableMaintenance: Enable Maintenance Mode
     disableMaintenance: Disable Maintenance Mode
@@ -356,7 +366,10 @@ harvester:
     available: Available Devices
     compatibleNodes: Compatible Nodes
     impossibleSelection: 'There are no hosts with all of the selected devices.'
-    howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine.'
+    howToUseDevice: 
+      prefix: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine.<br>For vGPU devices, please enable them on the'
+      middle: vGPU Devices 
+      suffix: page first.
     deviceInTheSameHost: 'You can only select devices on the same host.'
     oldFormatDevices:
       help: |-
@@ -426,7 +439,7 @@ harvester:
       volume:
         upperType: Volume name
         lowerType: volume name
-        needImageOrExisting: 'At least an image volume or an existing root-disk volume is required!'
+        needAtLeastOneBootable: 'At least one bootable volume is required!'
     image:
       ruleTip: 'The URL you have entered ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
       ruleFileTip: 'The file you have chosen ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
@@ -1147,6 +1160,25 @@ harvester:
       banner: The supported field in ACL match can refer to <a href="https://kubeovn.github.io/docs/v1.14.x/en/guide/subnet/#subnet-acl" target="_blank">KubeOvn Subnet ACL document</a>
 
   vpc:
+    viewTopology: Topology
+    topology:
+      loading: Loading topology...
+      empty: No resources found
+      visibility:
+        vpc: VPC
+        subnets: Subnets
+        overlayNetworks: Overlay Networks
+        vms: VMs
+      labels:
+        cidr: CIDR
+        provider: Provider
+        type: Type
+        clusterNetwork: Cluster Network
+        network: Network
+        subnet: Subnet
+        ip: IP
+        mac: MAC
+        peering: Peering
     noAddonEnabled:
       prefix: The kubeovn-operator add-on is not enabled, click
       middle: here
@@ -1248,8 +1280,14 @@ harvester:
         addIp: Add Exclude IP
       warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
       tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 2 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
+    rwxNetwork:
+      warning: 'WARNING: <br/> Any change to rwx-network requires longhorn RWX volumes detached before applying this setting.<br/>Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
+      shareStorageNetwork: Share Storage Network
+      dedicatedRwxNetwork: Dedicated RWX Network
+      shareStorageNetworkWarning: The rwx-network is governed by storage-network, and changes here won't take effect until share-storage-network is set to false.
     vmForceDeletionPolicy:
       period: Period
+      vmMigrationTimeout: VM Migration Timeout
     vmMigrationNetwork:
       parseError: "Failed to parse existing configuration."
       fetchError: "Failed to load required network resources: {error}. Please refresh the page or try again later."
@@ -1332,10 +1370,20 @@ harvester:
         retention: How long to retain metrics
         retentionSize: Maximum size of metrics
     clusterRegistrationUrl:
+      url: URL
+      insecureSkipTLSVerify: Insecure Skip TLS Verify
+      tip:
+        prefix: Harvester secures cluster registration via TLS by default. If opt out "Insecure Skip TLS Verify", you must provide custom CA certificates using the
+        middle: 'additional-ca'
+        suffix: setting.
       message: To completely unset the imported Harvester cluster, please also remove it on the Rancher Dashboard UI via the <code> Virtualization Management </code> page.
     ntpServers:
       isNotIPV4: The address you entered is not IPv4 or host. Please enter a valid IPv4 address or a host address.
       isDuplicate: There are duplicate NTP server configurations.
+    instanceManagerResources:
+      parseError: "Failed to parse configuration: {error}"
+      v1: "V1 Data Engine"
+      v2: "V2 Data Engine"
     kubevirtMigration:
       parseError: "Failed to parse configuration: {error}"
       parallelMigrationsPerCluster: "Parallel Migrations Per Cluster"
@@ -1807,7 +1855,8 @@ harvester:
     numVFs: Number Of Virtual Functions
     vfAddresses: Virtual Functions Addresses
     showMore: Show More
-    parentSriov: Filter By Parent SR-IOV
+    parentSriov: Filter By Parent SR-IOV Netork Device
+    parentSriovGPU: Filter By Parent SR-IOV GPU Device
 
   sriovgpu:
     label: SR-IOV GPU Devices
@@ -1948,11 +1997,13 @@ advancedSettings:
     'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
     'harv-overcommit-config': 'Resource overcommit configuration.'
     'harv-support-bundle-timeout': 'Support bundle timeout configuration in minutes, use 0 to disable the timeout.'
+    'harv-support-bundle-file-name': 'Support bundle file name configuration.'
     'harv-support-bundle-expiration': 'Support bundle expiration configuration in minutes.'
     'harv-support-bundle-node-collection-timeout': 'Support bundle node collection timeout configuration in minutes.'
     'harv-vm-force-reset-policy': Configuration for the force-reset action when a virtual machine is stuck on a node that is down.
     'harv-ssl-parameters': Custom SSL Parameters for TLS validation.
     'harv-storage-network': 'Longhorn storage-network setting.'
+    'harv-rwx-network': 'Configure RWX network behavior for shared or dedicated storage network usage.'
     'harv-support-bundle-namespaces': Select additional namespaces to include in the support bundle.
     'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that Harvester will automatically add as virtual machine storage.
     'harv-support-bundle-image': Support bundle image configuration. Find different versions in <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a>.
@@ -1968,6 +2019,7 @@ advancedSettings:
     'harv-rancher-cluster': 'Configure Rancher cluster integration settings for guest cluster management.'
     'harv-max-hotplug-ratio': 'The ratio for kubevirt to limit the maximum CPU and memory that can be hotplugged to a VM. The value could be an integer between 1 and 20, default to 4.'
     'harv-kubevirt-migration': 'Configure cluster-wide KubeVirt live migration parameters.'
+    'harv-instance-manager-resources': 'Configure resource percentage reservations for Longhorn instance manager V1 and V2. Valid instance manager CPU range between 0 - 40.'
 
 typeLabel:
   kubevirt.io.virtualmachine: |-
@@ -2149,3 +2201,23 @@ typeLabel:
       one { IP Pool }
       other { IP Pools }
     }
+  migration.harvesterhci.io.openstacksource: |-
+    {count, plural,
+      one { OpenStack Source }
+      other { OpenStack Sources }
+    }
+  migration.harvesterhci.io.vmwaresource: |-
+    {count, plural,
+      one { VMware Source }
+      other { VMware Sources }
+    }
+  migration.harvesterhci.io.ovasource: |-
+    {count, plural,
+      one { OVA Source }
+      other { OVA Sources }
+    }
+  migration.harvesterhci.io.virtualmachineimport: |-
+    {count, plural,
+      one { Virtual Machine Import }
+      other { Virtual Machine Imports }
+    }

pkg/harvester/list/kubeovn.io.vpc.vue

@@ -155,6 +155,15 @@ export default {
       return location;
     },
 
+    viewTopology(group) {
+      const vpc = group.key;
+      const resource = this.$store.getters[`harvester/byId`](HCI.VPC, vpc);
+
+      if (resource && resource.goToDetail) {
+        resource.goToDetail();
+      }
+    },
+
     showVpcAction(event, group) {
       const vpc = group.key;
 
@@ -218,6 +227,14 @@ export default {
             >
               {{ t('harvester.vpc.createSubnet') }}
             </router-link>
+            <button
+              type="button"
+              class="btn btn-sm role-secondary mr-5"
+              @click="viewTopology(group)"
+            >
+              <i class="icon icon-globe mr-5" />
+              {{ t('harvester.vpc.viewTopology') }}
+            </button>
             <button
               type="button"
               class="btn btn-sm role-multi-action actions mr-10"

pkg/harvester/mixins/harvester-vm/index.js

@@ -707,18 +707,22 @@ export default {
       }
     },
 
-    needVolume(R) {
-      if (R.image === EMPTY_IMAGE) {
-        return false;
+    needVolumeRelatedInfo(R) {
+      // return [needVolume, needVolumeClaimTemplate]
+      if (R.source === SOURCE_TYPE.CONTAINER) {
+        return [true, false];
       }
 
-      return true;
+      if (R.source === SOURCE_TYPE.IMAGE && R.image === EMPTY_IMAGE) {
+        return [false, false];
+      }
+
+      return [true, true];
     },
 
     parseDiskRows(disk) {
       const disks = [];
       const volumes = [];
-      const diskNameLabels = [];
       const volumeClaimTemplates = [];
 
       disk.forEach( (R, index) => {
@@ -726,14 +730,18 @@ export default {
 
         disks.push(_disk);
 
-        if (this.needVolume(R)) {
-          const prefixName = this.value.metadata?.name || '';
-          const dataVolumeName = this.parseDataVolumeName(R, prefixName);
+        const prefixName = this.value.metadata?.name || '';
+        const dataVolumeName = this.parseDataVolumeName(R, prefixName);
+        const [needVolume, needVolumeClaimTemplate] = this.needVolumeRelatedInfo(R);
+
+        if (needVolume) {
           const _volume = this.parseVolume(R, dataVolumeName);
-          const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
 
           volumes.push(_volume);
-          diskNameLabels.push(dataVolumeName);
+        }
+        if (needVolumeClaimTemplate) {
+          const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
+
           volumeClaimTemplates.push(_dataVolumeTemplate);
         }
       });

pkg/harvester/models/devices.harvesterhci.io.pcidevice.js

@@ -1,6 +1,7 @@
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { escapeHtml } from '@shell/utils/string';
 import { HCI } from '../types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 
 const STATUS_DISPLAY = {
   enabled: {
@@ -32,7 +33,7 @@ export default class PCIDevice extends SteveModel {
     out.push(
       {
         action:     'enablePassthroughBulk',
-        enabled:    !this.isEnabling,
+        enabled:    !this.isEnabling && !this.isvGPUDevice,
         icon:       'icon icon-fw icon-dot',
         label:      'Enable Passthrough',
         bulkable:   true,
@@ -41,7 +42,7 @@ export default class PCIDevice extends SteveModel {
       },
       {
         action:   'disablePassthrough',
-        enabled:  this.isEnabling && this.claimedByMe,
+        enabled:  this.isEnabling && this.claimedByMe && !this.isvGPUDevice,
         icon:     'icon icon-fw icon-dot-open',
         label:    'Disable Passthrough',
         bulkable: true,
@@ -52,6 +53,14 @@ export default class PCIDevice extends SteveModel {
     return out;
   }
 
+  get isvGPUDevice() {
+    if (!this.vGPUAsPCIDeviceFeatureEnabled) {
+      return false;
+    }
+
+    return !!this.metadata?.labels?.[HCI_ANNOTATIONS.PARENT_SRIOV_GPU];
+  }
+
   get canYaml() {
     return false;
   }
@@ -176,6 +185,10 @@ export default class PCIDevice extends SteveModel {
     return this.status?.description;
   }
 
+  get vGPUAsPCIDeviceFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+  }
+
   showDetachWarning() {
     this.$dispatch('growl/warning', {
       title:   this.$rootGetters['i18n/t']('harvester.pci.detachWarning.title'),

pkg/harvester/models/harvesterhci.io.setting.js

@@ -52,11 +52,19 @@ export default class HciSetting extends HarvesterResource {
     });
   }
 
+  get clusterRegistrationTLSVerifyFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('clusterRegistrationTLSVerify');
+  }
+
   get customValue() {
     if (this.metadata.name === HCI_SETTING.STORAGE_NETWORK) {
       try {
         return JSON.stringify(JSON.parse(this.value), null, 2);
       } catch (e) {}
+    } else if (this.metadata.name === HCI_SETTING.CLUSTER_REGISTRATION_URL) {
+      try {
+        return this.clusterRegistrationTLSVerifyFeatureEnabled ? JSON.stringify(JSON.parse(this.value), null, 2) : this.value;
+      } catch (e) {}
     }
 
     return false;

pkg/harvester/models/kubevirt.io.virtualmachine.js

@@ -199,6 +199,18 @@ export default class VirtVm extends HarvesterResource {
         icon:    'icon icon-close',
         label:   this.t('harvester.action.abortMigration')
       },
+      {
+        action:  'storageMigration',
+        enabled: !!this.actions?.storageMigration,
+        icon:    'icon icon-copy',
+        label:   this.t('harvester.action.storageMigration')
+      },
+      {
+        action:  'cancelStorageMigration',
+        enabled: !!this.actions?.cancelStorageMigration,
+        icon:    'icon icon-close',
+        label:   this.t('harvester.action.cancelStorageMigration')
+      },
       {
         action:  'addHotplugVolume',
         enabled: !!this.actions?.addVolume,
@@ -368,6 +380,13 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
+  storageMigration(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      component: 'HarvesterStorageMigrationDialog'
+    });
+  }
+
   backupVM(resources = this) {
     this.$dispatch('promptModal', {
       resources,
@@ -520,6 +539,10 @@ export default class VirtVm extends HarvesterResource {
     this.doActionGrowl('abortMigration', {});
   }
 
+  cancelStorageMigration() {
+    this.doActionGrowl('cancelStorageMigration', {});
+  }
+
   createTemplate(resources = this) {
     this.$dispatch('promptModal', {
       resources,
@@ -770,11 +793,11 @@ export default class VirtVm extends HarvesterResource {
   }
 
   get isPending() {
-    if (this &&
+    if ((this &&
       !this.isVMExpectedRunning &&
       this.isVMCreated &&
       this.vmi?.status?.phase === VMIPhase.Pending
-    ) {
+    ) || (this.metadata?.annotations?.[HCI_ANNOTATIONS.CLONE_BACKEND_STORAGE_STATUS] === 'cloning')) {
       return { status: VMIPhase.Pending };
     }
 

pkg/harvester/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.8.0-dev",
+  "version": "1.8.0-rc2",
   "private": false,
   "rancher": {
     "annotations": {

pkg/harvester/store/harvester-store/actions.ts

@@ -98,6 +98,11 @@ export default {
     if (getters['schemaFor'](HCI.UPGRADE)) {
       hash.upgrades = dispatch('findAll', { type: HCI.UPGRADE });
     }
+    // Pre-fetch all HCI.UPGRADE_LOG data within loadCluster to ensure HarvesterUpgradeHeader has the necessary data. This is required because the header is dynamically loaded before the user enters the cluster in Rancher integration mode.
+    // See more details in https://github.com/harvester/harvester-ui-extension/pull/715
+    if (getters['schemaFor'](HCI.UPGRADE_LOG)) {
+      hash.upgradeLogs = dispatch('findAll', { type: HCI.UPGRADE_LOG });
+    }
 
     const res: any = await allHash(hash);
 

pkg/harvester/styles/vue-flow.scss

@@ -0,0 +1,4 @@
+@import '@vue-flow/core/dist/style.css';
+@import '@vue-flow/core/dist/theme-default.css';
+@import '@vue-flow/controls/dist/style.css';
+@import '@vue-flow/minimap/dist/style.css';

pkg/harvester/types.ts

@@ -18,6 +18,7 @@ export const HCI = {
   CLUSTER_NETWORK:     'network.harvesterhci.io.clusternetwork',
   SUBNET:              'kubeovn.io.subnet',
   VPC:                 'kubeovn.io.vpc',
+  IP:                  'kubeovn.io.ip',
   VM_IMAGE_DOWNLOADER: 'harvesterhci.io.virtualmachineimagedownloader',
   SUPPORT_BUNDLE:      'harvesterhci.io.supportbundle',
   NETWORK_ATTACHMENT:  'harvesterhci.io.networkattachmentdefinition',

pkg/harvester/validators/vm.js

@@ -69,7 +69,7 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
     validName(getters, errors, D.name, diskNames, prefix, type, lowerType, upperType);
   });
 
-  let requiredVolume = false;
+  let hasBootableVolume = false;
 
   _volumes.forEach((V, idx) => {
     const { type, typeValue } = getVolumeType(getters, V, _volumeClaimTemplates, value);
@@ -77,7 +77,7 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
     const prefix = V.name || idx + 1;
 
     if ([SOURCE_TYPE.IMAGE, SOURCE_TYPE.ATTACH_VOLUME, SOURCE_TYPE.CONTAINER].includes(type)) {
-      requiredVolume = true;
+      hasBootableVolume = true;
     }
 
     if (type === SOURCE_TYPE.NEW || type === SOURCE_TYPE.IMAGE) {
@@ -137,10 +137,10 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
   });
 
   /**
-   *  At least one volume must be create.  (Verify only when create.)
+   *  At least one bootable volume must be provided.  (Verify only when create.)
    */
-  if ((!requiredVolume || _volumes.length === 0) && !value.links) {
-    errors.push(getters['i18n/t']('harvester.validation.vm.volume.needImageOrExisting'));
+  if (!hasBootableVolume && !value.links) {
+    errors.push(getters['i18n/t']('harvester.validation.vm.volume.needAtLeastOneBootable'));
   }
 
   return errors;

yarn.lock

@@ -2633,15 +2633,15 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
-"@rancher/icons@2.0.54":
-  version "2.0.54"
-  resolved "https://registry.yarnpkg.com/@rancher/icons/-/icons-2.0.54.tgz#7e8d4baeac36a483f18f4ce4043809371c4f0117"
-  integrity sha512-Fc5xpT/yuOJJin7ChxAdB6aoG1bREgisktnePUPXpY9nIMHSHYT/Ov8GsC3yLLgoqgpm450nMvPICUO3AYcPdQ==
+"@rancher/icons@2.0.55":
+  version "2.0.55"
+  resolved "https://registry.yarnpkg.com/@rancher/icons/-/icons-2.0.55.tgz#394159bddbf786c17a12bc38e59b88346b30dcf4"
+  integrity sha512-hPcmsvfYNO36dJ7/lb3JbJC5BOnHbwBylic7HRqhSCSIcFlFaKnRt9aB/hvv3ip0Wo6J5yVEv2o7oXGErXkWFw==
 
-"@rancher/shell@3.0.9-rc.1":
-  version "3.0.9-rc.1"
-  resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.9-rc.1.tgz#6dfe7d8a17663d170ddf5f48bec5c7c525c9da86"
-  integrity sha512-X7HKIhprzzLaeZXLhAnWHDjr9Rk1nLko+pno0rEkcK7F9ENQgVuROzVxEgMlFno4bI7RpHXt5tC90rPkXzcsRQ==
+"@rancher/shell@3.0.9-rc.6":
+  version "3.0.9-rc.6"
+  resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.9-rc.6.tgz#d22add189481368a07df54c61d437f024236f639"
+  integrity sha512-qhTq7Ohsm/pToKRh010KVWLS4gH9g5BP55Ih0T62ZfTMIpO5JjiJkL/EtrRwlll47NKU1GHZ+lqh9yb3HJgDBg==
   dependencies:
     "@aws-sdk/client-ec2" "3.863.0"
     "@aws-sdk/client-eks" "3.879.0"
@@ -2653,7 +2653,7 @@
     "@babel/preset-typescript" "7.16.7"
     "@novnc/novnc" "1.2.0"
     "@popperjs/core" "2.11.8"
-    "@rancher/icons" "2.0.54"
+    "@rancher/icons" "2.0.55"
     "@smithy/fetch-http-handler" "5.1.1"
     "@types/is-url" "1.2.30"
     "@types/node" "20.10.8"
@@ -2682,7 +2682,7 @@
     cookie-universal "2.2.2"
     core-js "3.45.0"
     cron-validator "1.4.0"
-    cronstrue "2.53.0"
+    cronstrue "3.9.0"
     cross-env "7.0.3"
     css-loader "6.7.3"
     csv-loader "3.0.3"
@@ -2691,7 +2691,7 @@
     d3 "7.3.0"
     d3-selection "3.0.0"
     dayjs "1.11.18"
-    defu "5.0.1"
+    defu "6.1.4"
     diff2html "3.4.24"
     dompurify "3.2.5"
     element-matches "^0.1.2"
@@ -2726,7 +2726,7 @@
     jsonpath-plus "10.3.0"
     jsrsasign "11.0.0"
     jszip "3.10.1"
-    lodash "4.17.21"
+    lodash "4.17.23"
     marked "4.0.17"
     node-polyfill-webpack-plugin "3.0.0"
     nodemon "2.0.22"
@@ -3429,10 +3429,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@4.17.23":
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.23.tgz#c1bb06db218acc8fc232da0447473fc2fb9d9841"
-  integrity sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==
+"@types/lodash@4.17.24":
+  version "4.17.24"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.24.tgz#4ae334fc62c0e915ca8ed8e35dcc6d4eeb29215f"
+  integrity sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==
 
 "@types/mime@^1":
   version "1.3.5"
@@ -3452,9 +3452,9 @@
     "@types/node" "*"
 
 "@types/node@*", "@types/node@20.10.8", "@types/node@^14.14.31", "@types/node@~20.19.0":
-  version "20.19.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.33.tgz#ac8364c623b72d43125f0e7dd722bbe968f0c65e"
-  integrity sha512-Rs1bVAIdBs5gbTIKza/tgpMuG1k3U/UMJLWecIMxNdJFDMzcM5LOiLVRYh3PilWEYDIeUDv7bpiHPLPsbydGcw==
+  version "20.19.37"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.37.tgz#b4fb4033408dd97becce63ec932c9ec57a9e2919"
+  integrity sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==
   dependencies:
     undici-types "~6.21.0"
 
@@ -3559,6 +3559,11 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba"
   integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==
 
+"@types/web-bluetooth@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
+  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+
 "@types/webpack-env@^1.15.2":
   version "1.18.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.5.tgz#eccda0b04fe024bed505881e2e532f9c119169bf"
@@ -3720,6 +3725,35 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
+"@vue-flow/background@^1.3.0":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@vue-flow/background/-/background-1.3.2.tgz#0c90cd05e5d60da017bbaf5a1c3eb6af7ed9b778"
+  integrity sha512-eJPhDcLj1wEo45bBoqTXw1uhl0yK2RaQGnEINqvvBsAFKh/camHJd5NPmOdS1w+M9lggc9igUewxaEd3iCQX2w==
+
+"@vue-flow/controls@^1.1.1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@vue-flow/controls/-/controls-1.1.3.tgz#40866b553101fbef22d2b9a043965ed76fca4b2c"
+  integrity sha512-XCf+G+jCvaWURdFlZmOjifZGw3XMhN5hHlfMGkWh9xot+9nH9gdTZtn+ldIJKtarg3B21iyHU8JjKDhYcB6JMw==
+
+"@vue-flow/core@^1.33.5":
+  version "1.48.2"
+  resolved "https://registry.yarnpkg.com/@vue-flow/core/-/core-1.48.2.tgz#cef8641b17f6220c257d4208bdb2082cee882225"
+  integrity sha512-raxhgKWE+G/mcEvXJjGFUDYW9rAI3GOtiHR3ZkNpwBWuIaCC1EYiBmKGwJOoNzVFgwO7COgErnK7i08i287AFA==
+  dependencies:
+    "@vueuse/core" "^10.5.0"
+    d3-drag "^3.0.0"
+    d3-interpolate "^3.0.1"
+    d3-selection "^3.0.0"
+    d3-zoom "^3.0.0"
+
+"@vue-flow/minimap@^1.4.0":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@vue-flow/minimap/-/minimap-1.5.4.tgz#c9c3badea49d4166aa9cdc713017397d9df7574c"
+  integrity sha512-l4C+XTAXnRxsRpUdN7cAVFBennC1sVRzq4bDSpVK+ag7tdMczAnhFYGgbLkUw3v3sY6gokyWwMl8CDonp8eB2g==
+  dependencies:
+    d3-selection "^3.0.0"
+    d3-zoom "^3.0.0"
+
 "@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2"
@@ -4115,6 +4149,28 @@
   resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"
   integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==
 
+"@vueuse/core@^10.5.0":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.11.1.tgz#15d2c0b6448d2212235b23a7ba29c27173e0c2c6"
+  integrity sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.20"
+    "@vueuse/metadata" "10.11.1"
+    "@vueuse/shared" "10.11.1"
+    vue-demi ">=0.14.8"
+
+"@vueuse/metadata@10.11.1":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.11.1.tgz#209db7bb5915aa172a87510b6de2ca01cadbd2a7"
+  integrity sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==
+
+"@vueuse/shared@10.11.1":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.11.1.tgz#62b84e3118ae6e1f3ff38f4fbe71b0c5d0f10938"
+  integrity sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==
+  dependencies:
+    vue-demi ">=0.14.8"
+
 "@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
@@ -5863,7 +5919,7 @@ cron-validator@1.4.0:
   resolved "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.4.0.tgz#77ed4277b086c22e74ee65640f8456747afd4885"
   integrity sha512-wGcJ9FCy65iaU6egSH8b5dZYJF7GU/3Jh06wzaT9lsa5dbqExjljmu+0cJ8cpKn+vUyZa/EM4WAxeLR6SypJXw==
 
-cronstrue@2.53.0, cronstrue@2.59.0:
+cronstrue@2.59.0, cronstrue@3.9.0:
   version "2.59.0"
   resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.59.0.tgz#a250b2b04eebabf35518725018e501ff94370fb1"
   integrity sha512-YKGmAy84hKH+hHIIER07VCAHf9u0Ldelx1uU6EBxsRPDXIA1m5fsKmJfyC3xBhw6cVC/1i83VdbL4PvepTrt8A==
@@ -6173,7 +6229,7 @@ d3-delaunay@6:
   resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
   integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
 
-"d3-drag@2 - 3", d3-drag@3:
+"d3-drag@2 - 3", d3-drag@3, d3-drag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
   integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==
@@ -6228,7 +6284,7 @@ d3-hierarchy@3:
   resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"
   integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
 
-"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
+"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3, d3-interpolate@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
   integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
@@ -6274,7 +6330,7 @@ d3-scale@4:
     d3-time "2.1.1 - 3"
     d3-time-format "2 - 4"
 
-"d3-selection@2 - 3", d3-selection@3, d3-selection@3.0.0:
+"d3-selection@2 - 3", d3-selection@3, d3-selection@3.0.0, d3-selection@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
   integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
@@ -6316,7 +6372,7 @@ d3-shape@3:
     d3-interpolate "1 - 3"
     d3-timer "1 - 3"
 
-d3-zoom@3:
+d3-zoom@3, d3-zoom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
   integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
@@ -6516,10 +6572,10 @@ define-properties@^1.1.3, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-defu@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.1.tgz#a034278f9b032bf0845d261aa75e9ad98da878ac"
-  integrity sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ==
+defu@6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479"
+  integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
 
 delaunator@5:
   version "5.0.1"
@@ -6783,6 +6839,11 @@ element-matches@^0.1.2:
   resolved "https://registry.yarnpkg.com/element-matches/-/element-matches-0.1.2.tgz#7345cb71e965bd2b12f725e524591c102198361a"
   integrity sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ==
 
+elkjs@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.11.1.tgz#d27fcdbbf5a8aeeff80420d17d1666f78cfc8544"
+  integrity sha512-zxxR9k+rx5ktMwT/FwyLdPCrq7xN6e4VGGHH8hA01vVYKjTFik7nHOxBnAYtrgYUB1RpAiLvA1/U2YraWxyKKg==
+
 elliptic@^6.5.3, elliptic@^6.5.5:
   version "6.5.7"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
@@ -9940,10 +10001,10 @@ lodash.upperfirst@^4.3.1:
   resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
   integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
 
-lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+lodash@4.17.23, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+  version "4.17.23"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
+  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
 
 log-symbols@^4.0.0, log-symbols@^4.1.0:
   version "4.1.0"
@@ -13202,6 +13263,11 @@ vue-component-type-helpers@^2.0.0:
   resolved "https://registry.yarnpkg.com/vue-component-type-helpers/-/vue-component-type-helpers-2.2.0.tgz#de5fa802b6beae7125595ec0d3d5195a22691623"
   integrity sha512-cYrAnv2me7bPDcg9kIcGwjJiSB6Qyi08+jLDo9yuvoFQjzHiPTzML7RnkJB1+3P6KMsX/KbCD4QE3Tv/knEllw==
 
+vue-demi@>=0.14.8:
+  version "0.14.10"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
+  integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
+
 vue-draggable-next@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-draggable-next/-/vue-draggable-next-2.3.0.tgz#ba83154f60b8a3c24059c18b8060b72200a4c673"