chore: bump version to v1.7.0-rc1 (#583) (#585)

(cherry picked from commit 81bf19419c)

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

.eslintignore

@@ -14,3 +14,4 @@ dist-pkg
 pkg/harvester/index.ts
 pkg/harvester/store/*
 scripts/pkgfile.js
+tmp

.github/mergify.yml

@@ -1,33 +1,14 @@
 pull_request_rules:
-- name: Automatically open backport PR to release-harvester-v1.5
-  conditions:
-    - base=main
-    - label="require backport 1.5"
-  actions:
-    backport:
-      branches:
-        - "release-harvester-v1.5"
-      assignees:
-        - "{{ author }}"
-      labels:
-        - "v1.5 backport PR"
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏
 
-- name: Automatically open backport PR to release-harvester-v1.0
-  conditions:
-    - base=main
-    - label="require backport 1.0"
-  actions:
-    backport:
-      branches:
-        - "release-harvester-v1.0"
-      assignees:
-        - "{{ author }}"
-      labels:
-        - "v1.0 backport PR"
-
-- name: Ask to resolve conflict
-  conditions:
-    - conflict
-  actions:
-    comment:
-      message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏
+commands_restrictions:
+  backport:
+    conditions:
+      - or:
+        - sender-permission>=write
+        - sender=github-actions[bot]

.github/renovate.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
+    "extends": [
     "config:recommended",
     ":semanticCommitTypeAll(deps)",
     ":semanticCommitScopeDisabled"

.github/workflows/backport-request.yaml

@@ -0,0 +1,49 @@
+name: "[PR Management] Request Backport via Mergify"
+
+on:
+  pull_request_target:
+    types: [closed]
+    branches: [main]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  comment-backport:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Post Mergify backport command
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+
+          pr_number=${{ github.event.pull_request.number }}
+          repo="${{ github.repository }}"
+
+          labels_json='${{ toJson(github.event.pull_request.labels.*.name) }}'
+          labels=$(echo "$labels_json" | jq -r '.[] // empty')
+
+          echo "Labels on PR: $labels"
+
+          matches=$(echo "$labels" | grep -oE '^require backport/v[0-9]+\.[0-9]+$' || true)
+
+          if [[ -z "$matches" ]]; then
+            echo "No back‑port labels found — skipping."
+            exit 0
+          fi
+
+          branches=$(echo "$matches" \
+            | sed -E 's/^require backport\/v/release-harvester-v/' \
+            | sort -u | tr '\n' ' ')
+          branches=${branches%% }
+
+          cmd="@Mergifyio backport $branches"
+          echo "Posting Mergify command: $cmd"
+          gh pr comment "$pr_number" --repo "$repo" --body "$cmd"

.github/workflows/run-lint.yaml

@@ -50,6 +50,7 @@ jobs:
 
           echo "FROM=$FROM"
           echo "TO=$TO"
+
           npx commitlint --from "$FROM" --to "$TO" --verbose
         env:
           GITHUB_EVENT_NAME: ${{ github.event_name }}

README.md

@@ -138,7 +138,6 @@ To validate changes in a release series, switch to the appropriate `vX.Y-head` b
 - Examples:
   - Test `1.0.x` series → `v1.0-head`
   - Test `1.5.x` series → `v1.5-head`
-  - Test `1.6.x` series → `v1.6-head`
 
 **Steps:**
 1. Navigate to **Rancher UI** → **Local** → **App** → **Repositories**

commitlint.config.js

@@ -22,6 +22,10 @@ module.exports = {
         'security', // Security fixes
       ]
     ],
+    // Allows the scope to be empty. [0] means the rule is disabled.
+    'scope-empty':            [0, 'always'],
+    // Allows any string for the scope.
+    'scope-case':             [2, 'always', 'kebab-case'],
     'type-case':              [2, 'always', 'lower-case'],
     'type-empty':             [2, 'never'],
     'subject-case':           [0, 'never'],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.6.1-rc2",
+  "version": "1.7.0-rc1",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
@@ -29,8 +29,8 @@
     "node-forge": "1.3.1",
     "nth-check": "2.1.1",
     "qs": "6.14.0",
-    "roarr": "7.21.1",
-    "semver": "7.7.2",
+    "roarr": "7.21.2",
+    "semver": "7.7.3",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "scripts": {

pkg/harvester/components/SettingList.vue

@@ -11,7 +11,6 @@ const CATEGORY = {
   ui: [
     'branding',
     'ui-source',
-    'ui-plugin-index',
     'ui-index',
   ]
 };

pkg/harvester/components/novnc/NovncConsoleWrapper.vue

@@ -257,6 +257,10 @@ export default {
       });
     },
 
+    reconnect() {
+      this.$refs.novncConsole.reconnect();
+    },
+
     softReboot() {
       this.vmResource.doSoftReboot();
     },
@@ -306,6 +310,13 @@ export default {
           {{ t("harvester.action.softreboot") }}
         </button>
 
+        <button
+          class="btn btn-sm bg-primary"
+          @click="reconnect"
+        >
+          {{ t("harvester.action.reconnect") }}
+        </button>
+
         <v-dropdown
           v-if="!hideCustomKeysBar"
           ref="customKeyPopover"
@@ -380,4 +391,7 @@ export default {
   .vm-console .v-popper__popper{
     margin-top: 8px;
   }
+  .vm-console .v-popper__inner{
+    overflow-y: visible;
+  }
 </style>

pkg/harvester/components/settings/kubevirt-migration.vue

@@ -0,0 +1,154 @@
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { RadioGroup } from '@components/Form/Radio';
+import UnitInput from '@shell/components/form/UnitInput';
+import { MEBIBYTE } from '../../utils/unit';
+import { Banner } from '@components/Banner';
+
+export default {
+  name: 'KubevirtMigration',
+
+  components: {
+    LabeledInput,
+    UnitInput,
+    RadioGroup,
+    Banner
+  },
+
+  props: {
+    registerBeforeHook: {
+      type:     Function,
+      required: true
+    },
+    value: {
+      type:    Object,
+      default: () => ({
+        value:   '',
+        default: '{}'
+      })
+    },
+  },
+
+  data() {
+    const migration = this.parseJSON(this.value?.value) || this.parseJSON(this.value?.default) || {};
+
+    return {
+      MEBIBYTE,
+      migration,
+      parseError: null,
+    };
+  },
+
+  created() {
+    this.registerBeforeHook?.(this.willSave, 'willSave');
+  },
+
+  methods: {
+    parseJSON(string) {
+      try {
+        return JSON.parse(string);
+      } catch (e) {
+        this.parseError = this.t('kubevirtMigration.parseError', { error: e.message });
+        // eslint-disable-next-line no-console
+        console.error('Failed to parse JSON:', e.message);
+
+        return null;
+      }
+    },
+
+    updateValue() {
+      if (this.value) {
+        this.value.value = JSON.stringify(this.migration);
+      }
+    },
+
+    useDefault() {
+      if (this.value?.default) {
+        const defaultMigration = this.parseJSON(this.value.default) || {};
+
+        this.migration = defaultMigration;
+        this.updateValue();
+      }
+    },
+
+    async willSave() {
+      this.updateValue();
+
+      return Promise.resolve();
+    },
+  },
+};
+</script>
+
+<template>
+  <div>
+    <Banner
+      v-if="parseError"
+      color="error"
+    >
+      {{ parseError }}
+    </Banner>
+
+    <div class="migration-field">
+      <LabeledInput
+        v-model:value.number="migration.parallelMigrationsPerCluster"
+        :label="t('harvester.setting.kubevirtMigration.parallelMigrationsPerCluster')"
+        type="number"
+        min="1"
+      />
+      <LabeledInput
+        v-model:value.number="migration.parallelOutboundMigrationsPerNode"
+        :label="t('harvester.setting.kubevirtMigration.parallelOutboundMigrationsPerNode')"
+        type="number"
+        min="1"
+      />
+      <UnitInput
+        v-model:value="migration.bandwidthPerMigration"
+        min="0"
+        :label="t('harvester.setting.kubevirtMigration.bandwidthPerMigration')"
+        :mode="mode"
+        :suffix="MEBIBYTE"
+        :tooltip="t('harvester.setting.kubevirtMigration.bandwidthPerMigrationTooltip', _, true)"
+      />
+      <UnitInput
+        v-model:value="migration.completionTimeoutPerGiB"
+        :label="t('harvester.setting.kubevirtMigration.completionTimeoutPerGiB')"
+        :mode="mode"
+        :suffix="migration.completionTimeoutPerGiB === 1 ? 'Second' : 'Seconds'"
+        min="10"
+      />
+      <UnitInput
+        v-model:value="migration.progressTimeout"
+        :label="t('harvester.setting.kubevirtMigration.progressTimeout')"
+        :mode="mode"
+        :suffix="migration.progressTimeout === 1 ? 'Second' : 'Seconds'"
+        min="10"
+      />
+      <div
+        v-for="field in ['allowAutoConverge','allowPostCopy','unsafeMigrationOverride','allowWorkloadDisruption','disableTLS','matchSELinuxLevelOnMigration']"
+        :key="field"
+      >
+        <label
+          class="mb-5"
+          :for="field"
+        >{{ t(`harvester.setting.kubevirtMigration.${field}`) }}</label>
+        <RadioGroup
+          :id="field"
+          v-model:value="migration[field]"
+          :options="[
+            { label: t('advancedSettings.edit.trueOption'), value: true },
+            { label: t('advancedSettings.edit.falseOption'), value: false },
+          ]"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.migration-field {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+</style>

pkg/harvester/config/doc-links.js

@@ -1,10 +1,12 @@
 // suffix of doc link, see utils/feature-flags.js how to get complete doc link
 export const DOC = {
-  CONSOLE_URL:               `/host/#remote-console`,
-  RANCHER_INTEGRATION_URL:   `/rancher/rancher-integration`,
-  KSMTUNED_MODE:             `/host/#ksmtuned-mode`,
-  UPGRADE_URL:               `/upgrade/index`,
-  UPGRADE_CONFIG_URL:        `/advanced/index#upgrade-config`,
-  STORAGE_NETWORK_EXAMPLE:   `/advanced/storagenetwork#configuration-example`,
-  SUPPORT_BUNDLE_NAMESPACES: `/advanced/index/#support-bundle-namespaces`,
+  CONSOLE_URL:                `/host/#remote-console`,
+  RANCHER_INTEGRATION_URL:    `/rancher/rancher-integration`,
+  KSMTUNED_MODE:              `/host/#ksmtuned-mode`,
+  UPGRADE_URL:                `/upgrade/index`,
+  UPGRADE_CONFIG_URL:         `/advanced/index#upgrade-config`,
+  STORAGE_NETWORK_EXAMPLE:    `/advanced/storagenetwork#configuration-example`,
+  SUPPORT_BUNDLE_NAMESPACES:  `/advanced/index/#support-bundle-namespaces`,
+  VPC_CONFIGURATION_EXAMPLES: `/networking/kubeovn-vpc#vpc-peering-configuration-examples`,
+  NETWORK_POLICY:             `/networking/kubeovn-vm-isolation/#network-policies`,
 };

pkg/harvester/config/feature-flags.js

@@ -39,7 +39,6 @@ const FEATURE_FLAGS = {
   ],
   'v1.5.1': [],
   'v1.6.0': [
-    'vmMachineTypes',
     'customSupportBundle',
     'csiOnlineExpandValidation',
     'vmNetworkMigration',
@@ -50,6 +49,12 @@ const FEATURE_FLAGS = {
     'vmCloneRunStrategy',
   ],
   'v1.6.1': [],
+  'v1.7.0': [
+    'vmMachineTypeAuto',
+    'lhV2VolExpansion',
+    'l2VlanTrunkMode',
+    'kubevirtMigration'
+  ]
 };
 
 const generateFeatureFlags = () => {

pkg/harvester/config/harvester-cluster.js

@@ -10,6 +10,7 @@ import {
   LOGGING,
   STORAGE_CLASS,
   SECRET,
+  NETWORK_POLICY
 } from '@shell/config/types';
 import { HCI, VOLUME_SNAPSHOT } from '../types';
 import {
@@ -425,6 +426,7 @@ export function init($plugin, store) {
       HCI.CLUSTER_NETWORK,
       HCI.NETWORK_ATTACHMENT,
       HCI.VPC,
+      NETWORK_POLICY,
       HCI.LB,
       HCI.IP_POOL,
     ],
@@ -455,6 +457,7 @@ export function init($plugin, store) {
       HCI.PCI_DEVICE,
       HCI.SR_IOVGPU_DEVICE,
       HCI.VGPU_DEVICE,
+      HCI.MIG_CONFIGURATION,
       HCI.USB_DEVICE,
       HCI.ADD_ONS,
       HCI.SECRET,
@@ -566,6 +569,21 @@ export function init($plugin, store) {
     ifHaveType: HCI.VPC,
   });
 
+  configureType(NETWORK_POLICY, { hiddenNamespaceGroupButton: true, canYaml: false });
+
+  virtualType({
+    labelKey:   'harvester.networkPolicy.label',
+    name:       NETWORK_POLICY,
+    namespaced: true,
+    weight:     186,
+    route:      {
+      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
+      params: { resource: NETWORK_POLICY }
+    },
+    exact:      false,
+    ifHaveType: NETWORK_POLICY,
+  });
+
   configureType(HCI.SNAPSHOT, {
     isCreatable: false,
     location:    {
@@ -832,6 +850,26 @@ export function init($plugin, store) {
     ]
   });
 
+  virtualType({
+    labelKey:   'harvester.migconfiguration.label',
+    group:      'advanced',
+    weight:     12,
+    name:       HCI.MIG_CONFIGURATION,
+    namespaced: false,
+    route:      {
+      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
+      params: { resource: HCI.MIG_CONFIGURATION }
+    },
+    exact:      false,
+    ifHaveType: HCI.MIG_CONFIGURATION,
+  });
+
+  configureType(HCI.MIG_CONFIGURATION, {
+    isCreatable:                false,
+    hiddenNamespaceGroupButton: true,
+    canYaml:                    false,
+  });
+
   virtualType({
     labelKey:   'harvester.usb.label',
     group:      'advanced',

pkg/harvester/config/settings.ts

@@ -4,7 +4,6 @@ export const HCI_SETTING = {
   LOG_LEVEL:                              'log-level',
   SERVER_VERSION:                         'server-version',
   UI_INDEX:                               'ui-index',
-  UI_PLUGIN_INDEX:                        'ui-plugin-index',
   UPGRADE_CHECKER_ENABLED:                'upgrade-checker-enabled',
   UPGRADE_CHECKER_URL:                    'upgrade-checker-url',
   VLAN:                                   'vlan',
@@ -38,7 +37,8 @@ export const HCI_SETTING = {
   UPGRADE_CONFIG:                         'upgrade-config',
   VM_MIGRATION_NETWORK:                   'vm-migration-network',
   RANCHER_CLUSTER:                        'rancher-cluster',
-  MAX_HOTPLUG_RATIO:                      'max-hotplug-ratio'
+  MAX_HOTPLUG_RATIO:                      'max-hotplug-ratio',
+  KUBEVIRT_MIGRATION:                     'kubevirt-migration'
 };
 
 export const HCI_ALLOWED_SETTINGS = {
@@ -84,7 +84,6 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.SUPPORT_BUNDLE_NAMESPACES]: { from: 'import', canReset: true },
   [HCI_SETTING.AUTO_DISK_PROVISION_PATHS]: { canReset: true },
   [HCI_SETTING.RELEASE_DOWNLOAD_URL]:      { kind: 'url' },
-  [HCI_SETTING.UI_PLUGIN_INDEX]:           { kind: 'url' },
   [HCI_SETTING.CONTAINERD_REGISTRY]:       {
     kind: 'json', from: 'import', canReset: true
   },
@@ -117,6 +116,9 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.VM_MIGRATION_NETWORK]:  {
     kind: 'json', from: 'import', canReset: true, featureFlag: 'vmNetworkMigration',
   },
+  [HCI_SETTING.KUBEVIRT_MIGRATION]: {
+    kind: 'json', from: 'import', canReset: true, featureFlag: 'kubevirtMigration',
+  }
 };
 
 export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {

pkg/harvester/config/types.js

@@ -4,9 +4,10 @@ export const BACKUP_TYPE = {
 };
 
 export const NETWORK_TYPE = {
-  L2VLAN:   'L2VlanNetwork',
-  UNTAGGED: 'UntaggedNetwork',
-  OVERLAY:  'OverlayNetwork',
+  L2VLAN:       'L2VlanNetwork',
+  UNTAGGED:     'UntaggedNetwork',
+  OVERLAY:      'OverlayNetwork',
+  L2TRUNK_VLAN: 'L2VlanTrunkNetwork',
 };
 
 export const VOLUME_MODE = {
@@ -23,3 +24,8 @@ export const INTERNAL_STORAGE_CLASS = {
   VMSTATE_PERSISTENCE: 'vmstate-persistence',
   LONGHORN_STATIC:     'longhorn-static',
 };
+
+export const L2VLAN_MODE = {
+  ACCESS: 'access',
+  TRUNK:  'trunk',
+};

pkg/harvester/detail/devices.harvesterhci.io.migconfiguration.vue

@@ -0,0 +1,124 @@
+<script>
+import CreateEditView from '@shell/mixins/create-edit-view';
+import ResourceTabs from '@shell/components/form/ResourceTabs';
+import Tab from '@shell/components/Tabbed/Tab';
+import SortableTable from '@shell/components/SortableTable';
+
+export default {
+
+  components: {
+    ResourceTabs,
+    Tab,
+    SortableTable,
+  },
+
+  mixins: [CreateEditView],
+
+  props: {
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    }
+  },
+
+  computed: {
+    headers() {
+      return [
+        {
+          name:        'profileName',
+          labelKey:    'harvester.migconfiguration.tableHeaders.profileName',
+          value:       'name',
+          width:       75,
+          sort:        'name',
+          dashIfEmpty: true,
+        },
+        {
+          name:        'vGPUID',
+          labelKey:    'harvester.migconfiguration.tableHeaders.vGPUID',
+          value:       'vGPUID',
+          width:       75,
+          sort:        'vGPUID',
+          dashIfEmpty: true,
+        },
+        {
+          name:        'available',
+          labelKey:    'harvester.migconfiguration.tableHeaders.available',
+          value:       'available',
+          width:       75,
+          sort:        'available',
+          align:       'center',
+          dashIfEmpty: true,
+        },
+        {
+          name:        'requested',
+          labelKey:    'harvester.migconfiguration.tableHeaders.requested',
+          value:       'requested',
+          width:       75,
+          sort:        'requested',
+          align:       'center',
+          dashIfEmpty: true,
+        },
+        {
+          name:        'total',
+          labelKey:    'harvester.migconfiguration.tableHeaders.total',
+          value:       'total',
+          width:       75,
+          sort:        'total',
+          align:       'center',
+          dashIfEmpty: true,
+        },
+      ];
+    },
+
+    rows() {
+      let out = (this.value?.status?.profileStatus || []).map((profile) => {
+        const {
+          id, name, total, available
+        } = profile;
+
+        return {
+          id,
+          name,
+          total,
+          available,
+          vGPUID: profile.vGPUID?.join(', ') || '',
+        };
+      });
+
+      out = out.map((row) => {
+        const requested = this.value?.spec?.profileSpec.find((p) => p.id === row.id)?.requested || 0;
+
+        return { ...row, requested };
+      });
+
+      return out;
+    },
+  },
+};
+</script>
+
+<template>
+  <ResourceTabs
+    :value="value"
+    :need-events="false"
+    :need-related="false"
+    :mode="mode"
+  >
+    <Tab
+      name="Profile Status"
+      :label="t('harvester.migconfiguration.profileStatus')"
+    >
+      <SortableTable
+        :headers="headers"
+        :rows="rows"
+        key-field="condition"
+        default-sort-by="condition"
+        :table-actions="false"
+        :row-actions="false"
+        :search="false"
+      />
+    </Tab>
+  </ResourceTabs>
+</template>

pkg/harvester/edit/devices.harvesterhci.io.migconfiguration.vue

@@ -0,0 +1,133 @@
+<script>
+import Tabbed from '@shell/components/Tabbed';
+import Tab from '@shell/components/Tabbed/Tab';
+import CruResource from '@shell/components/CruResource';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import NameNsDescription from '@shell/components/form/NameNsDescription';
+import LabelValue from '@shell/components/LabelValue';
+import CreateEditView from '@shell/mixins/create-edit-view';
+
+export default {
+  name: 'HarvesterEditMIGConfiguration',
+
+  components: {
+    Tab,
+    Tabbed,
+    CruResource,
+    LabeledInput,
+    NameNsDescription,
+    LabelValue
+  },
+
+  mixins: [CreateEditView],
+
+  inheritAttrs: false,
+
+  props: {
+    value: {
+      type:     Object,
+      required: true,
+    }
+  },
+
+  data() {
+    const { profileSpec } = this.value.spec;
+
+    return { profileSpec: profileSpec || [] };
+  },
+
+  created() {
+    if (this.registerBeforeHook) {
+      this.registerBeforeHook(this.updateBeforeSave);
+    }
+  },
+
+  computed: {
+    isView() {
+      return this.mode === 'view';
+    },
+  },
+  methods: {
+    updateBeforeSave() {
+      // MIGConfiguration CRD don't have any namespace field,
+      // so we need to remove the namespace field before saving
+      delete this.value.metadata.namespace;
+      // enable the MIGConfiguration when saving
+      this.value.spec.enabled = true;
+    },
+
+    labelTitle(profile) {
+      return `${ profile.name } (available : ${ this.available(profile) })`;
+    },
+
+    available(profile) {
+      const count = this.value.status?.profileStatus?.find((p) => p.id === profile.id)?.available;
+
+      return count || 0;
+    },
+
+    updateRequested(neu, profile) {
+      if (neu === null || neu === '') return;
+      const newValue = Number(neu);
+      const availableCount = this.available(profile);
+
+      if (newValue < 0) {
+        profile.requested = 0;
+      } else if ( newValue > availableCount ) {
+        profile.requested = availableCount;
+      } else {
+        profile.requested = newValue;
+      }
+    }
+  },
+};
+</script>
+
+<template>
+  <CruResource
+    :done-route="doneRoute"
+    :resource="value"
+    :mode="mode"
+    :errors="errors"
+    :apply-hooks="applyHooks"
+    finish-button-mode="enable"
+    @finish="save"
+    @error="e=>errors=e"
+  >
+    <NameNsDescription
+      :value="value"
+      :mode="mode"
+    />
+    <Tabbed
+      v-bind="$attrs"
+      class="mt-15"
+      :side-tabs="true"
+    >
+      <Tab
+        name="profileSpec"
+        :label="t('harvester.migconfiguration.profileSpec')"
+        :weight="1"
+        class="bordered-table"
+      >
+        <div
+          v-for="(profile, index) in profileSpec"
+          :key="index"
+        >
+          <LabelValue
+            :value="labelTitle(profile)"
+            class="mb-10"
+          />
+          <LabeledInput
+            v-model:value="profile.requested"
+            :min="0"
+            :disabled="isView"
+            type="number"
+            class="mb-20"
+            :label="`${t('harvester.migconfiguration.requested')}`"
+            @update:value="updateRequested($event, profile)"
+          />
+        </div>
+      </Tab>
+    </Tabbed>
+  </CruResource>
+</template>

pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue

@@ -8,7 +8,7 @@ import LabelValue from '@shell/components/LabelValue';
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { RadioGroup, RadioButton } from '@components/Form/Radio';
+import { RadioGroup } from '@components/Form/Radio';
 import HarvesterDisk from '../../mixins/harvester-disk';
 import Tags from '../../components/DiskTags';
 import { HCI } from '../../types';
@@ -30,7 +30,6 @@ export default {
     BadgeState,
     Banner,
     RadioGroup,
-    RadioButton,
     ModalWithCard,
     Tags,
   },
@@ -184,12 +183,11 @@ export default {
     },
 
     forceFormattedDisabled() {
-      const lastFormattedAt = this.blockDevice?.status?.deviceStatus?.fileSystem?.LastFormattedAt;
       const fileSystem = this.blockDevice?.status?.deviceStatus?.fileSystem.type;
 
       const systems = ['ext4', 'XFS'];
 
-      if (lastFormattedAt || this.blockDevice?.childParts?.length > 0) {
+      if (this.blockDevice?.childParts?.length > 0) {
         return true;
       } else if (systems.includes(fileSystem)) {
         return false;
@@ -446,7 +444,7 @@ export default {
         />
       </div>
       <div
-        v-if="(value.isNew && isLonghornV1 && !isFormatted) || isCorrupted"
+        v-if="(value.isNew && isLonghornV1) || isCorrupted"
         class="col span-6"
       >
         <RadioGroup
@@ -459,15 +457,6 @@ export default {
           :disabled="forceFormattedDisabled"
           tooltip-key="harvester.host.disk.forceFormatted.toolTip"
         >
-          <template #1="{option, listeners}">
-            <RadioButton
-              :label="option.label"
-              :val="option.value"
-              :value="value.forceFormatted"
-              :disabled="forceFormattedDisabled && !value.forceFormatted"
-              v-on="listeners"
-            />
-          </template>
         </RadioGroup>
       </div>
       <div

pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue

@@ -7,6 +7,8 @@ import { Checkbox } from '@components/Form/Checkbox';
 import { HCI } from '../../types';
 import { DOC } from '../../config/doc-links';
 import { docLink } from '../../utils/feature-flags';
+import isEqual from 'lodash/isEqual';
+import { clone } from '@shell/utils/object';
 
 export const ksmtunedMode = [{
   value: 'standard',
@@ -64,11 +66,13 @@ export default {
 
     this.enableMergeAcrossNodes = !!this.ksmtuned.spec?.mergeAcrossNodes;
     this.spec = this.ksmtuned.spec;
+    this.originSpec = clone(this.ksmtuned.spec);
   },
 
   data() {
     return {
       ksmtuned:               {},
+      originSpec:             {},
       spec:                   {},
       thresCoef:              30,
       ksmtunedMode,
@@ -99,6 +103,11 @@ export default {
 
   methods: {
     async saveKsmtuned() {
+      // no ksmtuned spec change, skip save
+      if (isEqual(this.spec, this.originSpec)) {
+        return;
+      }
+
       this.spec.mergeAcrossNodes = this.enableMergeAcrossNodes ? 1 : 0;
       this.ksmtuned['spec'] = this.spec;
 

pkg/harvester/edit/harvesterhci.io.host/index.vue

@@ -527,7 +527,6 @@ export default {
               id:   this.longhornNode.id,
               opt:  { force: true },
             });
-
             await new Promise((resolve) => setTimeout(resolve, '5000'));
             await retrySave();
           } else {

pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue

@@ -10,9 +10,13 @@ import { HCI as HCI_LABELS_ANNOTATIONS } from '@pkg/harvester/config/labels-anno
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { allHash } from '@shell/utils/promise';
 import { HCI } from '../types';
-import { NETWORK_TYPE } from '../config/types';
+import { NETWORK_TYPE, L2VLAN_MODE } from '../config/types';
+import { removeObject } from '@shell/utils/array';
 
-const { L2VLAN, UNTAGGED, OVERLAY } = NETWORK_TYPE;
+const {
+  L2VLAN, UNTAGGED, OVERLAY, L2TRUNK_VLAN
+} = NETWORK_TYPE;
+const { ACCESS, TRUNK } = L2VLAN_MODE;
 
 const AUTO = 'auto';
 const MANUAL = 'manual';
@@ -52,6 +56,8 @@ export default {
     return {
       config,
       type,
+      l2VlanMode:    this.value.vlanType === L2TRUNK_VLAN ? TRUNK : ACCESS,
+      vlanTrunk:     this.parseVlanTrunk(config),
       layer3Network: {
         mode:         layer3Network.mode || AUTO,
         serverIPAddr: layer3Network.serverIPAddr || '',
@@ -108,6 +114,10 @@ export default {
       }];
     },
 
+    l2VlanTrunkModeFeatureEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('l2VlanTrunkMode');
+    },
+
     kubeovnVpcSubnetSupport() {
       return this.$store.getters['harvester-common/getFeatureEnabled']('kubeovnVpcSubnet');
     },
@@ -131,6 +141,16 @@ export default {
       });
     },
 
+    l2VlanModeOptions() {
+      return [{
+        label: this.t('harvester.vlanStatus.vlanConfig.l2VlanMode.access'),
+        value: ACCESS,
+      }, {
+        label: this.t('harvester.vlanStatus.vlanConfig.l2VlanMode.trunk'),
+        value: TRUNK,
+      }];
+    },
+
     networkTypes() {
       const types = [L2VLAN, UNTAGGED];
 
@@ -149,6 +169,22 @@ export default {
       return this.type === L2VLAN;
     },
 
+    isL2VlanTrunkMode() {
+      if (this.isView) {
+        return this.value.vlanType === L2TRUNK_VLAN && this.l2VlanMode === TRUNK;
+      }
+
+      return this.type === L2TRUNK_VLAN || (this.l2VlanMode === TRUNK && this.type === L2VLAN);
+    },
+
+    isL2VlanAccessMode() {
+      if (this.isView) {
+        return this.value.vlanType === L2VLAN && this.l2VlanMode === ACCESS;
+      }
+
+      return this.type === L2VLAN && this.l2VlanMode === ACCESS;
+    },
+
     isOverlayNetwork() {
       if (this.isView) {
         return this.value.vlanType === OVERLAY;
@@ -168,11 +204,11 @@ export default {
 
   watch: {
     type(newType) {
-      if (newType === OVERLAY) {
+      if (newType === OVERLAY) { // overlay network configuration
         this.config.type = 'kube-ovn';
         this.config.provider = `${ this.value.metadata.name }.${ this.value.metadata.namespace }.ovn`;
         this.config.server_socket = '/run/openvswitch/kube-ovn-daemon.sock';
-      } else {
+      } else { // l2vlan or untagged network configuration
         this.config.type = 'bridge';
         this.config.promiscMode = true;
         this.config.ipam = {};
@@ -180,7 +216,20 @@ export default {
         delete this.config.provider;
         delete this.config.server_socket;
       }
-    }
+    },
+    l2VlanMode(newAccessMode) {
+      if (this.type !== L2VLAN) {
+        return;
+      }
+
+      if (newAccessMode === TRUNK) { // trunk mode
+        this.config.vlan = 0;
+        this.config.vlanTrunk = this.vlanTrunk;
+      } else { // access mode
+        delete this.config.vlanTrunk;
+        this.config.vlan = '';
+      }
+    },
   },
 
   methods: {
@@ -188,7 +237,15 @@ export default {
       const errors = [];
 
       if (this.isL2VlanNetwork || this.isUntaggedNetwork) {
-        if (!this.config.vlan && !this.isUntaggedNetwork) {
+        if (this.isL2VlanTrunkMode && this.vlanTrunk.some((trunk) => trunk.minID === '')) {
+          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.vlanStatus.vlanConfig.vlanTrunk.minId') }));
+        }
+
+        if (this.isL2VlanTrunkMode && this.vlanTrunk.some((trunk) => trunk.maxID === '')) {
+          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.vlanStatus.vlanConfig.vlanTrunk.maxId') }));
+        }
+
+        if (this.isL2VlanAccessMode && !this.config.vlan && !this.isUntaggedNetwork) {
           errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('tableHeaders.networkVlan') }));
         }
 
@@ -217,6 +274,30 @@ export default {
       await this.save(buttonCb);
     },
 
+    parseVlanTrunk(config) {
+      if (config?.vlanTrunk && config?.vlanTrunk?.length > 0) {
+        return config.vlanTrunk;
+      }
+
+      return [{ minID: '', maxID: '' }];
+    },
+
+    removeVlanTrunk(trunk) {
+      removeObject(this.vlanTrunk, trunk);
+    },
+
+    addVlanTrunk() {
+      if (!this.config.vlanTrunk) {
+        this.config.vlanTrunk = [];
+      }
+      this.vlanTrunk.push({ minID: this.minId, maxID: this.maxId });
+      this.config.vlanTrunk = this.vlanTrunk;
+    },
+
+    vlanTrunkChange() {
+      this.config.vlanTrunk = this.vlanTrunk;
+    },
+
     input(neu) {
       if (neu === '') {
         this.config.vlan = '';
@@ -292,8 +373,76 @@ export default {
           required
         />
 
+        <LabeledSelect
+          v-if="isL2VlanNetwork && l2VlanTrunkModeFeatureEnabled"
+          v-model:value="l2VlanMode"
+          class="mb-20"
+          :options="l2VlanModeOptions"
+          :mode="mode"
+          :disabled="isEdit"
+          :label="t('harvester.vlanStatus.vlanConfig.l2VlanMode.label')"
+          required
+        />
+        <div v-if="isL2VlanTrunkMode && l2VlanTrunkModeFeatureEnabled">
+          <div
+            v-for="(trunk, i) in vlanTrunk"
+            :key="i"
+          >
+            <div class="row mt-10">
+              <div class="col trunk-span">
+                <LabeledInput
+                  v-model:value.number="trunk.minID"
+                  class="mb-20"
+                  required
+                  placeholder="e.g. 1-4094"
+                  :min="1"
+                  :max="4094"
+                  type="number"
+                  :label="t('harvester.vlanStatus.vlanConfig.vlanTrunk.minId')"
+                  :mode="mode"
+                  @update:value="vlanTrunkChange"
+                />
+              </div>
+              <div class="col trunk-span">
+                <LabeledInput
+                  v-model:value.number="trunk.maxID"
+                  class="mb-20"
+                  :max="4094"
+                  :min="1"
+                  placeholder="e.g. 1-4094"
+                  required
+                  type="number"
+                  :label="t('harvester.vlanStatus.vlanConfig.vlanTrunk.maxId')"
+                  :mode="mode"
+                  @update:value="vlanTrunkChange"
+                />
+              </div>
+              <div class="col remove-btn mb-20">
+                <button
+                  type="button"
+                  :disabled="isView || vlanTrunk.length <= 1"
+                  :aria-label="t('generic.ariaLabel.remove', {index: i+1})"
+                  role="button"
+                  class="btn role-link"
+                  @click="removeVlanTrunk(trunk)"
+                >
+                  {{ t('harvester.fields.remove') }}
+                </button>
+              </div>
+            </div>
+          </div>
+          <button
+            v-if="isL2VlanTrunkMode"
+            type="button"
+            class="btn btn-sm bg-primary mb-20"
+            :disabled="isView"
+            @click="addVlanTrunk"
+          >
+            {{ t('harvester.vlanStatus.vlanConfig.vlanTrunk.add') }}
+          </button>
+        </div>
         <LabeledInput
-          v-if="isL2VlanNetwork"
+          v-if="isL2VlanAccessMode"
           v-model:value.number="config.vlan"
           class="mb-20"
           required
@@ -316,7 +465,7 @@ export default {
         />
       </Tab>
       <Tab
-        v-if="isL2VlanNetwork"
+        v-if="isL2VlanAccessMode"
         name="layer3Network"
         :label="t('harvester.network.tabs.layer3Network')"
         :weight="98"
@@ -375,3 +524,12 @@ export default {
     </Tabbed>
   </CruResource>
 </template>
+
+<style lang="scss" scoped>
+ .remove-btn {
+  align-self: center;
+}
+.trunk-span{
+  flex: 5;
+}
+</style>

pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue

@@ -15,6 +15,7 @@ import { HCI } from '../types';
 import { sortBy } from '@shell/utils/sort';
 import { BACKUP_TYPE } from '../config/types';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
+import { isBackupTargetSettingEmpty, isBackupTargetSettingUnavailable } from '../utils/setting';
 
 export default {
   name:       'CreateVMSchedule',
@@ -93,7 +94,7 @@ export default {
       return this.settings.find( (O) => O.id === 'backup-target');
     },
     isEmptyValue() {
-      return this.getBackupTargetValueIsEmpty(this.backupTargetResource);
+      return isBackupTargetSettingEmpty(this.backupTargetResource);
     },
     canUpdate() {
       return this?.backupTargetResource?.canUpdate;
@@ -109,7 +110,7 @@ export default {
       !!this.value.spec.maxFailure;
     },
     isBackupTargetUnAvailable() {
-      return this.value.spec.vmbackup.type === BACKUP_TYPE.BACKUP && (this.errorMessage || this.isEmptyValue) && this.canUpdate;
+      return this.value.spec.vmbackup.type === BACKUP_TYPE.BACKUP && isBackupTargetSettingUnavailable(this.backupTargetResource);
     },
     vmOptions() {
       const nsVmList = this.$store.getters['harvester/all'](HCI.VM).filter((vm) => vm.metadata.namespace === this.value.metadata.namespace);
@@ -166,20 +167,6 @@ export default {
     onTypeChange(newType) {
       this.value.metadata.name = `svm${ newType }-${ this.value.spec.vmbackup.source.name }`;
     },
-    getBackupTargetValueIsEmpty(resource) {
-      let out = true;
-
-      if (resource?.value) {
-        try {
-          const valueJson = JSON.parse(resource?.value);
-
-          out = !valueJson.type;
-        } catch (e) {}
-      }
-
-      return out;
-    },
-
     validateFailure(count) {
       if (this.value.spec.retain && count > this.value.spec.retain) {
         this.value.spec['maxFailure'] = this.value.spec.retain;

pkg/harvester/edit/harvesterhci.io.setting.vue

@@ -296,4 +296,9 @@ export default {
 :deep() .edit-help code {
   padding: 1px 5px;
 }
+
+::v-deep(.banner__content.closable) {
+  white-space: normal;
+  word-break: break-word;
+}
 </style>

pkg/harvester/edit/harvesterhci.io.volume.vue

@@ -7,6 +7,7 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
+import Conditions from '@shell/components/form/Conditions';
 import { Banner } from '@components/Banner';
 import { allHash } from '@shell/utils/promise';
 import { get } from '@shell/utils/object';
@@ -40,6 +41,7 @@ export default {
     LabeledSelect,
     LabeledInput,
     NameNsDescription,
+    Conditions
   },
 
   mixins: [CreateEditView],
@@ -267,7 +269,19 @@ export default {
 
     rebuildStatus() {
       return this.value.longhornEngine?.status?.rebuildStatus;
-    }
+    },
+
+    isLHV2VolExpansionFeatureEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
+    },
+
+    isResizeDisabled() {
+      return (
+        !this.isLHV2VolExpansionFeatureEnabled &&
+      this.value?.isLonghornV2 &&
+      this.isEdit
+      );
+    },
   },
 
   watch: {
@@ -463,7 +477,7 @@ export default {
           :output-modifier="true"
           :increment="1024"
           :mode="mode"
-          :disabled="value?.isLonghornV2 && isEdit"
+          :disabled="isResizeDisabled"
           required
           class="mb-20"
           :suffix="GIBIBYTE"
@@ -471,7 +485,7 @@ export default {
         />
 
         <Banner
-          v-if="value?.isLonghornV2 && isEdit"
+          v-if="isResizeDisabled"
           color="warning"
         >
           <span>{{ t('harvester.volume.longhorn.disableResize') }}</span>
@@ -581,6 +595,15 @@ export default {
           :label="t('nameNsDescription.name.label')"
         />
       </Tab>
+      <Tab
+        v-if="!isCreate"
+        name="conditions"
+        :label="t('harvester.volume.tabs.conditions')"
+        class="bordered-table"
+        :mode="mode"
+      >
+        <Conditions :value="value" />
+      </Tab>
     </ResourceTabs>
   </CruResource>
 </template>

pkg/harvester/edit/kubeovn.io.subnet/AccessControlList.vue

@@ -0,0 +1,196 @@
+<script>
+import debounce from 'lodash/debounce';
+import { _EDIT, _VIEW } from '@shell/config/query-params';
+import { removeAt } from '@shell/utils/array';
+import { Banner } from '@components/Banner';
+import InfoBox from '@shell/components/InfoBox';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
+export default {
+  name: 'AccessControlList',
+
+  emits: ['update:value'],
+
+  components: {
+    Banner, InfoBox, LabeledSelect, LabeledInput
+  },
+
+  props: {
+    value: {
+      type:    Array,
+      default: null,
+    },
+    mode: {
+      type:    String,
+      default: _EDIT,
+    },
+  },
+
+  data() {
+    const rows = (this.value || []).map((row) => {
+      return {
+        action:      row.action || '',
+        direction:   row.direction || '',
+        priority:    row.priority || 0,
+        match:       row.match || '',
+      };
+    });
+
+    return { rows };
+  },
+
+  computed: {
+    isView() {
+      return this.mode === _VIEW;
+    },
+
+    actionOptions() {
+      return [
+        { label: 'Allow', value: 'allow' },
+        { label: 'Drop', value: 'drop' },
+        { label: 'Pass', value: 'pass' },
+        { label: 'Reject', value: 'reject' },
+        { label: 'Allow-related', value: 'allow-related' },
+        { label: 'Allow-stateless', value: 'allow-stateless' },
+      ];
+    },
+    directionOptions() {
+      return [
+        { label: 'To-lport', value: 'to-lport' },
+        { label: 'From-lport', value: 'from-lport' },
+      ];
+    }
+  },
+
+  created() {
+    this.queueUpdate = debounce(this.update, 100);
+  },
+
+  methods: {
+    add() {
+      this.rows.push({
+        action:      '',
+        direction:   '',
+        priority:  this.rows.length,
+        match:      '',
+      });
+      this.queueUpdate();
+    },
+
+    removeRule(idx) {
+      removeAt(this.rows, idx);
+      this.queueUpdate();
+    },
+
+    update() {
+      if (this.isView) {
+        return;
+      }
+
+      this.$emit('update:value', this.rows);
+    }
+  },
+};
+</script>
+
+<template>
+  <div>
+    <Banner
+      v-if="rows.length > 0"
+      color="info"
+    >
+      <t
+        k="harvester.subnet.acl.banner"
+        :raw="true"
+      />
+    </Banner>
+    <div
+      v-for="(row, idx) in rows"
+      :key="idx"
+    >
+      <InfoBox class="box">
+        <button
+          type="button"
+          class="role-link btn btn-sm removeBtn"
+          :disabled="isView"
+          @click="removeRule(idx)"
+        >
+          <i class="icon icon-x" />
+        </button>
+        <div class="row">
+          <div class="col span-4">
+            <LabeledSelect
+              v-model:value="row.action"
+              :mode="mode"
+              class="mt-5 ml-5"
+              :options="actionOptions"
+              :required="true"
+              :label="t('harvester.subnet.acl.action.label')"
+              :placeholder="t('harvester.subnet.acl.action.placeholder')"
+              @update:value="update"
+            />
+          </div>
+          <div class="col span-4">
+            <LabeledSelect
+              v-model:value="row.direction"
+              :mode="mode"
+              :options="directionOptions"
+              class="mt-5"
+              :required="true"
+              :label="t('harvester.subnet.acl.direction.label')"
+              :placeholder="t('harvester.subnet.acl.direction.placeholder')"
+              @update:value="update"
+            />
+          </div>
+          <div class="col span-3">
+            <LabeledInput
+              v-model:value.number="row.priority"
+              type="number"
+              class="mb-20 mt-5"
+              :max="32767"
+              :min="0"
+              :mode="mode"
+              required
+              label-key="harvester.subnet.acl.priority.label"
+              @update:value="update"
+            />
+          </div>
+        </div>
+        <div class="row">
+          <div class="col span-11">
+            <LabeledInput
+              v-model:value="row.match"
+              class="mb-5 ml-5"
+              :mode="mode"
+              required
+              :placeholder="t('harvester.subnet.acl.match.placeholder')"
+              label-key="harvester.subnet.acl.match.label"
+              @update:value="update"
+            />
+          </div>
+        </div>
+      </InfoBox>
+    </div>
+    <button
+      type="button"
+      class="btn role-tertiary add"
+      :disabled="isView"
+      @click="add()"
+    >
+      <t k="harvester.subnet.acl.addRule" />
+    </button>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .box {
+    position: relative;
+  }
+  .removeBtn {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    padding: 0px;
+  }
+</style>

pkg/harvester/edit/kubeovn.io.subnet/index.vue

@@ -14,6 +14,8 @@ import ArrayList from '@shell/components/form/ArrayList';
 import { allHash } from '@shell/utils/promise';
 import { HCI } from '../../types';
 import ResourceTabs from '@shell/components/form/ResourceTabs/index';
+import { Banner } from '@components/Banner';
+import AccessControlList from './AccessControlList';
 
 export default {
   name: 'EditSubnet',
@@ -21,6 +23,7 @@ export default {
   emits: ['update:value'],
 
   components: {
+    Banner,
     CruResource,
     LabeledInput,
     LabeledSelect,
@@ -30,6 +33,7 @@ export default {
     ArrayList,
     ResourceTabs,
     Loading,
+    AccessControlList
   },
 
   mixins: [CreateEditView],
@@ -38,7 +42,9 @@ export default {
 
   created() {
     const vpc = this.$route.query.vpc || '';
+    const enableDHCP = this.value?.spec?.enableDHCP || false;
 
+    set(this.value.spec, 'enableDHCP', enableDHCP);
     set(this.value, 'spec', this.value.spec || {
       cidrBlock:  '',
       protocol:   NETWORK_PROTOCOL.IPv4,
@@ -46,7 +52,9 @@ export default {
       vpc,
       gatewayIP:  '',
       excludeIps: [],
-      private:    false
+      private:    false,
+      enableDHCP,
+      acls:       []
     });
   },
 
@@ -81,7 +89,6 @@ export default {
     protocolOptions() {
       return Object.values(NETWORK_PROTOCOL);
     },
-
     provider: {
       get() {
         const raw = this.value.spec.provider;
@@ -125,10 +132,21 @@ export default {
     }
   },
 
+  watch: {
+    'value.spec.enableDHCP': {
+      handler(newValue) {
+        if (newValue === false) {
+          this.value.spec.dhcpV4Options = '';
+          this.value.spec.dhcpV6Options = '';
+        }
+      },
+    }
+  },
   methods: {
     async saveSubnet(buttonCb) {
       const errors = [];
       const name = this.value?.metadata?.name;
+      const hasEmptyAcls = this.value?.spec?.acls?.some((acl) => !acl.match || !acl.action || acl.priority === undefined || acl.priority === null);
 
       try {
         if (!name) {
@@ -139,6 +157,8 @@ export default {
           errors.push(this.t('validation.required', { key: this.t('harvester.subnet.provider.label') }, true));
         } else if (this.value.spec.excludeIps.includes('')) {
           errors.push(this.t('harvester.validation.subnet.excludeIps'));
+        } else if (hasEmptyAcls) {
+          errors.push(this.t('harvester.validation.subnet.aclEmptyError'));
         }
 
         if (errors.length > 0) {
@@ -245,6 +265,45 @@ export default {
             />
           </div>
         </div>
+        <div class="row mt-20">
+          <div class="col span-6">
+            <RadioGroup
+              v-model:value="value.spec.enableDHCP"
+              name="enabled"
+              :options="[true, false]"
+              :label="t('harvester.subnet.dhcp.label')"
+              :labels="[t('generic.enabled'), t('generic.disabled')]"
+              :mode="mode"
+              :tooltip="t('harvester.subnet.dhcp.tooltip')"
+            />
+            <LabeledInput
+              v-if="value.spec.enableDHCP && value.spec.protocol === 'IPv4'"
+              v-model:value="value.spec.dhcpV4Options"
+              class="mb-20 mt-20"
+              :placeholder="t('harvester.subnet.dhcp.placeholder')"
+              :label="t('harvester.subnet.dhcp.v4Options')"
+              :mode="mode"
+            />
+            <LabeledInput
+              v-if="value.spec.enableDHCP && value.spec.protocol === 'IPv6'"
+              v-model:value="value.spec.dhcpV6Options"
+              :placeholder="t('harvester.subnet.dhcp.placeholder')"
+              class="mb-20 mt-20"
+              :label="t('harvester.subnet.dhcp.v6Options')"
+              :mode="mode"
+            />
+            <Banner
+              v-if="value.spec.enableDHCP"
+              color="info"
+              class="dhcpOption-banner"
+            >
+              <t
+                k="harvester.subnet.dhcp.dhcpOptionBanner"
+                :raw="true"
+              />
+            </Banner>
+          </div>
+        </div>
         <div class="row mt-20">
           <div class="col span-6">
             <RadioGroup
@@ -318,6 +377,23 @@ export default {
           </template>
         </ArrayList>
       </Tab>
+      <Tab
+        name="ACL"
+        :label="t('harvester.subnet.acl.label')"
+        :weight="-2"
+        class="bordered-table"
+      >
+        <AccessControlList
+          v-model:value="value.spec.acls"
+          :mode="mode"
+        />
+      </Tab>
     </ResourceTabs>
   </CruResource>
 </template>
+
+<style lang="scss" scoped>
+  .dhcpOption-banner {
+    width: max-content;
+  }
+</style>

pkg/harvester/edit/kubeovn.io.vpc/StaticRoutes.vue

@@ -2,12 +2,17 @@
 import debounce from 'lodash/debounce';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import { removeAt } from '@shell/utils/array';
+import { Banner } from '@components/Banner';
+import { DOC } from '../../config/doc-links';
+import { docLink } from '../../utils/feature-flags';
 
 export default {
   name: 'StaticRoutes',
 
   emits: ['update:value'],
 
+  components: { Banner },
+
   props: {
     value: {
       type:    Array,
@@ -45,6 +50,12 @@ export default {
     nextHopIPTooltip() {
       return this.t('harvester.vpc.staticRoutes.nextHopIP.tooltip');
     },
+
+    vpcPeeringExamplesLink() {
+      const version = this.$store.getters['harvester-common/getServerVersion']();
+
+      return docLink(DOC.VPC_CONFIGURATION_EXAMPLES, version);
+    },
   },
 
   created() {
@@ -78,6 +89,13 @@ export default {
 
 <template>
   <div>
+    <Banner color="info">
+      <t
+        k="harvester.vpc.vpcPeerings.infoBanner"
+        :raw="true"
+        :url="vpcPeeringExamplesLink"
+      />
+    </Banner>
     <div
       v-if="rows.length"
       class="static-route-row"

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

@@ -136,6 +136,10 @@ export default {
     pvcs() {
       return this.$store.getters['harvester/all'](PVC) || [];
     },
+
+    isLHV2VolExpansionFeatureEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
+    },
   },
 
   watch: {
@@ -270,8 +274,8 @@ export default {
     },
 
     isResizeDisabled(volume) {
-      if (this.isCreate) return false;
-      if (volume.newCreateId) return false;
+      if (this.isLHV2VolExpansionFeatureEnabled) return false;
+      if (this.isCreate || volume.newCreateId) return false;
 
       const isStopped = this.vm.stateDisplay === OFF;
       const isLonghornV2 = this.isLonghornV2(volume);
@@ -406,7 +410,7 @@ export default {
               :label="ucFirst(value.volumeBackups.error.message)"
             />
             <Banner
-              v-if="isLonghornV2(volume) && !isView"
+              v-if="!isLHV2VolExpansionFeatureEnabled && isLonghornV2(volume) && !isView"
               color="warning"
               :label="t('harvester.volume.longhorn.disableResize')"
             />

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

@@ -2,7 +2,7 @@
 import { isEqual } from 'lodash';
 import { mapGetters } from 'vuex';
 import Tabbed from '@shell/components/Tabbed';
-import { clone, set } from '@shell/utils/object';
+import { clone } from '@shell/utils/object';
 import Tab from '@shell/components/Tabbed/Tab';
 import { Checkbox } from '@components/Form/Checkbox';
 import CruResource from '@shell/components/CruResource';
@@ -434,38 +434,44 @@ export default {
       }
     },
 
+    _compareDisksIgnoreStorage(disksA = [], disksB = []) {
+      if (disksA.length !== disksB.length) return false;
+
+      const sortedA = [...disksA].sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
+      const sortedB = [...disksB].sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
+
+      for (let i = 0; i < sortedA.length; i++) {
+        const cloneA = clone(sortedA[i]);
+        const cloneB = clone(sortedB[i]);
+
+        // remove the storage field before comparison
+        delete cloneA?.spec?.resources?.requests?.storage;
+        delete cloneB?.spec?.resources?.requests?.storage;
+
+        if (!isEqual(cloneA, cloneB)) return false;
+      }
+
+      return true;
+    },
+
+    _shouldPromptRestart(oldVM, newVM) {
+      const specChanged = !isEqual(oldVM?.spec, newVM?.spec);
+
+      // check if the disk defined in annotations has changed, ignoring storage size
+      const oldDisks = parseVolumeClaimTemplates(oldVM);
+      const newDisks = parseVolumeClaimTemplates(newVM);
+      const diskChanged = !this._compareDisksIgnoreStorage(oldDisks, newDisks);
+
+      return specChanged || diskChanged;
+    },
+
     restartVM() {
-      if (this.mode !== 'edit') {
-        return;
-      }
-      if (!this.value.isRunning) {
-        return;
-      }
-      const cloneDeepNewVM = clone(this.value);
+      if (this.mode !== 'edit' || !this.value.isRunning) return;
 
-      // new VM
-      delete cloneDeepNewVM?.metadata;
-      delete cloneDeepNewVM?.__clone;
+      const needsRestart = this._shouldPromptRestart(this.cloneVM, this.value);
 
-      // old VM
-      delete this.cloneVM?.metadata;
-      delete this.cloneVM?.__clone;
-
-      // add empty hostDevices to old VM as CRD does not have it.
-      const devicesObj = this.cloneVM?.spec?.template?.spec?.domain?.devices;
-
-      if (devicesObj && devicesObj.hostDevices === undefined) {
-        set(devicesObj, 'hostDevices', []);
-      }
-
-      const oldVM = JSON.parse(JSON.stringify(this.cloneVM));
-      const newVM = JSON.parse(JSON.stringify(cloneDeepNewVM));
-
-      // we won't show restart dialog in yaml page as we don't have a way to detect change in yaml editor.
-      // only check VM is changed in form page.
-      if (isEqual(oldVM, newVM)) {
-        return;
-      }
+      // if no restart is needed (either no changes or only size changed)
+      if (!needsRestart) return;
 
       return new Promise((resolve) => {
         this.isOpen = true;
@@ -892,7 +898,10 @@ export default {
               />
             </div>
 
-            <div class="col span-6">
+            <div
+              v-if="!value.vmMachineTypeAutoFeatureEnabled"
+              class="col span-6"
+            >
               <LabeledSelect
                 v-model:value="machineType"
                 label-key="harvester.virtualMachine.input.MachineType"

pkg/harvester/edit/loadbalancer.harvesterhci.io.ippool/Priority.vue

@@ -39,6 +39,10 @@ export default {
       return this.mode === _VIEW;
     },
 
+    disableAdd() {
+      return this.isStandaloneHarvester && this.rows.some((row) => row.namespace === '*');
+    },
+
     showAdd() {
       return !this.isView;
     },
@@ -141,6 +145,7 @@ export default {
     >
       <button
         type="button"
+        :disabled="disableAdd"
         class="btn role-tertiary add"
         @click="add()"
       >

pkg/harvester/edit/loadbalancer.harvesterhci.io.ippool/PriorityRow.vue

@@ -66,17 +66,26 @@ export default {
     },
 
     namespaceOptions() {
-      const out = (this.filteredNamespaces || []).map((namespace) => {
-        return {
-          label: namespace.metadata.name,
-          value: namespace.id,
-        };
-      });
+      const namespaces = this.filteredNamespaces;
+      const selected = this.rows.map((r) => r?.namespace);
+
+      if (this.isStandaloneHarvester) {
+        return [
+          { label: this.t('generic.all'), value: '*' },
+          ...namespaces.map((ns) => ({
+            label:    ns.metadata.name,
+            value:    ns.id,
+            disabled: selected.includes(ns.id) && ns.id !== this.row.namespace
+          }))
+        ];
+      }
 
       return [{
         label: this.t('generic.all'),
         value: '*',
-      }, ...out];
+      },
+      ...namespaces.map((ns) => ({ label: ns.metadata.name, value: ns.id }))
+      ];
     },
 
     guestClusterOptions() {

pkg/harvester/edit/networking.k8s.io.networkpolicy.vue

@@ -0,0 +1,42 @@
+<script>
+import NetworkPolicy from '@shell/edit/networking.k8s.io.networkpolicy';
+import { Banner } from '@components/Banner';
+import { DOC } from '../config/doc-links';
+import { docLink } from '../utils/feature-flags';
+
+export default {
+  components: {
+    NetworkPolicy,
+    Banner
+  },
+
+  computed: {
+    networkPolicyDocLink() {
+      const version = this.$store.getters['harvester-common/getServerVersion']();
+
+      return docLink(DOC.NETWORK_POLICY, version);
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="network-policy-edit">
+    <Banner color="info">
+      <t
+        k="harvester.networkPolicy.banner"
+        :url="networkPolicyDocLink"
+        :raw="true"
+      />
+    </Banner>
+    <NetworkPolicy v-bind="$attrs" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .network-policy-edit {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+  }
+</style>

pkg/harvester/l10n/en-us.yaml

@@ -236,6 +236,7 @@ harvester:
     shutdown: Shut Down
     powerOn: Power On
     reboot: Reboot
+    reconnect: Reconnect
     forceStop: Force Stop
   formatters:
     hardwareResourceGauge:
@@ -271,6 +272,7 @@ harvester:
     cronExpression: Cron Expression
     retain: Retain
     scheduleType: Type
+    configuredProfiles: Configured Profiles
     maxFailure: Max Failure
     sourceVm: Source Virtual Machine
     vmSchedule: Virtual Machine Schedule
@@ -403,7 +405,7 @@ harvester:
       sha512: 'Invalid SHA512 checksum.'
     subnet:
       excludeIps: 'Exclude IPs cannot be empty. Please remove or fill in the exclude IPs.'
-
+      aclEmptyError: The fields in subnet access control list rule can not be empty.
   dashboard:
     label: Dashboard
     header: "Harvester Cluster: {cluster}"
@@ -836,6 +838,7 @@ harvester:
       snapshots: Snapshots
       datasource: Data Source
       details: Details
+      conditions: Conditions
     size: Size
     volumeMode: Volume Mode
     source: Source
@@ -1044,6 +1047,13 @@ harvester:
     gateway:
       label: Gateway IP
       placeholder: e.g. 172.20.0.1
+    dhcp:
+      label: Dynamic Host Configuration Protocol (DHCP)
+      v4Options: DHCPV4Options
+      v6Options: DHCPV6Options
+      placeholder: key1=value1, key2=value2
+      dhcpOptionBanner: DHCP options is a key/value string concatenate with comma. For more detail, please refer to <a href="https://kubeovn.github.io/docs/v1.13.x/en/kubevirt/dhcp/" target="_blank">KubOVN document</a>
+      tooltip: Enable DHCP server for this subnet. When enabled, VMs can automatically obtain IP addresses from this subnet.
     private:
       label: Private Subnet
       tooltip: Enable network isolation for this Subnet. When enabled, VMs can only communicate within this subnet, even if other subnets exist under the same VPC.
@@ -1054,6 +1064,23 @@ harvester:
       placeholder: e.g. 172.16.0.0/16
     excludeIPs:
       tooltip: The IP address list to reserve from automatic assignment. The gateway IP address is always excluded and will be automatically added to the list.
+    acl:
+      label: Access Control List
+      tooltip: The ACL to apply to this Subnet. Must be one of the ACLs in the same namespace.
+      action:
+        label: Action
+        placeholder: Please select an action
+      direction:
+        label: Direction
+        placeholder: Please select a direction
+      addRule: Add Rule
+      priority:
+        label: Priority
+        placeholder: Please select a priority
+      match:
+        label: Match
+        placeholder: e.g. ip4.dst == 10.10.0.2
+      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:
     noAddonEnabled:
@@ -1080,6 +1107,10 @@ harvester:
         placeholder: e.g. 169.254.0.1/16
       remoteVpc:
         label: Remote VPC
+      infoBanner: The static route destination CIDR must cover all subnets CIDR from remote VPC Peer. Read <a href="{url}" target="_blank">VPC Peering Configuration Examples</a> for more information.
+  networkPolicy:
+    label: Network Policies
+    banner: The network policies must be used for VMs attached to overlay networks. Please read the <a href="{url}" target="_blank">harvester document</a> how the network policy works.
   network:
     label: Virtual Machine Networks
     tabs:
@@ -1238,6 +1269,21 @@ harvester:
     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.
+    kubevirtMigration:
+      parseError: "Failed to parse configuration: {error}"
+      parallelMigrationsPerCluster: "Parallel Migrations Per Cluster"
+      parallelOutboundMigrationsPerNode: "Parallel Outbound Migrations Per Node"
+      bandwidthPerMigration: "Bandwidth Per Migration"
+      bandwidthPerMigrationTooltip: '0 is KubeVirt default, representing unlimited bandwidth'
+      completionTimeoutPerGiB: "Completion Timeout Per GiB"
+      progressTimeout: "Progress Timeout"
+      allowAutoConverge: "Allow Auto Converge"
+      allowPostCopy: "Allow Post Copy"
+      unsafeMigrationOverride: "Unsafe Migration Override"
+      allowWorkloadDisruption: "Allow Workload Disruption"
+      disableTLS: "Disable TLS"
+      matchSELinuxLevelOnMigration: "Match SELinux Level On Migration"
+
   cloudTemplate:
     label: Cloud Configuration Templates
     templateType: Template Type
@@ -1453,6 +1499,14 @@ harvester:
   vlanStatus:
     vlanConfig:
       label: Network Configuration
+      l2VlanMode:
+        access: Access
+        trunk: Trunk
+        label: Mode
+      vlanTrunk:
+        minId: Minimum VLAN ID
+        maxId: Maximum VLAN ID
+        add: Add VLAN Trunk
 
   clusterNetwork:
     title: Cluster Network Configuration
@@ -1626,6 +1680,26 @@ harvester:
       middle: here
       suffix: to enable it to manage your SR-IOV GPU devices.
 
+  migconfiguration:
+    label: vGPU MIG Configurations
+    infoBanner: To configure the MIG configuration, please disable it first and re-enable after editing the configuration.
+    profileSpec: Profile Specs
+    profileStatus: Profile Status
+    tableHeaders:
+      profileName: Profile Name
+      total: Total
+      vGPUID: vGPU ID
+      available: Available
+      requested: Requested
+    requested: Requested
+    available: Available
+    total: Total
+    vGPUID: vGPU ID
+    goSriovGPU: 
+      prefix: Please enable the supported GPU devices in
+      middle: SR-IOV GPU Devices
+      suffix: page to manage the vGPU MIG configurations.
+
   vgpu:
     label: vGPU Devices
     noPermission: Please contact system administrator to add Harvester add-ons first.
@@ -1718,9 +1792,8 @@ advancedSettings:
     'harv-server-version': Harvester server version.
     'harv-upgrade-checker-enabled': Specifies whether to enable Harvester upgrade check or not. Default is True.
     'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True.
-    'harv-ui-source': Configure how to load the UI source.
+    'harv-ui-source': Configure how to load the UI source. The `External` option is used to load the UI from a ui-index URL, while the `Bundled` option loads the UI from the local Harvester server.
     'harv-ui-index': 'HTML index location for the UI.'
-    'harv-ui-plugin-index': 'JS index location for the Harvester plugin UI.'
     'harv-cluster-registration-url': Registration URL for multi-cluster management.
     'harv-http-proxy': 'HTTP proxy for Harvester to access external services.'
     'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
@@ -1745,6 +1818,7 @@ advancedSettings:
     'harv-vm-migration-network': 'Segregated network for VM migration traffic.'
     '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.'
 
 typeLabel:
   kubevirt.io.virtualmachine: |-
@@ -1807,6 +1881,11 @@ typeLabel:
       one { Virtual Private Cloud }
       other { Virtual Private Clouds }
     }
+  networking.k8s.io.networkpolicy: |-
+    {count, plural,
+      one { Network Policy }
+      other { Network Policies }
+    }
   harvesterhci.io.cloudtemplate: |-
     {count, plural,
       one { Cloud Configuration Template }
@@ -1895,6 +1974,12 @@ typeLabel:
       other { vGPU Devices }
     }
 
+  devices.harvesterhci.io.migconfiguration: |-
+    {count, plural,
+      one { vGPU MIG Configuration }
+      other { vGPU  MIG Configurations }
+    }
+
   harvesterhci.io.secret: |-
     {count, plural,
       one { Secret }

pkg/harvester/list/devices.harvesterhci.io.migconfiguration.vue

@@ -0,0 +1,177 @@
+<script>
+import { STATE, NAME } from '@shell/config/table-headers';
+import { allHash } from '@shell/utils/promise';
+import Banner from '@components/Banner/Banner.vue';
+import Loading from '@shell/components/Loading';
+import ResourceTable from '@shell/components/ResourceTable';
+import { HCI } from '../types';
+import { ADD_ONS } from '../config/harvester-map';
+import MessageLink from '@shell/components/MessageLink';
+
+export default {
+  name: 'ListMIGConfigurations',
+
+  inheritAttrs: false,
+
+  components: {
+    Banner,
+    Loading,
+    ResourceTable,
+    MessageLink,
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    this.schema = this.$store.getters[`${ inStore }/schemaFor`](HCI.MIG_CONFIGURATION);
+    this.hasAddonSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.ADD_ONS);
+
+    if (this.hasSchema) {
+      try {
+        const hash = await allHash({
+          migconfigs:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.MIG_CONFIGURATION }),
+          vGpuDevices: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VGPU_DEVICE }),
+          addons:      this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS })
+        });
+
+        this.hasPCIAddon = hash.addons.find((addon) => addon.name === ADD_ONS.PCI_DEVICE_CONTROLLER)?.spec?.enabled === true;
+        this.hasSriovgpuAddon = hash.addons.find((addon) => addon.name === ADD_ONS.NVIDIA_DRIVER_TOOLKIT_CONTROLLER)?.spec?.enabled === true;
+        this.hasSRIOVGPUSchema = !!this.$store.getters[`${ inStore }/schemaFor`](HCI.SR_IOVGPU_DEVICE);
+
+        if (this.hasSRIOVGPUSchema) {
+          await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOVGPU_DEVICE });
+        }
+        this.rows = hash.migconfigs;
+      } catch (e) {}
+    }
+  },
+
+  data() {
+    return {
+      rows:              [],
+      schema:            null,
+      hasAddonSchema:    false,
+      hasPCIAddon:       false,
+      hasSriovgpuAddon:  false,
+      hasSRIOVGPUSchema: false,
+      toVGpuAddon:       `${ HCI.ADD_ONS }/harvester-system/${ ADD_ONS.NVIDIA_DRIVER_TOOLKIT_CONTROLLER }?mode=edit`,
+      toPciAddon:        `${ HCI.ADD_ONS }/harvester-system/${ ADD_ONS.PCI_DEVICE_CONTROLLER }?mode=edit`,
+      SRIOVGPUPage:      `${ HCI.ADD_ONS }/harvester-system/${ ADD_ONS.NVIDIA_DRIVER_TOOLKIT_CONTROLLER }?mode=edit`,
+    };
+  },
+
+  computed: {
+    hasSchema() {
+      return !!this.schema;
+    },
+
+    rowsData() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const rows = this.$store.getters[`${ inStore }/all`](HCI.MIG_CONFIGURATION) || [];
+
+      return rows;
+    },
+
+    sriovGPUPage() {
+      return {
+        name:   'harvester-c-cluster-resource',
+        params: { cluster: this.$store.getters['clusterId'], resource: HCI.SR_IOVGPU_DEVICE },
+      };
+    },
+
+    showEnableSRIOVGPUMessage() {
+      return this.rowsData.length === 0;
+    },
+
+    headers() {
+      const cols = [
+        STATE,
+        NAME,
+        {
+          name:  'address',
+          label: 'Address',
+          value: 'spec.gpuAddress',
+          sort:  ['spec.gpuAddress']
+        },
+        {
+          name:     'Configured Profile',
+          label:    'Configured Count',
+          labelKey: 'harvester.tableHeaders.configuredProfiles',
+          value:    'configuredProfiles',
+          sort:     ['configuredProfiles'],
+          align:    'center'
+        },
+        {
+          name:        'status',
+          label:       'Status',
+          labelKey:    'tableHeaders.status',
+          sort:        ['status.status'],
+          value:       'status.status',
+        },
+      ];
+
+      return cols;
+    },
+  }
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <div v-else-if="!hasAddonSchema">
+    <Banner color="warning">
+      {{ t('harvester.vgpu.noPermission') }}
+    </Banner>
+  </div>
+  <div v-else-if="!hasSriovgpuAddon || !hasPCIAddon">
+    <Banner
+      v-if="!hasSriovgpuAddon"
+      color="warning"
+    >
+      <MessageLink
+        :to="toVGpuAddon"
+        prefix-label="harvester.vgpu.goSetting.prefix"
+        middle-label="harvester.vgpu.goSetting.middle"
+        suffix-label="harvester.vgpu.goSetting.suffix"
+      />
+    </Banner>
+    <Banner
+      v-if="!hasPCIAddon"
+      color="warning"
+    >
+      <MessageLink
+        :to="toPciAddon"
+        prefix-label="harvester.pci.goSetting.prefix"
+        middle-label="harvester.pci.goSetting.middle"
+        suffix-label="harvester.pci.goSetting.suffix"
+      />
+    </Banner>
+  </div>
+  <div v-else-if="hasSchema">
+    <Banner
+      v-if="showEnableSRIOVGPUMessage"
+      color="warning"
+    >
+      <MessageLink
+        :to="sriovGPUPage"
+        prefix-label="harvester.migconfiguration.goSriovGPU.prefix"
+        middle-label="harvester.migconfiguration.goSriovGPU.middle"
+        suffix-label="harvester.migconfiguration.goSriovGPU.suffix"
+      />
+    </Banner>
+    <Banner
+      v-if="!showEnableSRIOVGPUMessage"
+      color="warning"
+      :label="t('harvester.migconfiguration.infoBanner')"
+    />
+    <ResourceTable
+      v-bind="$attrs"
+      :groupable="false"
+      :namespaced="false"
+      :headers="headers"
+      :schema="schema"
+      :rows="rowsData"
+      key-field="_key"
+    />
+  </div>
+</template>

pkg/harvester/list/harvesterhci.io.virtualmachinebackup.vue

@@ -4,7 +4,7 @@ import Loading from '@shell/components/Loading';
 import MessageLink from '@shell/components/MessageLink';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import ResourceTable from '@shell/components/ResourceTable';
-
+import { isBackupTargetSettingEmpty } from '../utils/setting';
 import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 import FilterVMSchedule from '../components/FilterVMSchedule';
 import { HCI } from '../types';
@@ -39,7 +39,7 @@ export default {
     this.settings = hash.settings;
     if (this.$store.getters[`${ inStore }/schemaFor`](HCI.SETTING)) {
       const backupTargetResource = hash.settings.find( (O) => O.id === 'backup-target');
-      const isEmpty = this.getBackupTargetValueIsEmpty(backupTargetResource);
+      const isEmpty = isBackupTargetSettingEmpty(backupTargetResource);
 
       if (backupTargetResource && !isEmpty) {
         this.testConnect();
@@ -78,20 +78,6 @@ export default {
       }
     },
 
-    getBackupTargetValueIsEmpty(resource) {
-      let out = true;
-
-      if (resource?.value) {
-        try {
-          const valueJson = JSON.parse(resource?.value);
-
-          out = !valueJson.type;
-        } catch (e) {}
-      }
-
-      return out;
-    },
-
     getRow(row) {
       return row.status && row.status.source;
     },
@@ -183,11 +169,9 @@ export default {
     backupTargetResource() {
       return this.settings.find((O) => O.id === 'backup-target');
     },
-
     isEmptyValue() {
-      return this.getBackupTargetValueIsEmpty(this.backupTargetResource);
+      return isBackupTargetSettingEmpty(this.backupTargetResource);
     },
-
     canUpdate() {
       return this?.backupTargetResource?.canUpdate;
     },

pkg/harvester/list/kubevirt.io.virtualmachine.vue

@@ -74,7 +74,7 @@ export default {
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
     const _hash = {
-      vms:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
+      vms:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM, opt: { force: true } }),
       pod:     this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
       pvcs:    this.$store.dispatch(`${ inStore }/findAll`, { type: PVC }),
       pvs:     this.$store.dispatch(`${ inStore }/findAll`, { type: PV }),

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

@@ -273,7 +273,7 @@ export default {
 
     needNewSecret() {
       // When creating a template it is always necessary to create a new secret.
-      return this.showYaml ? false : this.resourceType === HCI.VM_VERSION || this.isCreate;
+      return this.isCreate ? true : this.showYaml ? false : this.resourceType === HCI.VM_VERSION;
     },
 
     defaultTerminationSetting() {
@@ -299,9 +299,11 @@ export default {
   async created() {
     await this.$store.dispatch(`${ this.inStore }/findAll`, { type: SECRET });
 
-    if (this.value.vmMachineTypesFeatureEnabled) {
+    if (!this.value.vmMachineTypeAutoFeatureEnabled) {
       try {
-        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl']('v1/harvester/clusters/local?link=machineTypes');
+        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl'](
+          'v1/harvester/clusters/local?link=machineTypes'
+        );
         const machineTypes = await this.$store.dispatch('harvester/request', { url });
 
         this.machineTypes = machineTypes;
@@ -702,7 +704,7 @@ export default {
     parseDiskRows(disk) {
       const disks = [];
       const volumes = [];
-      const diskNameLables = [];
+      const diskNameLabels = [];
       const volumeClaimTemplates = [];
 
       disk.forEach( (R, index) => {
@@ -724,7 +726,7 @@ export default {
 
         disks.push(_disk);
         volumes.push(_volume);
-        diskNameLables.push(dataVolumeName);
+        diskNameLabels.push(dataVolumeName);
 
         if (R.source !== SOURCE_TYPE.CONTAINER) {
           volumeClaimTemplates.push(_dataVolumeTemplate);
@@ -765,6 +767,9 @@ export default {
         }
       }
 
+      const specDisks = this.spec?.template?.spec?.domain?.devices?.disks;
+      const mergedDisks = this.mergeDeviceList(specDisks, disks);
+
       let spec = {
         ...this.spec,
         runStrategy: this.runStrategy,
@@ -787,7 +792,7 @@ export default {
               ...this.spec.template?.spec?.domain,
               devices: {
                 ...this.spec.template?.spec?.domain?.devices,
-                disks,
+                disks: mergedDisks,
               },
             },
             volumes,
@@ -886,13 +891,16 @@ export default {
         interfaces.push(_interface);
       });
 
+      const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
+      const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
+
       const spec = {
         ...this.spec.template.spec,
         domain: {
           ...this.spec.template.spec.domain,
           devices: {
             ...this.spec.template.spec.domain.devices,
-            interfaces,
+            interfaces: mergedInterfaces,
           },
         },
         networks
@@ -1035,7 +1043,9 @@ export default {
     },
 
     parseVolumeClaimTemplate(R, dataVolumeName) {
-      if (!String(R.size).includes('Gi') && R.size) {
+      const sizeString = String(R.size);
+
+      if (!(sizeString.includes('Gi') || sizeString.includes('Ti')) && R.size) {
         R.size = `${ R.size }${ GIBIBYTE }`;
       }
 
@@ -1526,6 +1536,49 @@ export default {
       this.refreshYamlEditor();
     },
 
+    mergeInterfaceList(specInterfaceList, interfaceList) {
+      if (!specInterfaceList || specInterfaceList.length === 0) {
+        return interfaceList;
+      }
+      const specInterfaceMap = new Map(specInterfaceList.map((iface) => [iface.name, iface]));
+
+      return interfaceList.map((iface) => {
+        const specInterface = specInterfaceMap.get(iface.name);
+
+        if (specInterface) {
+          const merged = { ...specInterface, ...iface };
+
+          // currently we only have bridge and masquerade network type, they are mutually exclusive
+          if (iface['bridge']) {
+            delete merged['masquerade'];
+          } else {
+            delete merged['bridge'];
+          }
+
+          return merged;
+        }
+
+        return iface;
+      });
+    },
+
+    mergeDeviceList(specDeviceList, deviceList) {
+      if (!specDeviceList || specDeviceList.length === 0) {
+        return deviceList;
+      }
+      const specDeviceMap = new Map(specDeviceList.map((device) => [device.name, device]));
+
+      return deviceList.map((device) => {
+        const specDevice = specDeviceMap.get(device.name);
+
+        if (specDevice) {
+          return { ...specDevice, ...device };
+        }
+
+        return device;
+      });
+    },
+
     refreshYamlEditor() {
       this.$nextTick(() => {
         this.$refs.yamlEditor?.updateValue();

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

@@ -0,0 +1,116 @@
+import SteveModel from '@shell/plugins/steve/steve-class';
+import { escapeHtml } from '@shell/utils/string';
+import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
+
+/**
+ * Class representing vGPU MIGConfiguration resource.
+ * @extends SteveModal
+ */
+export default class MIGCONFIGURATION extends SteveModel {
+  get _availableActions() {
+    let out = super._availableActions;
+
+    out = out.map((action) => {
+      if (action.action === 'showConfiguration') {
+        return { ...action, enabled: !this.spec.enabled };
+      } else if (action.action === 'goToEditYaml') {
+        return { ...action, enabled: !this.spec.enabled };
+      } else if (action.action === 'goToEdit') {
+        // need to wait for status to be disabled or empty value, then allow user to editConfig
+        return { ...action, enabled: !this.spec.enabled && ['disabled', ''].includes(this.configStatus) };
+      } else {
+        return action;
+      }
+    });
+
+    out.push(
+      {
+        action:  'enableConfig',
+        enabled: !this.isEnabled,
+        icon:    'icon icon-fw icon-dot',
+        label:   'Enable',
+      },
+      {
+        action:  'disableConfig',
+        enabled: this.isEnabled,
+        icon:    'icon icon-fw icon-dot-open',
+        label:   'Disable',
+      },
+    );
+
+    return out;
+  }
+
+  get canYaml() {
+    return false;
+  }
+
+  get disableResourceDetailDrawer() {
+    return true;
+  }
+
+  get canDelete() {
+    return false;
+  }
+
+  get configStatus() {
+    return this.status.status;
+  }
+
+  get actualState() {
+    return this.isEnabled ? 'Enabled' : 'Disabled';
+  }
+
+  get stateDisplay() {
+    return this.actualState;
+  }
+
+  get stateColor() {
+    const state = this.actualState;
+
+    return colorForState(state);
+  }
+
+  get isEnabled() {
+    return this.spec.enabled;
+  }
+
+  get configuredProfiles() {
+    const configuredProfiles = this.spec?.profileSpec?.filter((p) => p.requested > 0) || [];
+
+    if (configuredProfiles.length === 0) {
+      return '';
+    }
+
+    return configuredProfiles
+      .map((profile) => `${ profile.name } * ${ profile.requested }`)
+      .join(', ');
+  }
+
+  async enableConfig() {
+    try {
+      this.spec.enabled = true;
+      await this.save();
+    } catch (err) {
+      this.$dispatch('growl/fromError', {
+        title: this.t('generic.notification.title.error', { name: escapeHtml(this.name) }),
+        err,
+      }, { root: true });
+    }
+  }
+
+  async disableConfig() {
+    const { enabled: currentEnabled } = this.spec;
+
+    try {
+      this.spec.enabled = false;
+      await this.save();
+    } catch (err) {
+      this.spec.enabled = currentEnabled;
+      this.$dispatch('growl/fromError', {
+        title: this.t('generic.notification.title.error', { name: escapeHtml(this.name) }),
+        err,
+      }, { root: true });
+    }
+  }
+}

pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js

@@ -2,7 +2,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 import { HCI } from '@shell/config/labels-annotations';
 import { NETWORK_TYPE } from '../config/types';
 
-const { UNTAGGED } = NETWORK_TYPE;
+const { UNTAGGED, OVERLAY, L2TRUNK_VLAN } = NETWORK_TYPE;
 
 export default class NetworkAttachmentDef extends SteveModel {
   applyDefaults() {
@@ -45,7 +45,7 @@ export default class NetworkAttachmentDef extends SteveModel {
   }
 
   get vlanId() {
-    return this.vlanType === UNTAGGED ? 'N/A' : this.parseConfig.vlan;
+    return this.vlanType === UNTAGGED || this.vlanType === OVERLAY || this.vlanType === L2TRUNK_VLAN ? 'N/A' : this.parseConfig.vlan;
   }
 
   get customValidationRules() {
@@ -68,7 +68,7 @@ export default class NetworkAttachmentDef extends SteveModel {
     const route = annotations[HCI.NETWORK_ROUTE];
     let config = {};
 
-    if (this.vlanType === UNTAGGED) {
+    if (this.vlanType === UNTAGGED || this.vlanType === OVERLAY || this.vlanType === L2TRUNK_VLAN) {
       return 'N/A';
     }
 

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

@@ -14,6 +14,7 @@ import { BACKUP_TYPE } from '../config/types';
 import { HCI } from '../types';
 import HarvesterResource from './harvester';
 import { getVmCPUMemoryValues } from '../utils/cpuMemory';
+import { isBackupTargetSettingUnavailable } from '../utils/setting';
 
 export const OFF = 'Off';
 
@@ -152,7 +153,7 @@ export default class VirtVm extends HarvesterResource {
       },
       {
         action:  'backupVM',
-        enabled: !!this.actions?.backup,
+        enabled: !!this.actions?.backup && !this.isBackupTargetUnavailable,
         icon:    'icon icon-backup',
         label:   this.t('harvester.action.backup')
       },
@@ -1235,8 +1236,15 @@ export default class VirtVm extends HarvesterResource {
     return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
   }
 
-  get vmMachineTypesFeatureEnabled() {
-    return this.$rootGetters['harvester-common/getFeatureEnabled']('vmMachineTypes');
+  get vmMachineTypeAutoFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('vmMachineTypeAuto');
+  }
+
+  get isBackupTargetUnavailable() {
+    const allSettings = this.$rootGetters['harvester/all'](HCI.SETTING) || [];
+    const backupTargetSetting = allSettings.find( (O) => O.id === 'backup-target');
+
+    return isBackupTargetSettingUnavailable(backupTargetSetting);
   }
 
   setInstanceLabels(val) {

pkg/harvester/models/network.harvesterhci.io.vlanconfig.js

@@ -16,7 +16,10 @@ export default class HciVlanConfig extends HarvesterResource {
       uplink: {
         nics:           [],
         linkAttributes: {},
-        bondOptions:    { mode: 'active-backup' },
+        bondOptions:    {
+          mode:   'active-backup',
+          miimon: -1
+        },
       },
     };
 

pkg/harvester/package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.6.1-rc2",
+  "version": "1.7.0-rc1",
   "private": false,
   "rancher": {
     "annotations": {
       "catalog.cattle.io/display-name": "Harvester",
       "catalog.cattle.io/kube-version": ">= 1.16.0-0",
-      "catalog.cattle.io/rancher-version": ">= 2.12.0-0",
+      "catalog.cattle.io/rancher-version": ">= 2.13.0-0",
       "catalog.cattle.io/ui-extensions-version": ">= 3.0.0 < 4.0.0"
     }
   },

pkg/harvester/pages/c/_cluster/airgapupgrade/index.vue

@@ -215,19 +215,18 @@ export default {
         if (this.imageSource === IMAGE_METHOD.NEW) {
           this.imageValue.metadata.annotations[HCI_ANNOTATIONS.OS_UPGRADE_IMAGE] = 'True';
 
-          if (this.sourceType === UPLOAD && this.uploadImageId !== '') {
+          if (this.sourceType === UPLOAD && this.uploadImageId !== '') { // upload new image
             this.value.spec.image = this.uploadImageId;
-          } else if (this.sourceType === DOWNLOAD) {
+          } else if (this.sourceType === DOWNLOAD) { // give URL to download new image
             this.imageValue.spec.sourceType = DOWNLOAD;
-
             if (!this.imageValue.spec.url) {
               this.errors.push(this.$store.getters['i18n/t']('harvester.setting.upgrade.imageUrl'));
               buttonCb(false);
 
               return;
             }
-
             res = await this.imageValue.save();
+
             this.value.spec.image = res.id;
           }
         } else if (this.imageSource === IMAGE_METHOD.EXIST) {
@@ -247,7 +246,6 @@ export default {
         if (this.skipSingleReplicaDetachedVolFeatureEnabled) {
           this.value.metadata.annotations = { [HCI_ANNOTATIONS.SKIP_SINGLE_REPLICA_DETACHED_VOL]: JSON.stringify(this.skipSingleReplicaDetachedVol) };
         }
-
         await this.value.save();
         this.done();
         buttonCb(true);
@@ -334,6 +332,22 @@ export default {
   },
 
   watch: {
+    async sourceType(neu) {
+      if (neu === DOWNLOAD && this.imageValue && this.uploadController) {
+        if (this.uploadController) {
+          this.uploadController.abort();
+        }
+
+        try {
+          await this.imageValue.remove();
+          await this.initImageValue();
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.error('Error occurred while removing imageValue:', error);
+        }
+      }
+    },
+
     imageSource(neu) {
       if (neu !== IMAGE_METHOD.DELETE) {
         this.deleteImageId = '';

pkg/harvester/types.ts

@@ -44,6 +44,7 @@ export const HCI = {
   SR_IOVGPU_DEVICE:    'devices.harvesterhci.io.sriovgpudevice',
   USB_DEVICE:          'devices.harvesterhci.io.usbdevice',
   USB_CLAIM:           'devices.harvesterhci.io.usbdeviceclaim',
+  MIG_CONFIGURATION:   'devices.harvesterhci.io.migconfiguration',
   VLAN_CONFIG:         'network.harvesterhci.io.vlanconfig',
   VLAN_STATUS:         'network.harvesterhci.io.vlanstatus',
   ADD_ONS:             'harvesterhci.io.addon',
@@ -53,7 +54,7 @@ export const HCI = {
   LB:                  'loadbalancer.harvesterhci.io.loadbalancer',
   IP_POOL:             'loadbalancer.harvesterhci.io.ippool',
   HARVESTER_CONFIG:    'rke-machine-config.cattle.io.harvesterconfig',
-  LVM_VOLUME_GROUP:    'harvesterhci.io.lvmvolumegroup'
+  LVM_VOLUME_GROUP:    'harvesterhci.io.lvmvolumegroup',
 };
 
 export const VOLUME_SNAPSHOT = 'snapshot.storage.k8s.io.volumesnapshot';

pkg/harvester/utils/setting.js

@@ -0,0 +1,25 @@
+
+export function isBackupTargetSettingEmpty(setting = {}) {
+  let isEmpty = true;
+
+  if (setting?.value) {
+    try {
+      const valueJson = JSON.parse(setting?.value);
+
+      isEmpty = !valueJson.type;
+    } catch (e) {
+      // eslint-disable-next-line no-console
+      console.error('Failed to parse backup target value:', e);
+    }
+  }
+
+  return isEmpty;
+}
+
+export function isBackupTargetSettingUnavailable(setting = {}) {
+  const errorMessage = setting.errorMessage;
+  const isEmptyValue = isBackupTargetSettingEmpty(setting);
+  const canUpdate = setting.canUpdate;
+
+  return (errorMessage || isEmptyValue) && canUpdate;
+}

pkg/harvester/validators/vm-image.js

@@ -2,30 +2,78 @@ import { HCI } from '@pkg/harvester/config/labels-annotations';
 
 export const VM_IMAGE_FILE_FORMAT = ['qcow', 'qcow2', 'raw', 'img', 'iso'];
 
+/**
+ * Extracts the filename from a URL, handling query parameters and fragments
+ * @param {string} url - The URL to parse
+ * @returns {string} - The filename without query params or fragments
+ */
+function getFilenameFromUrl(url) {
+  try {
+    // Try to parse as a full URL
+    const urlObj = new URL(url);
+    // Get pathname and extract the last segment
+    const pathname = urlObj.pathname;
+
+    return pathname.split('/').filter(Boolean).pop() || '';
+  } catch (e) {
+    // If URL parsing fails, treat as a relative path
+    // Remove query params and fragments manually
+    const cleanUrl = url.split('?')[0].split('#')[0];
+
+    return cleanUrl.split('/').pop() || '';
+  }
+}
+
+/**
+ * Validates image URL format
+ * @param {string} url - The image URL to validate
+ * @param {object} getters - Vuex getters
+ * @param {array} errors - Array to collect validation errors
+ * @param {any} validatorArgs - Additional validator arguments
+ * @param {string} type - Type of validation ('file' or other)
+ * @returns {array} - Array of validation errors
+ */
 export function imageUrl(url, getters, errors, validatorArgs, type) {
+  const tipString =
+    type === 'file' ? 'harvester.validation.image.ruleFileTip' : 'harvester.validation.image.ruleTip';
   const t = getters['i18n/t'];
 
   if (!url || url === '') {
     return errors;
   }
 
-  const suffixName = url.split('/').pop();
-  const fileSuffix = suffixName.split('.').pop().toLowerCase();
+  // Extract filename, handling query parameters and fragments
+  const filename = getFilenameFromUrl(url);
+
+  if (!filename) {
+    errors.push(t(tipString));
+
+    return errors;
+  }
+
+  // Get file extension
+  const fileSuffix = filename.split('.').pop().toLowerCase();
 
   if (!VM_IMAGE_FILE_FORMAT.includes(fileSuffix)) {
-    const tipString = type === 'file' ? 'harvester.validation.image.ruleFileTip' : 'harvester.validation.image.ruleTip';
-
     errors.push(t(tipString));
   }
 
   return errors;
 }
 
-export function fileRequired(annotations = {}, getters, errors, validatorArgs, type) {
+export function fileRequired(
+  annotations = {},
+  getters,
+  errors,
+  validatorArgs,
+  type
+) {
   const t = getters['i18n/t'];
 
   if (!annotations[HCI.IMAGE_NAME]) {
-    errors.push(t('validation.required', { key: t('harvester.image.fileName') }));
+    errors.push(
+      t('validation.required', { key: t('harvester.image.fileName') })
+    );
   }
 
   return errors;

yarn.lock

@@ -3114,9 +3114,9 @@
     "@types/node" "*"
 
 "@types/node@*", "@types/node@20.10.8", "@types/node@^14.14.31", "@types/node@~20.19.0":
-  version "20.19.19"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.19.tgz#18c8982becd5728f92e5f1939f2f3dc85604abcd"
-  integrity sha512-pb1Uqj5WJP7wrcbLU7Ru4QtA0+3kAXrkutGiD26wUKzSMgNNaPARTUDQmElUXp64kh3cWdou3Q0C7qwwxqSFmg==
+  version "20.19.24"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.24.tgz#6bc35bc96cda1a251000b706c76380b5c843f30b"
+  integrity sha512-FE5u0ezmi6y9OZEzlJfg37mqqf6ZDSF2V/NLjUyGrR9uTZ7Sb9F7bLNZ03S4XVUNRWGA7Ck4c1kK+YnuWjl+DA==
   dependencies:
     undici-types "~6.21.0"
 
@@ -11372,10 +11372,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-roarr@7.21.1:
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/roarr/-/roarr-7.21.1.tgz#fd6452ca822a65f736c35e5372f04ee9f2ca3851"
-  integrity sha512-3niqt5bXFY1InKU8HKWqqYTYjtrBaxBMnXELXCXUYgtNYGUtZM5rB46HIC430AyacL95iEniGf7RgqsesykLmQ==
+roarr@7.21.2:
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/roarr/-/roarr-7.21.2.tgz#15ae59a04aad05c8c42508dd55fcd2cd286f1fc0"
+  integrity sha512-RyXI+aNxwVyfF71a9cqz/jhXWbycnVh7GXnnJUniIBXKTOJQF3rmpNexStXt8TUcKyiXCwyfYzboZLMYUllPDA==
   dependencies:
     fast-printf "^1.6.9"
     safe-stable-stringify "^2.4.3"
@@ -11525,10 +11525,10 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-"semver@2 || 3 || 4 || 5", semver@7.7.2, semver@^5.5.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0, semver@^7.6.3, semver@~7.0.0:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
-  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+"semver@2 || 3 || 4 || 5", semver@7.7.3, semver@^5.5.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0, semver@^7.6.3, semver@~7.0.0:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
 send@0.17.1:
   version "0.17.1"