ci: build UI artifact

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

.github/pull_request_template.md

@@ -1,19 +1,14 @@
+<!-- This template is for Devs to give QA details before moving the issue To-Test -->
 ### Summary
-<!-- Give the fix root cause or feature requirement, at least list what this PR changes  -->
 
-
+### PR Checklists
-### PR Checklist
-<!-- Check Yes if there is backend PR related to this UI PR, tag the backend owner's Github account  -->
 - Are backend engineers aware of UI changes ?
-    - [ ] Yes, the backend owner is @
+    - [ ] Yes, the backend owner is:
-    - [ ] No, frontend-only.
 
 ### Related Issue #
- <!-- Link the issue as harvester/harvester#<issue_number> -->
+<!-- Define findings related to the feature or bug issue. -->
- harvester/harvester#<issue_number>
 
-
+### Test screenshot or video
-### Test screenshot or video (Required)
 <!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary -->
 
 

.github/workflows/build-standalone-on-merge.yaml

@@ -6,12 +6,13 @@ on:
       - main
       - 'release-harvester-v*'
       - '*-dev'
-      - access_volume_mode_demo
+      - forklift-poc
   pull_request:
     branches:
       - main
       - 'release-harvester-v*'
       - '*-dev'
+      - forklift-poc
     types:
       - merged
 

AGENTS.md

@@ -1,4 +1,4 @@
-> This `./AGENTS.md` file is generated by running `yarn agents:generate`. `CLAUDE.md` and `GEMINI.md` are symlinks to this file so Claude Code, GitHub Copilot and Gemini all read the same content.
+> This `./AGENTS.md` file is generated by running `yarn agents:generate`.
 
 
 # Project Overview
@@ -28,7 +28,9 @@ You are an expert Senior Software Engineer specializing in Vue.js and TypeScript
   - Run `yarn lint:fix` before commits.
     - Use conventional commit format: 
     ```
-    <type>: <description>
+    <type>:
+
+    <description>
     ```
   - Follow existing naming conventions (PascalCase for components, camelCase for functions).
   - After changing a Vue, JS, or TS file, make sure it's automatically formatted with ESLint.
@@ -128,8 +130,8 @@ To get started, follow the `Development Setup` section.
   - `Vue.js`:
     - Composition API components are preferred over Options API.
     - Large pages with lots of code and styles should be avoided by breaking the page up into smaller Vue components.
-    - Order the Single File Component blocks as `<script>`, then `<template>`, then `<style>`.
+    - Place source tag above template above style.
-    - The `<style>` tag should include `lang="scss" scoped`.
+    - style tag should contain `lang='scss' scoped`.
   - `Linting`: Follow the ESLint configuration in the root.
 
 - **File Structure:**
@@ -161,26 +163,24 @@ To get started, follow the `Development Setup` section.
 
 ## Harvester UI Extension Development Guide
 
-### Backward Compatibility
+1. Backward Compatibility
-
+The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in pkg/config/feature-flags to ensure the UI matches the cluster's specific version.
-The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in `pkg/harvester/config/` to ensure the UI matches the cluster's specific version.
-
-### Implementation Steps for New Features
 
+2. Implementation Steps for New Features
 To add a feature in a new release, follow these steps:
 
-1. **Register**: Add a unique `[Feature Name]` to the corresponding release array in the configuration.
+    Register: Add a unique [Feature Name] to the corresponding release array in the configuration.
-2. **Check**: Use the following getter to verify if the feature is enabled for the current version:
 
-   ```js
+    Check: Use the following getter to verify if the feature is enabled for the current version:
+
+    ```
     computed: {
       newFeatureEnabled() {
         return this.$store.getters['harvester-common/getFeatureEnabled']('[Feature Name]');
       },
     },
     ```
-
+    Render: Use the result of the check to conditionally render the UI components.
-3. **Render**: Use the result of the check to conditionally render the UI components.
 
 
 ## E2E Tests (Cypress)
@@ -228,7 +228,7 @@ For the Renovate config, see `.github/renovate.json`.
 ### Commit Message Format
 All commit messages must follow the conventional commit format:
 ```
-<type>: <description>
+<type>[optional scope]: <description>
 
 [optional body]
 

CLAUDE.md

@@ -1 +0,0 @@
-./AGENTS.md

GEMINI.md

@@ -1 +0,0 @@
-./AGENTS.md

README.md

@@ -25,7 +25,7 @@ For Harvester UI extension installation instructions, please refer to the page *
 
 ## Development Setup
 
-Ensure **Node.js v24 or later** is installed for development and debugging.
+Ensure **Node.js v20 or later** is installed for development and debugging.
 
 ### Standalone Mode
 

commitlint.config.js

@@ -32,11 +32,10 @@ module.exports = {
     'subject-empty':          [2, 'never'],
     'subject-full-stop':      [2, 'never', '.'],
     'subject-max-length':     [0, 'never'],
-    'header-max-length':      [0, 'always', 100],
     'body-leading-blank':     [2, 'always'],
     'body-max-line-length':   [0, 'always', 100],
     'footer-leading-blank':   [2, 'always'],
-    'footer-max-line-length': [0, 'always', 100],
+    'footer-max-line-length': [2, 'always', 100],
   },
   // Ignore merge commits and revert commits
   ignores: [

docs/agents.md/agents/boundaries.md

@@ -6,7 +6,9 @@
   - Run `yarn lint:fix` before commits.
     - Use conventional commit format: 
     ```
-    <type>: <description>
+    <type>:
+
+    <description>
     ```
   - Follow existing naming conventions (PascalCase for components, camelCase for functions).
   - After changing a Vue, JS, or TS file, make sure it's automatically formatted with ESLint.

docs/agents.md/contributors/1_contributors.md

@@ -16,8 +16,8 @@ To get started, follow the `Development Setup` section.
   - `Vue.js`:
     - Composition API components are preferred over Options API.
     - Large pages with lots of code and styles should be avoided by breaking the page up into smaller Vue components.
-    - Order the Single File Component blocks as `<script>`, then `<template>`, then `<style>`.
+    - Place source tag above template above style.
-    - The `<style>` tag should include `lang="scss" scoped`.
+    - style tag should contain `lang='scss' scoped`.
   - `Linting`: Follow the ESLint configuration in the root.
 
 - **File Structure:**
@@ -49,24 +49,22 @@ To get started, follow the `Development Setup` section.
 
 ## Harvester UI Extension Development Guide
 
-### Backward Compatibility
+1. Backward Compatibility
-
+The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in pkg/config/feature-flags to ensure the UI matches the cluster's specific version.
-The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in `pkg/harvester/config/` to ensure the UI matches the cluster's specific version.
-
-### Implementation Steps for New Features
 
+2. Implementation Steps for New Features
 To add a feature in a new release, follow these steps:
 
-1. **Register**: Add a unique `[Feature Name]` to the corresponding release array in the configuration.
+    Register: Add a unique [Feature Name] to the corresponding release array in the configuration.
-2. **Check**: Use the following getter to verify if the feature is enabled for the current version:
 
-   ```js
+    Check: Use the following getter to verify if the feature is enabled for the current version:
+
+    ```
     computed: {
       newFeatureEnabled() {
         return this.$store.getters['harvester-common/getFeatureEnabled']('[Feature Name]');
       },
     },
     ```
-
+    Render: Use the result of the check to conditionally render the UI components.
-3. **Render**: Use the result of the check to conditionally render the UI components.
 

docs/agents.md/contributors/resolving_gh_issues.md

@@ -26,7 +26,7 @@
 ### Commit Message Format
 All commit messages must follow the conventional commit format:
 ```
-<type>: <description>
+<type>[optional scope]: <description>
 
 [optional body]
 

docs/agents.md/template_agents.md

@@ -1,4 +1,4 @@
-> This `./AGENTS.md` file is generated by running `yarn agents:generate`. `CLAUDE.md` and `GEMINI.md` are symlinks to this file so Claude Code, GitHub Copilot and Gemini all read the same content.
+> This `./AGENTS.md` file is generated by running `yarn agents:generate`.
 
 
 # Project Overview

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.10.0-dev",
+  "version": "1.9.0-dev",
   "private": false,
   "engines": {
     "node": ">=24.0.0"
@@ -21,7 +21,7 @@
     "yaml": "^2.5.1"
   },
   "resolutions": {
-    "@types/node": "25.9.5",
+    "@types/node": "25.9.4",
     "cronstrue": "2.59.0",
     "d3-color": "3.1.0",
     "ejs": "3.1.10",

pkg/harvester/components/HarvesterUpgrade.vue

@@ -55,12 +55,8 @@ export default {
         !this.latestUpgrade.isUpgradeFailed;
     },
 
-    canUpgrade() {
-      return this.versionOptions.length > 0 && !this.isUpgradeInProgress;
-    },
-
     versionOptions() {
-      const versions = this.$store.getters['harvester/all'](HCI.VERSION) || [];
+      const versions = this.$store.getters['harvester/all'](HCI.VERSION);
 
       return versions.map((V) => V.metadata.name);
     },
@@ -158,23 +154,14 @@ export default {
           :cluster="currentCluster.nameDisplay"
         />
       </h1>
-      <span
-        v-clean-tooltip="{
-          content: canUpgrade ? t('harvester.upgradePage.upgradeAvailable') : t('harvester.upgradePage.upgradeUnavailable'),
-          triggers: ['hover', 'focus', 'touch'],
-        }"
-        class="upgrade-btn-wrap"
-        :tabindex="canUpgrade ? -1 : 0"
-      >
       <button
-          :disabled="!canUpgrade"
+        v-if="versionOptions.length && !isUpgradeInProgress"
         type="button"
         class="btn bg-warning btn-sm"
         @click="open"
       >
         <t k="harvester.upgradePage.upgrade" />
       </button>
-      </span>
     </header>
 
     <ModalWithCard
@@ -309,18 +296,6 @@ export default {
     line-height: 23px;
   }
 
-  .upgrade-btn-wrap {
-    display: inline-flex;
-
-    button {
-      color: #000 !important;
-    }
-
-    button:hover {
-      color: #000 !important;
-    }
-  }
-
   .currentVersion {
     margin-top: 10px;
     display: flex;

pkg/harvester/components/vm-migration/ConfigureMappingsStep.vue

@@ -7,15 +7,9 @@ import { STORAGE_CLASS, NETWORK_ATTACHMENT } from '@shell/config/types';
 import { useI18n } from '@shell/composables/useI18n';
 import { randomStr } from '@shell/utils/string';
 import { HCI } from '../../types';
-import { VOLUME_MODE, ACCESS_MODE } from '../../config/types';
 import { FORKLIFT_NAMESPACE } from '../../config/harvester-map';
 import { buildNetworkMapEntries, buildStorageMapEntries } from '../../utils/forklift';
-import { isInternalStorageClass } from '../../utils/storage-class';
 import MappingColumn from './MappingColumn.vue';
-import StorageDefaultsModal from './StorageDefaultsModal.vue';
-
-const DEFAULT_VOLUME_MODE = VOLUME_MODE.FILE_SYSTEM;
-const DEFAULT_ACCESS_MODES = [ACCESS_MODE.READ_WRITE_MANY];
 
 const props = defineProps({
   providerName:       { type: String, default: '' },
@@ -40,10 +34,6 @@ const allStorageMaps = ref([]);
 const errors = ref([]);
 const loading = ref(true);
 
-// Storage defaults edit modal state.
-const showStorageDefaultsModal = ref(false);
-const editingStorageEntry = ref(null);
-
 const { networkEntries, storageEntries } = toRefs(props.stepData);
 
 const NAMESPACE = FORKLIFT_NAMESPACE;
@@ -66,22 +56,10 @@ const harvesterNetworkOptions = computed(() => {
 });
 
 const storageClassOptions = computed(() => {
-  const options = storageClasses.value.filter((s) => !s.parameters?.backingImage).map((sc) => {
+  const options = storageClasses.value.map((sc) => ({
-    const value = sc.name;
+    label: sc.metadata?.name || sc.id,
-    let label = sc.isDefault ? `${ value } (${ t('generic.default') })` : value;
+    value: sc.metadata?.name || sc.id,
-    let disabled = false;
+  }));
-
-    if (isInternalStorageClass(value)) {
-      label += ` (${ t('harvester.storage.internal.label') })`;
-      disabled = true;
-    }
-
-    return {
-      label,
-      value,
-      disabled,
-    };
-  });
 
   if (!options.find((o) => o.value === 'harvester-longhorn')) {
     options.unshift({ label: 'harvester-longhorn', value: 'harvester-longhorn' });
@@ -114,7 +92,7 @@ const applyNetworkMapTargets = (mapSpec) => {
   });
 };
 
-const applyStorageMapTargets = (mapSpec, { markOverridden = false, captureInherited = false } = {}) => {
+const applyStorageMapTargets = (mapSpec) => {
   if (!mapSpec) {
     return;
   }
@@ -126,30 +104,6 @@ const applyStorageMapTargets = (mapSpec, { markOverridden = false, captureInheri
 
     if (match?.destination?.storageClass) {
       entry.target = match.destination.storageClass;
-
-      if (captureInherited) {
-        entry.inheritedFromProvider = true;
-      }
-
-      if (match.destination.volumeMode) {
-        entry.volumeMode = match.destination.volumeMode;
-
-        if (captureInherited) {
-          entry.inheritedVolumeMode = match.destination.volumeMode;
-        }
-      }
-
-      if (match.destination.accessMode) {
-        entry.accessModes = [match.destination.accessMode];
-
-        if (captureInherited) {
-          entry.inheritedAccessModes = [match.destination.accessMode];
-        }
-      }
-
-      if (markOverridden) {
-        entry.overridden = true;
-      }
     }
   });
 };
@@ -167,39 +121,12 @@ const applyDefaultStorageMap = () => {
     (sm) => sm.metadata.name === `${ props.providerName }-storage-map-default`
   );
 
-  applyStorageMapTargets(defaultMap?.spec?.map, { captureInherited: true });
+  applyStorageMapTargets(defaultMap?.spec?.map);
 };
 
 const allNetworksMapped = computed(() => networkEntries.value.length > 0 && networkEntries.value.every((e) => !!e.target));
 const allStorageMapped = computed(() => storageEntries.value.length > 0 && storageEntries.value.every((e) => !!e.target));
 
-// The "Inherited from provider" hint only appears in the migration plan wizard
-// (where mappings inherit from the provider default), not on the provider creation page.
-const inheritedProviderName = computed(() => (props.useAllProviderData ? '' : props.providerName));
-
-const openStorageDefaults = (entry) => {
-  editingStorageEntry.value = entry;
-  showStorageDefaultsModal.value = true;
-};
-
-const closeStorageDefaults = () => {
-  showStorageDefaultsModal.value = false;
-  editingStorageEntry.value = null;
-};
-
-const applyStorageDefaults = ({ volumeMode, accessModes }) => {
-  if (editingStorageEntry.value) {
-    editingStorageEntry.value.volumeMode = volumeMode;
-    editingStorageEntry.value.accessModes = accessModes;
-
-    const inheritedVolumeMode = editingStorageEntry.value.inheritedVolumeMode;
-    const inheritedAccessMode = editingStorageEntry.value.inheritedAccessModes?.[0];
-    const selectedAccessMode = accessModes?.[0];
-
-    editingStorageEntry.value.overridden = volumeMode !== inheritedVolumeMode || selectedAccessMode !== inheritedAccessMode;
-  }
-};
-
 const canSave = computed(() => {
   if (props.useAllProviderData) {
     return true;
@@ -267,12 +194,6 @@ const buildStorageEntries = () => {
               type:     ds.type || '',
               capacity: 0,
               target:   '',
-              volumeMode:            DEFAULT_VOLUME_MODE,
-              accessModes:           [...DEFAULT_ACCESS_MODES],
-              inheritedVolumeMode:   DEFAULT_VOLUME_MODE,
-              inheritedAccessModes:  [...DEFAULT_ACCESS_MODES],
-              inheritedFromProvider: false,
-              overridden:            false,
               usedBy:   [],
               _key:     `stor-${ ds.id }`,
             };
@@ -309,12 +230,6 @@ const buildStorageEntriesFromProvider = (datastoresData) => {
     type:     ds.type || '',
     capacity: ds.capacity || 0,
     target:   '',
-    volumeMode:            DEFAULT_VOLUME_MODE,
-    accessModes:           [...DEFAULT_ACCESS_MODES],
-    inheritedVolumeMode:   DEFAULT_VOLUME_MODE,
-    inheritedAccessModes:  [...DEFAULT_ACCESS_MODES],
-    inheritedFromProvider: false,
-    overridden:            false,
     usedBy:   [],
     _key:     `stor-${ ds.id || ds.name }`,
   }));
@@ -533,7 +448,7 @@ const init = async() => {
 
   if (!hasExistingStorageTargets) {
     if (props.existingStorageMap?.spec?.map) {
-      applyStorageMapTargets(props.existingStorageMap.spec.map, { markOverridden: true });
+      applyStorageMapTargets(props.existingStorageMap.spec.map);
     } else {
       applyDefaultStorageMap();
     }
@@ -583,9 +498,6 @@ init();
         :placeholder="t('harvester.addons.vmMigration.configureMappings.storageMapping.placeholder')"
         :show-used-by="!useAllProviderData"
         :clearable="useAllProviderData"
-        :show-volume-settings="true"
-        :inherited-provider-name="inheritedProviderName"
-        @edit-defaults="openStorageDefaults"
       >
         <template #source-detail="{ entry }">
           <span
@@ -595,19 +507,6 @@ init();
         </template>
       </MappingColumn>
     </div>
-
-    <StorageDefaultsModal
-      v-if="showStorageDefaultsModal && editingStorageEntry"
-      :storage-class-name="editingStorageEntry.target"
-      :provider-name="providerName"
-      :show-inherited="!!inheritedProviderName"
-      :volume-mode="editingStorageEntry.volumeMode"
-      :access-modes="editingStorageEntry.accessModes"
-      :inherited-volume-mode="editingStorageEntry.inheritedVolumeMode"
-      :inherited-access-modes="editingStorageEntry.inheritedAccessModes"
-      @apply="applyStorageDefaults"
-      @close="closeStorageDefaults"
-    />
   </div>
 </template>
 

pkg/harvester/components/vm-migration/ConfigureProviderStep.vue

@@ -42,7 +42,6 @@ const {
   username,
   password,
   skipTlsVerify,
-  vddkInitImage,
   testPassed,
   testResult,
   testError,
@@ -98,7 +97,6 @@ watch(selectedProvider, (val) => {
     username.value = '';
     password.value = '';
     skipTlsVerify.value = false;
-    vddkInitImage.value = '';
     createdProvider.value = null;
     createdSecret.value = null;
   } else {
@@ -109,7 +107,6 @@ watch(selectedProvider, (val) => {
     if (provider) {
       providerName.value = provider.metadata.name;
       url.value = provider.spec?.url || '';
-      vddkInitImage.value = provider.spec?.settings?.vddkInitImage || '';
 
       const secretRef = provider.spec?.secret;
 
@@ -242,18 +239,6 @@ const testConnection = async(buttonCb) => {
   if (props.editMode && createdProvider.value) {
     try {
       createdProvider.value.spec.url = url.value;
-
-      const vddkImage = vddkInitImage.value?.trim();
-
-      if (vddkImage) {
-        createdProvider.value.spec.settings = {
-          ...(createdProvider.value.spec.settings || {}),
-          vddkInitImage: vddkImage,
-        };
-      } else if (createdProvider.value.spec.settings) {
-        delete createdProvider.value.spec.settings.vddkInitImage;
-      }
-
       await createdProvider.value.save();
 
       const secretRef = createdProvider.value.spec?.secret;
@@ -298,28 +283,20 @@ const testConnection = async(buttonCb) => {
     const namespace = FORKLIFT_NAMESPACE;
     const secretName = `${ providerName.value }-creds-${ randomStr(4).toLowerCase() }`;
 
-    const spec = {
-      type:   'vsphere',
-      url:    url.value,
-      secret: {
-        name: secretName,
-        namespace,
-      },
-    };
-
-    const vddkImage = vddkInitImage.value?.trim();
-
-    if (vddkImage) {
-      spec.settings = { vddkInitImage: vddkImage };
-    }
-
     const provider = await store.dispatch(`${ inStore }/create`, {
       type:     HCI.FORKLIFT_PROVIDER,
       metadata: {
         name: providerName.value,
         namespace,
       },
-      spec,
+      spec: {
+        type:   'vsphere',
+        url:    url.value,
+        secret: {
+          name: secretName,
+          namespace,
+        },
+      }
     });
 
     await provider.save();
@@ -425,7 +402,6 @@ defineExpose({ testConnection, clickTestButton });
         <div v-if="!createOnly && !editMode">
           <LabeledSelect
             v-model:value="selectedProvider"
-            required
             :label="t('harvester.addons.vmMigration.configureProvider.providerSelect')"
             :options="providerOptions"
             :reduce="(opt) => opt.value"
@@ -443,8 +419,7 @@ defineExpose({ testConnection, clickTestButton });
           />
         </div>
 
-        <div class="row">
+        <div>
-          <div class="col span-6">
           <LabeledInput
             v-model:value="url"
             :label="t('harvester.addons.vmMigration.configureProvider.urlLabel')"
@@ -456,16 +431,6 @@ defineExpose({ testConnection, clickTestButton });
             {{ t('harvester.addons.vmMigration.configureProvider.urlHint') }}
           </p>
         </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="vddkInitImage"
-              :label="t('harvester.addons.vmMigration.configureProvider.vddkImageLabel')"
-              :placeholder="t('harvester.addons.vmMigration.configureProvider.vddkImagePlaceholder')"
-              :tooltip="t('harvester.addons.vmMigration.configureProvider.vddkImageTooltip')"
-              :disabled="isExistingProvider && !editMode"
-            />
-          </div>
-        </div>
 
         <div class="row">
           <div class="col span-6">

pkg/harvester/components/vm-migration/MappingColumn.vue

@@ -1,9 +1,9 @@
 <script setup>
+import { computed } from 'vue';
 import { useStore } from 'vuex';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { RcItemCard } from '@components/RcItemCard';
 import { useI18n } from '@shell/composables/useI18n';
-import { VOLUME_MODE } from '../../config/types';
 
 const store = useStore();
 const { t } = useI18n(store);
@@ -16,18 +16,10 @@ const props = defineProps({
   placeholder: { type: String, default: '' },
   showUsedBy:  { type: Boolean, default: false },
   clearable:   { type: Boolean, default: false },
-  // Storage-specific: show the volume/access mode defaults row with an Edit action.
-  showVolumeSettings:    { type: Boolean, default: false },
-  // When set, the defaults row shows an "Inherited from provider" hint (migration plan wizard only).
-  inheritedProviderName: { type: String, default: '' },
 });
 
-const emit = defineEmits(['edit-defaults']);
+const selectOptions = computed(() => {
-
+  if (!props.clearable) {
-// Only offer "Remove Map" for entries that already have a target selected;
-// entries without a selection just show the regular options.
-const optionsFor = (entry) => {
-  if (!props.clearable || !entry.target) {
     return props.options;
   }
 
@@ -42,16 +34,14 @@ const optionsFor = (entry) => {
       disabled: true,
       kind:     'divider',
     },
+    {
+      label:    `${ props.placeholder }:`,
+      disabled: true,
+      kind:     'title',
+    },
     ...props.options,
   ];
-};
+});
-
-const formatModes = (entry) => {
-  const volumeMode = entry.volumeMode || VOLUME_MODE.FILE_SYSTEM;
-  const accessModes = (entry.accessModes || []).join(', ');
-
-  return t('harvester.addons.vmMigration.storageDefaults.summary', { volumeMode, accessModes });
-};
 </script>
 
 <template>
@@ -95,35 +85,12 @@ const formatModes = (entry) => {
             <div class="mapping-target">
               <LabeledSelect
                 v-model:value="entry.target"
-                :options="optionsFor(entry)"
+                :options="selectOptions"
                 :placeholder="placeholder+'...'"
                 :searchable="true"
               />
             </div>
           </div>
-          <div
-            v-if="showVolumeSettings && entry.target"
-            class="storage-defaults-row"
-          >
-            <div class="storage-defaults">
-              <div class="storage-defaults-info">
-                <span class="storage-defaults-summary">{{ formatModes(entry) }}</span>
-                <span
-                  v-if="inheritedProviderName && entry.inheritedFromProvider && !entry.overridden"
-                  class="text-deemphasized storage-defaults-inherited"
-                >
-                  {{ t('harvester.addons.vmMigration.storageDefaults.inherited', { provider: inheritedProviderName }) }}
-                </span>
-              </div>
-              <a
-                role="button"
-                class="storage-defaults-edit"
-                @click.prevent="emit('edit-defaults', entry)"
-              >
-                {{ t('harvester.addons.vmMigration.storageDefaults.edit') }}
-              </a>
-            </div>
-          </div>
           <div v-if="showUsedBy && entry.usedBy && entry.usedBy.length">
             <span class="used-by">
               {{ t('harvester.addons.vmMigration.generic.usedBy') }} <b>{{ entry.usedBy.join(', ') }}</b>
@@ -210,41 +177,6 @@ const formatModes = (entry) => {
     line-height: 20px;
   }
 
-  .storage-defaults-row {
-    width: 100%;
-  }
-
-  .storage-defaults {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 12px;
-    padding: 8px 12px;
-    border-radius: 4px;
-    background-color: var(--body-bg);
-
-    .storage-defaults-info {
-      display: flex;
-      flex-direction: column;
-      min-width: 0;
-    }
-
-    .storage-defaults-summary {
-      font-size: 13px;
-      line-height: 20px;
-    }
-
-    .storage-defaults-inherited {
-      font-size: 12px;
-      line-height: 18px;
-    }
-
-    .storage-defaults-edit {
-      flex-shrink: 0;
-      cursor: pointer;
-    }
-  }
-
   .bg-light-gray {
     background-color: var(--category-active) !important;
     border: 0;

pkg/harvester/components/vm-migration/ReviewMigrationStep.vue

@@ -2,14 +2,11 @@
 import { ref, computed, watch } from 'vue';
 import { useStore } from 'vuex';
 import Loading from '@shell/components/Loading';
-import SortableTable from '@shell/components/SortableTable';
 import { Banner } from '@components/Banner';
-import { BadgeState } from '@components/BadgeState';
+import { RcItemCard } from '@components/RcItemCard';
-import { RcDropdown, RcDropdownItem, RcDropdownTrigger } from '@components/RcDropdown';
 import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
+import MappingsCell from '../MappingsCell';
 import { useI18n } from '@shell/composables/useI18n';
-import { NAMESPACE } from '@shell/config/types';
 import { HCI } from '../../types';
 import { FORKLIFT_NAMESPACE } from '../../config/harvester-map';
 import {
@@ -24,70 +21,29 @@ const props = defineProps({
   stepData:        { type: Object, required: true },
 });
 
-const emit = defineEmits(['ready', 'edit-selection', 'edit-mappings', 'remove-vm']);
+const emit = defineEmits(['ready']);
 
 const store = useStore();
 const { t } = useI18n(store);
 
-const vms = computed(() => props.selectedVms);
+const vms = ref([]);
 const networkMappings = ref([]);
 const storageMappings = ref([]);
 const planName = ref('');
-const targetNamespace = ref('');
-const namespaceOptions = ref([]);
-const existingProviderNames = ref([]);
-const existingPlanNames = ref([]);
 const errors = ref([]);
 const loading = ref(true);
 
 // Restore persisted state
 planName.value = props.stepData.planName;
-targetNamespace.value = props.stepData.targetNamespace || '';
 
-const NS = FORKLIFT_NAMESPACE;
+const NAMESPACE = FORKLIFT_NAMESPACE;
-
+const TARGET_NAMESPACE = 'default';
-const nameConflictError = computed(() => {
-  const name = (planName.value || '').trim();
-
-  if (!name) {
-    return '';
-  }
-
-  if (existingProviderNames.value.includes(name)) {
-    return t('harvester.addons.vmMigration.reviewMigration.planNameProviderConflict', { name });
-  }
-
-  if (existingPlanNames.value.includes(name)) {
-    return t('harvester.addons.vmMigration.reviewMigration.planNamePlanConflict', { name });
-  }
-
-  return '';
-});
 
 watch(planName, (val) => {
   props.stepData.planName = val;
+  emit('ready', !!val);
 }, { immediate: true });
 
-watch(targetNamespace, (val) => {
-  props.stepData.targetNamespace = val;
-});
-
-watch([planName, targetNamespace, nameConflictError], () => {
-  emit('ready', !!planName.value && !!targetNamespace.value && !nameConflictError.value);
-}, { immediate: true });
-
-const formatNetworkTarget = (target = '') => {
-  if (target === 'pod') {
-    return t('harvester.addons.vmMigration.configureMappings.networkMapping.options.podNetworking');
-  }
-
-  if (target === 'ignored') {
-    return t('harvester.addons.vmMigration.generic.ignored');
-  }
-
-  return target;
-};
-
 const totalVCpu = computed(() => vms.value.reduce((sum, vm) => sum + (vm.cpuCount || vm.numCPU || 0), 0));
 
 const totalMemoryGB = computed(() => {
@@ -108,7 +64,7 @@ const totalStorageGB = computed(() => {
   return bytesToGB(totalBytes);
 });
 
-const vmRows = computed(() => {
+const vmCards = computed(() => {
   return vms.value.map((vm) => {
     const cpus = vm.cpuCount || vm.numCPU || 0;
     const memMB = vm.memoryMB || vm.memory || 0;
@@ -122,93 +78,23 @@ const vmRows = computed(() => {
 
     const diskDisplay = totalDiskBytes ? t('harvester.addons.vmMigration.generic.memoryGb', { value: bytesToGB(totalDiskBytes) }) : '-';
     const os = vm.guestName || vm.guestOS || vm.os || '-';
-    const rawPowerState = vm.powerState || vm.status?.phase || '-';
-    const powerState = rawPowerState.replace(/([a-z])([A-Z])/g, '$1 $2').replace(/^./, (c) => c.toUpperCase());
-    const powerStateClass = powerState.toLowerCase().includes('on') || powerState.toLowerCase().includes('running') ? 'power-on' : 'power-off';
 
     const vmNetworkMappings = networkMappings.value.filter((m) => m.usedBy && m.usedBy.includes(vm.name || vm.id));
     const vmStorageMappings = storageMappings.value.filter((m) => m.usedBy && m.usedBy.includes(vm.name || vm.id));
 
-    const networkMappingSort = vmNetworkMappings.map((m) => `${ m.source } ${ formatNetworkTarget(m.target) }`).join(', ');
-    const storageMappingSort = vmStorageMappings.map((m) => `${ m.source } ${ m.target }`).join(', ');
-
     return {
-      _key:            vm.id || vm.vmId || vm.metadata?.name,
       id:              vm.id,
       name:            vm.name || vm.id,
-      identifier:      vm.id || vm.vmId || vm.metadata?.name || '-',
       os,
-      resources:       t('harvester.addons.vmMigration.generic.vCpu', { count: cpus }),
+      cpus,
-      resourcesSub:    `${ memGB } • ${ diskDisplay }`,
+      memGB,
-      powerState,
+      diskDisplay,
-      powerStateClass,
       networkMappings: vmNetworkMappings,
       storageMappings: vmStorageMappings,
-      networkMapping:  networkMappingSort,
-      storageMapping:  storageMappingSort,
     };
   });
 });
 
-const vmHeaders = [
-  {
-    name:     'vmName',
-    labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.vmName',
-    value:    'name',
-    sort:     ['name'],
-    subLabel: t('harvester.addons.vmMigration.generic.identifier'),
-    width:    200,
-  },
-  {
-    name:     'os',
-    labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.os',
-    value:    'os',
-    sort:     ['os'],
-    width:    140,
-  },
-  {
-    name:     'resources',
-    labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.resources',
-    value:    'resources',
-    sort:     false,
-    width:    120,
-  },
-  {
-    name:     'powerState',
-    labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.powerState',
-    value:    'powerState',
-    sort:     ['powerState'],
-    width:    100,
-  },
-  {
-    name:     'networkMapping',
-    labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.networkMapping',
-    value:    'networkMapping',
-    sort:     ['networkMapping'],
-    subLabel: t('harvester.addons.vmMigration.reviewMigration.columns.sourceTarget'),
-    width:    220,
-  },
-  {
-    name:     'storageMapping',
-    labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.storageMapping',
-    value:    'storageMapping',
-    sort:     ['storageMapping'],
-    subLabel: t('harvester.addons.vmMigration.reviewMigration.columns.sourceTarget'),
-    width:    220,
-  },
-  {
-    name:  'actions',
-    label: ' ',
-    align: 'right',
-    sort:  false,
-    width: 40,
-  },
-];
-
-const onEditSelection = () => emit('edit-selection');
-const onEditMappings = () => emit('edit-mappings');
-const onRemoveVm = (id) => emit('remove-vm', id);
-
 const startMigrationAction = async() => {
   const inStore = store.getters['currentProduct'].inStore;
 
@@ -217,13 +103,13 @@ const startMigrationAction = async() => {
       apiVersion: FORKLIFT_API_VERSION,
       kind:       'Provider',
       name:       props.providerName,
-      namespace:  NS,
+      namespace:  NAMESPACE,
     },
     destination: {
       apiVersion: FORKLIFT_API_VERSION,
       kind:       'Provider',
       name:       'host',
-      namespace:  NS,
+      namespace:  NAMESPACE,
     },
   };
 
@@ -232,15 +118,15 @@ const startMigrationAction = async() => {
 
   const networkMap = await store.dispatch(`${ inStore }/create`, {
     type:     HCI.FORKLIFT_NETWORK_MAP,
-    metadata: { name: networkMapName, namespace: NS },
+    metadata: { name: networkMapName, namespace: NAMESPACE },
-    spec:     { map: buildNetworkMapEntries(props.mappingEntries?.networkEntries || [], NS), provider: providerRef },
+    spec:     { map: buildNetworkMapEntries(props.mappingEntries?.networkEntries || [], NAMESPACE), provider: providerRef },
   });
 
   await networkMap.save();
 
   const storageMap = await store.dispatch(`${ inStore }/create`, {
     type:     HCI.FORKLIFT_STORAGE_MAP,
-    metadata: { name: storageMapName, namespace: NS },
+    metadata: { name: storageMapName, namespace: NAMESPACE },
     spec:     { map: buildStorageMapEntries(props.mappingEntries?.storageEntries || []), provider: providerRef },
   });
 
@@ -248,7 +134,7 @@ const startMigrationAction = async() => {
 
   const plan = await store.dispatch(`${ inStore }/create`, {
     type:     HCI.FORKLIFT_PLAN,
-    metadata: { name: planName.value, namespace: NS },
+    metadata: { name: planName.value, namespace: NAMESPACE },
     spec:     {
       provider: providerRef,
       map:      {
@@ -256,16 +142,16 @@ const startMigrationAction = async() => {
           apiVersion: FORKLIFT_API_VERSION,
           kind:       'NetworkMap',
           name:       networkMapName,
-          namespace:  NS,
+          namespace:  NAMESPACE,
         },
         storage: {
           apiVersion: FORKLIFT_API_VERSION,
           kind:       'StorageMap',
           name:       storageMapName,
-          namespace:  NS,
+          namespace:  NAMESPACE,
         },
       },
-      targetNamespace: targetNamespace.value,
+      targetNamespace: TARGET_NAMESPACE,
       vms:             vms.value.map((vm) => ({ id: vm.id, name: vm.name || vm.id })),
       warm:            false,
     },
@@ -291,32 +177,8 @@ const startMigrationAction = async() => {
   await plan.startMigration();
 };
 
-const init = async() => {
+const init = () => {
-  const inStore = store.getters['currentProduct'].inStore;
+  vms.value = props.selectedVms;
-
-  try {
-    const namespaces = await store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE });
-
-    namespaceOptions.value = namespaces.filter((ns) => !ns.isSystem).map((ns) => ns.metadata.name).sort().map((name) => ({ label: name, value: name }));
-  } catch (e) {
-    namespaceOptions.value = [];
-  }
-
-  try {
-    await store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_PROVIDER });
-  } catch (e) {}
-
-  existingProviderNames.value = (store.getters[`${ inStore }/all`](HCI.FORKLIFT_PROVIDER) || [])
-    .map((p) => p.metadata?.name)
-    .filter(Boolean);
-
-  try {
-    await store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_PLAN });
-  } catch (e) {}
-
-  existingPlanNames.value = (store.getters[`${ inStore }/all`](HCI.FORKLIFT_PLAN) || [])
-    .map((p) => p.metadata?.name)
-    .filter(Boolean);
 
   if (props.mappingEntries) {
     networkMappings.value = (props.mappingEntries.networkEntries || []).map((entry) => ({
@@ -349,178 +211,116 @@ defineExpose({ startMigration: startMigrationAction });
     <div
       class="review-migration-content"
     >
-      <Banner
-        v-if="nameConflictError"
-        color="error"
-        :label="nameConflictError"
-      />
-
       <!-- Migration Details Summary -->
       <div class="migration-details">
-        <div class="section-header">
         <h3 class="section-title m-0">
           {{ t('harvester.addons.vmMigration.reviewMigration.migrationDetails') }}
         </h3>
-          <span class="section-description text-deemphasized">
+        <div class="span-9">
-            {{ t('harvester.addons.vmMigration.reviewMigration.migrationDetailsDescription') }}
-          </span>
-        </div>
-
-        <div class="name-row">
           <LabeledInput
             v-model:value="planName"
-            class="name-input"
             :label="t('harvester.addons.vmMigration.reviewMigration.planName')"
             :placeholder="t('harvester.addons.vmMigration.reviewMigration.planNamePlaceholder')"
             required
           />
-          <LabeledSelect
-            v-model:value="targetNamespace"
-            class="namespace-select"
-            :label="t('harvester.addons.vmMigration.reviewMigration.targetNamespace')"
-            :placeholder="t('harvester.addons.vmMigration.reviewMigration.targetNamespacePlaceholder')"
-            :options="namespaceOptions"
-            required
-          />
         </div>
-
+        <div class="details-grid span-9">
-        <div class="summary-row">
+          <div class="detail-column">
-          <div class="migration-mode-column">
+            <div class="detail-item">
-            <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.migrationMode') }}</span>
-            <span class="cold-migration-badge">{{ t('harvester.addons.vmMigration.reviewMigration.coldMigration') }}</span>
-            <span class="text-deemphasized">{{ t('harvester.addons.vmMigration.reviewMigration.coldMigrationDescription') }}</span>
-            <span class="text-deemphasized">{{ t('harvester.addons.vmMigration.reviewMigration.coldMigrationHint') }}</span>
-          </div>
-
-          <div class="stats-column">
-            <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.provider') }}</span>
-            <span class="detail-value">{{ providerName }}</span>
               <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.totalVms') }}</span>
-            <span class="detail-value">{{ vms.length }}</span>
+              <span class="detail-value detail-value-large">{{ vms.length }}</span>
+            </div>
+          </div>
+          <div class="detail-column">
+            <div class="detail-item">
+              <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.source') }}</span>
+            </div>
+            <div class="detail-item">
+              <span class="detail-value">{{ providerName }}</span>
+            </div>
+          </div>
+          <div class="detail-column">
+            <div class="detail-item">
+              <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.targetNamespace') }}</span>
+            </div>
+            <div class="detail-item">
+              <span class="detail-value">{{ TARGET_NAMESPACE }}</span>
+            </div>
+          </div>
+          <div class="detail-column">
+            <div class="detail-item">
               <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.vcpu') }}</span>
               <span class="detail-value">{{ totalVCpu }}</span>
+            </div>
+            <div class="detail-item">
               <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.memory') }}</span>
               <span class="detail-value">{{ t('harvester.addons.vmMigration.generic.memoryGb', { value: totalMemoryGB }) }}</span>
+            </div>
+            <div class="detail-item">
               <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.storage') }}</span>
               <span class="detail-value">{{ t('harvester.addons.vmMigration.generic.memoryGb', { value: totalStorageGB }) }}</span>
             </div>
           </div>
+          <div class="detail-column grid-column-2">
+            <div class="detail-item">
+              <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.migrationMode') }}</span>
+            </div>
+            <div class="detail-item">
+              <span class="detail-value">
+                {{ t('harvester.addons.vmMigration.reviewMigration.coldMigration') }}
+              </span>
+            </div>
+          </div>
+        </div>
       </div>
 
       <!-- Virtual Machines -->
       <div class="vm-section">
-        <SortableTable
+        <h3 class="section-title m-0">
-          class="vm-sortable-table"
-          :rows="vmRows"
-          :headers="vmHeaders"
-          :search="false"
-          :table-actions="false"
-          :row-actions="false"
-          :groupable="false"
-          :paging="true"
-          key-field="_key"
-        >
-          <template #header-left>
-            <h4 class="section-title m-0">
           {{ t('harvester.addons.vmMigration.reviewMigration.virtualMachines') }} ({{ vms.length }})
-            </h4>
+        </h3>
-          </template>
+
-          <template #header-right>
+        <div class="vm-cards-grid">
-            <a
+          <RcItemCard
-              href="#"
+            v-for="vm in vmCards"
-              class="edit-selection-link"
+            :id="vm.id"
-              @click.prevent="onEditSelection"
+            :key="vm.id"
+            :variant="'small'"
+            :header="{ title: { text: vm.name } }"
           >
-              {{ t('harvester.addons.vmMigration.reviewMigration.editSelection') }}
+            <template #item-card-content>
-            </a>
+              <div class="vm-card-content">
-          </template>
+                <div class="vm-card-specs">
-          <template #cell:vmName="{ row }">
+                  <span class="vm-os text-deemphasized">{{ vm.os }}</span>
-            <div class="vm-name-cell">
+                  <span class="vm-resources">
-              <span class="vm-name">{{ row.name }}</span>
+                    <i
-              <span class="vm-id text-deemphasized">{{ row.identifier }}</span>
+                      class="icon icon-disk"
+                      aria-hidden="true"
+                    />
+                    {{ t('harvester.addons.vmMigration.generic.vCpu', { count: vm.cpus }) }} &bull; {{ vm.memGB }} &bull; {{ vm.diskDisplay }}
+                  </span>
                 </div>
-          </template>
+                <MappingsCell
-          <template #cell:resources="{ row }">
+                  :network-entries="vm.networkMappings.map(m => `${m.source} → ${m.target}`)"
-            <span>{{ row.resources }}</span><br>
+                  :storage-entries="vm.storageMappings.map(m => `${m.source} → ${m.target}`)"
-            <span class="text-deemphasized">{{ row.resourcesSub }}</span>
-          </template>
-          <template #cell:powerState="{ row }">
-            <BadgeState
-              :label="row.powerState"
-              :color="row.powerStateClass === 'power-on' ? 'bg-warning' : 'bg-darker'"
                 />
-          </template>
-          <template #cell:networkMapping="{ row }">
-            <template v-if="row.networkMappings.length">
-              <div
-                v-for="(m, i) in row.networkMappings"
-                :key="'net-' + i"
-                class="mapping-cell"
-              >
-                <span class="mapping-source">{{ m.source }}</span>
-                <span class="mapping-target text-deemphasized">&rarr; {{ formatNetworkTarget(m.target) }}</span>
               </div>
             </template>
-            <span
+          </RcItemCard>
-              v-else
-              class="text-deemphasized"
-            >-</span>
-          </template>
-          <template #cell:storageMapping="{ row }">
-            <template v-if="row.storageMappings.length">
-              <div
-                v-for="(m, i) in row.storageMappings"
-                :key="'stor-' + i"
-                class="mapping-cell"
-              >
-                <span class="mapping-source">{{ m.source }}</span>
-                <span class="mapping-target text-deemphasized">&rarr; {{ m.target }}</span>
         </div>
-            </template>
-            <span
-              v-else
-              class="text-deemphasized"
-            >-</span>
-          </template>
-          <template #cell:actions="{ row }">
-            <rc-dropdown :aria-label="t('harvester.addons.vmMigration.reviewMigration.actions.menuLabel')">
-              <rc-dropdown-trigger
-                variant="ghost"
-                :aria-label="t('harvester.addons.vmMigration.reviewMigration.actions.menuLabel')"
-              >
-                <i class="icon icon-actions" />
-              </rc-dropdown-trigger>
-              <template #dropdownCollection>
-                <rc-dropdown-item @click="onEditMappings">
-                  {{ t('harvester.addons.vmMigration.reviewMigration.actions.editMappings') }}
-                </rc-dropdown-item>
-                <rc-dropdown-item
-                  class="text-error"
-                  @click="onRemoveVm(row.id)"
-                >
-                  {{ t('harvester.addons.vmMigration.reviewMigration.actions.removeFromPlan') }}
-                </rc-dropdown-item>
-              </template>
-            </rc-dropdown>
-          </template>
-          <template #no-rows>
-            <tr class="no-rows">
-              <td
-                :colspan="vmHeaders.length"
-                class="text-center"
-              >
-                {{ t('harvester.addons.vmMigration.reviewMigration.noVmSelected') }}
-                <a
-                  href="#"
-                  class="edit-selection-link"
-                  @click.prevent="onEditSelection"
-                >{{ t('harvester.addons.vmMigration.reviewMigration.noVmSelectedLink') }}</a>
-              </td>
-            </tr>
-          </template>
-        </SortableTable>
       </div>
 
+      <!-- Cold Migration Warning -->
+      <Banner
+        color="warning"
+        class="m-0"
+      >
+        <div>
+          <span class="banner-title">{{ t('harvester.addons.vmMigration.reviewMigration.warningTitle') }}</span><br>
+          {{ t('harvester.addons.vmMigration.reviewMigration.warningMessage') }}
+        </div>
+      </Banner>
+
       <!-- Error banner -->
       <Banner
         v-for="(err, i) in errors"
@@ -547,63 +347,28 @@ defineExpose({ startMigration: startMigrationAction });
     font-weight: 600;
   }
 
-  .name-row {
+  .details-grid {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: minmax(230px, 1fr) 1fr 1fr;
-    gap: 12px clamp(12px, 1vw, 96px);
+    grid-template-rows: minmax(0, 1fr) minmax(0, 1fr);
-    align-items: start;
+    gap: 12px clamp(64px, 8vw, 128px);
-  }
-
-  .summary-row {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 12px clamp(12px, 1vw, 96px);
     line-height: 20px;
-    margin-top: 12px;
   }
 
-  .section-header {
+  .detail-column {
     display: flex;
     flex-direction: column;
     gap: 4px;
 
-    .section-description {
+    &.grid-column-2 {
-      font-size: 14px;
+        grid-column: span 2;
     }
   }
 
-  .migration-mode-column {
+  .detail-item {
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
-    align-items: flex-start;
+    justify-content: space-between;
-    gap: 8px;
-    font-size: 14px;
-
-    .cold-migration-badge {
-      padding: 2px 10px;
-      border-radius: 4px;
-      opacity: 0.8;
-      font-weight: 600;
-      background: rgba(224, 191, 90, 0.16);
-      color: #E0BF5A;
-      font-size: 12px;
-      line-height: 18px;
-      font-weight: 600;
-
-      .theme-light & {
-        background: rgba(168, 128, 26, 0.16);
-      }
-    }
-  }
-
-  .stats-column {
-    display: grid;
-    grid-template-columns: auto auto;
-    justify-content: start;
-    align-content: start;
-    column-gap: clamp(24px, 4vw, 64px);
-    row-gap: 8px;
-  }
 
     .detail-label {
       font-size: 14px;
@@ -613,56 +378,43 @@ defineExpose({ startMigration: startMigrationAction });
     .detail-value {
       font-weight: 600;
       font-size: 14px;
+
+      &.detail-value-large {
+        font-size: 24px;
+      }
+    }
   }
 
-  .edit-selection-link {
+  .vm-cards-grid {
-    cursor: pointer;
+    display: grid;
-    color: var(--link);
+    grid-template-columns: repeat(auto-fill, minmax(380px, 1fr));
+    gap: 16px;
+  }
+
+  .vm-card-content {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    line-height: 20px;
+  }
+
+  .vm-card-specs {
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    align-items: center;
+
+    .vm-os {
       font-size: 14px;
     }
 
-  .vm-sortable-table {
+    .vm-resources {
-    :deep(.fixed-header-actions) {
+      font-size: 14px;
-      align-items: end;
+      color: var(--muted);
+      display: inline-flex;
+      align-items: center;
+      gap: 8px;
     }
-
-    :deep(table) {
-      table-layout: fixed;
-    }
-
-    :deep(td) {
-      vertical-align: middle;
-      overflow: hidden;
-    }
-
-    :deep(th:first-child),
-    :deep(td:first-child) {
-      padding-left: 16px;
-    }
-  }
-
-  .vm-name-cell {
-    display: flex;
-    flex-direction: column;
-
-    .vm-name {
-      font-weight: 600;
-    }
-
-    .vm-id {
-      font-size: 12px;
-    }
-  }
-
-  .mapping-cell {
-    .mapping-target {
-      margin-left: 4px;
-      white-space: nowrap;
-    }
-  }
-
-  .mapping-cell + .mapping-cell {
-    margin-top: 8px;
   }
 
   .banner-title {

pkg/harvester/components/vm-migration/SelectVmsStep.vue

@@ -25,9 +25,8 @@ const { discoveredVMs, selectedVMIds, tableRows } = toRefs(props.stepData);
 
 const selectedVMs = ref([]);
 const loading = ref(true);
-// Restored from stepData so friendly names survive step navigation / remount.
+const networkMap = ref({});
-const networkMap = ref(props.stepData.networkMap || {});
+const datastoreMap = ref({});
-const datastoreMap = ref(props.stepData.datastoreMap || {});
 const sortableTableRef = ref(null);
 const allVMsSelected = ref(false);
 const errors = ref([]);
@@ -95,7 +94,7 @@ const showSelectAllBanner = computed(() => {
 
 const theadElement = computed(() => sortableTableRef.value?.$el?.querySelector('thead'));
 
-const headers = ref([
+const headers = [
   {
     name:     'vmName',
     labelKey: 'harvester.addons.vmMigration.selectVms.columns.vmName',
@@ -108,21 +107,18 @@ const headers = ref([
     labelKey: 'harvester.addons.vmMigration.selectVms.columns.os',
     value:    'os',
     sort:     ['os'],
-    width:    180,
   },
   {
     name:     'resources',
     labelKey: 'harvester.addons.vmMigration.selectVms.columns.resources',
     value:    'resources',
     sort:     false,
-    width:    140,
   },
   {
     name:     'powerState',
     labelKey: 'harvester.addons.vmMigration.selectVms.columns.powerState',
     value:    'powerState',
     sort:     ['powerState'],
-    width:    130,
   },
   {
     name:     'network',
@@ -130,7 +126,6 @@ const headers = ref([
     value:    'network',
     sort:     ['network'],
     subLabel: t('harvester.addons.vmMigration.generic.identifier'),
-    width:    200,
   },
   {
     name:     'datastore',
@@ -138,9 +133,8 @@ const headers = ref([
     value:    'datastore',
     sort:     ['datastore'],
     subLabel: t('harvester.addons.vmMigration.generic.identifier'),
-    width:    200,
   },
-]);
+];
 
 const buildTableRows = () => {
   return discoveredVMs.value.map((vm) => {
@@ -191,7 +185,6 @@ const buildTableRows = () => {
     return {
       _original:        vm,
       _key:             vm.id || vm.vmId || vm.metadata?.name,
-      selectedSort:     selectedVMIds.value.has(vm.id) ? 0 : 1,
       vmName:           vm.name || vm.metadata?.name || '-',
       vmId:             vm.id || vm.vmId || vm.metadata?.name || '-',
       os:               vm.guestName || vm.guestOS || vm.os || '-',
@@ -241,10 +234,6 @@ const clearSelection = () => {
 
     if (table) {
       table.clearSelection();
-
-      if (typeof table.setPage === 'function') {
-        table.setPage(1);
-      }
     }
   });
 };
@@ -255,49 +244,6 @@ const selectAllVMs = () => {
   selectedVMs.value = discoveredVMs.value.slice();
 };
 
-// Moves currently-selected VMs to the first page(s) and re-checks them.
-const sortSelectedToFront = () => {
-  if (selectedVMIds.value.size === 0) {
-    return;
-  }
-
-  tableRows.value.forEach((row) => {
-    row.selectedSort = selectedVMIds.value.has(row._original?.id) ? 0 : 1;
-  });
-
-  headers.value = headers.value.map((h) => (
-    h.name === 'vmName' ? { ...h, sort: ['selectedSort', 'vmName'] } : h
-  ));
-
-  skipNextSelectionEvent = true;
-
-  nextTick(() => {
-    const table = sortableTableRef.value;
-
-    if (!table) {
-      skipNextSelectionEvent = false;
-
-      return;
-    }
-
-    if (typeof table.changeSort === 'function') {
-      table.changeSort('vmName', false);
-    } else if (typeof table.setPage === 'function') {
-      table.setPage(1);
-    }
-
-    nextTick(() => {
-      const rowsToReselect = (table.pagedRows || []).filter((row) => selectedVMIds.value.has(row._original?.id));
-
-      if (rowsToReselect.length > 0) {
-        table.update(rowsToReselect, []);
-      }
-
-      skipNextSelectionEvent = false;
-    });
-  });
-};
-
 watch(
   () => sortableTableRef.value?.page,
   () => {
@@ -367,9 +313,6 @@ const fetchVMs = async() => {
     return map;
   }, {});
 
-  props.stepData.networkMap = networkMap.value;
-  props.stepData.datastoreMap = datastoreMap.value;
-
   lastFetchedAt.value = Date.now();
   tableRows.value = buildTableRows();
 };
@@ -426,10 +369,6 @@ const init = async() => {
     tableRows.value = buildTableRows();
     loading.value = false;
 
-    // Returning to the step with an existing selection: bring selected VMs forward and re-check them.
-    await nextTick();
-    sortSelectedToFront();
-
     return;
   }
 
@@ -497,6 +436,7 @@ init();
       :row-actions="false"
       :groupable="false"
       :paging="true"
+      :rows-per-page="20"
       key-field="_key"
       @selection="onSelect"
     >
@@ -505,20 +445,7 @@ init();
           <h3 class="m-0">
             {{ t('harvester.addons.vmMigration.selectVms.availableVms') }}
           </h3>
-          <span class="selected-actions">
+          <span class="text-deemphasized">{{ selectedCount }} {{ t('harvester.addons.vmMigration.selectVms.selected') }}</span>
-            <span class="text-deemphasized">
-              {{ selectedCount }} {{ t('harvester.addons.vmMigration.selectVms.selected') }}
-            </span>
-            <template v-if="selectedCount > 0">
-              <span class="text-deemphasized">|</span>
-              <a
-                role="button"
-                @click.prevent="clearSelection"
-              >
-                {{ t('harvester.addons.vmMigration.selectVms.clearAll') }}
-              </a>
-            </template>
-          </span>
         </div>
       </template>
       <template #cell:vmName="{ row }">
@@ -534,7 +461,7 @@ init();
       <template #cell:powerState="{ row }">
         <BadgeState
           :label="row.powerState"
-          :color="row.powerStateClass === 'power-on' ? 'bg-success' : 'bg-darker'"
+          :color="row.powerStateClass === 'power-on' ? 'bg-warning' : 'bg-darker'"
         />
       </template>
       <template #cell:network="{ row }">
@@ -601,23 +528,6 @@ init();
     .text-deemphasized {
       font-size: 13px;
     }
-
-    .selected-actions {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      font-size: 13px;
-
-      a {
-        cursor: pointer;
-
-        &.disabled {
-          color: var(--muted);
-          cursor: default;
-          pointer-events: none;
-        }
-      }
-    }
   }
 
   .vm-name-cell {

pkg/harvester/components/vm-migration/StorageDefaultsModal.vue

@@ -1,175 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useStore } from 'vuex';
-import { Card } from '@components/Card';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import AppModal from '@shell/components/AppModal';
-import { useI18n } from '@shell/composables/useI18n';
-import { VOLUME_MODE, ACCESS_MODE } from '../../config/types';
-
-const VOLUME_MODE_OPTIONS = [VOLUME_MODE.FILE_SYSTEM, VOLUME_MODE.BLOCK];
-const ACCESS_MODE_OPTIONS = [ACCESS_MODE.READ_WRITE_ONCE, ACCESS_MODE.READ_WRITE_MANY, ACCESS_MODE.READ_ONLY_MANY];
-
-const props = defineProps({
-  storageClassName:     { type: String, default: '' },
-  providerName:         { type: String, default: '' },
-  showInherited:        { type: Boolean, default: false },
-  volumeMode:           { type: String, default: VOLUME_MODE.FILE_SYSTEM },
-  accessModes:          { type: Array, default: () => [ACCESS_MODE.READ_WRITE_MANY] },
-  inheritedVolumeMode:  { type: String, default: VOLUME_MODE.FILE_SYSTEM },
-  inheritedAccessModes: { type: Array, default: () => [ACCESS_MODE.READ_WRITE_MANY] },
-});
-
-const emit = defineEmits(['apply', 'close']);
-
-const store = useStore();
-const { t } = useI18n(store);
-
-const localVolumeMode = ref(props.volumeMode || VOLUME_MODE.FILE_SYSTEM);
-const localAccessMode = ref(props.accessModes?.[0] || ACCESS_MODE.READ_WRITE_MANY);
-
-const volumeModeOptions = VOLUME_MODE_OPTIONS.map((value) => ({ label: value, value }));
-const accessModeOptions = ACCESS_MODE_OPTIONS.map((value) => ({ label: value, value }));
-
-const apply = () => {
-  emit('apply', {
-    volumeMode:  localVolumeMode.value,
-    accessModes: [localAccessMode.value],
-  });
-  emit('close');
-};
-
-// Repopulate the dropdowns with the provider default values; the user then applies.
-const reset = () => {
-  localVolumeMode.value = props.inheritedVolumeMode || VOLUME_MODE.FILE_SYSTEM;
-  localAccessMode.value = props.inheritedAccessModes?.[0] || ACCESS_MODE.READ_WRITE_MANY;
-};
-
-const cancel = () => {
-  emit('close');
-};
-</script>
-
-<template>
-  <app-modal
-    class="storage-defaults-modal"
-    name="storageDefaultsDialog"
-    :width="620"
-    height="auto"
-    :click-to-close="false"
-    @close="cancel"
-  >
-    <Card
-      class="storage-defaults-card"
-      :show-highlight-border="false"
-    >
-      <template #title>
-        <h4 class="text-default-text">
-          {{ t('harvester.addons.vmMigration.storageDefaults.title', { name: storageClassName }) }}
-        </h4>
-      </template>
-
-      <template #body>
-        <p class="text-deemphasized description">
-          <template v-if="showInherited">
-            {{ t('harvester.addons.vmMigration.storageDefaults.descriptionInherited', { name: storageClassName, provider: providerName }) }}
-          </template>
-          <template v-else>
-            {{ t('harvester.addons.vmMigration.storageDefaults.description', { name: storageClassName }) }}
-          </template>
-        </p>
-
-        <div class="settings-box">
-          <LabeledSelect
-            v-model:value="localVolumeMode"
-            class="volume-mode"
-            :label="t('harvester.addons.vmMigration.storageDefaults.volumeMode')"
-            :options="volumeModeOptions"
-            :searchable="false"
-            :clearable="false"
-          />
-
-          <LabeledSelect
-            v-model:value="localAccessMode"
-            class="access-mode"
-            :label="t('harvester.addons.vmMigration.storageDefaults.accessMode')"
-            :options="accessModeOptions"
-            :searchable="false"
-            :clearable="false"
-          />
-        </div>
-      </template>
-
-      <template #actions>
-        <div class="buttons">
-          <button
-            class="btn role-secondary"
-            @click="cancel"
-          >
-            {{ t('harvester.addons.vmMigration.storageDefaults.cancel') }}
-          </button>
-          <div class="right-buttons">
-            <button
-              v-if="showInherited"
-              class="btn role-secondary mr-10"
-              @click="reset"
-            >
-              {{ t('harvester.addons.vmMigration.storageDefaults.resetToProviderDefault') }}
-            </button>
-            <button
-              class="btn role-primary"
-              :disabled="!localAccessMode"
-              @click="apply"
-            >
-              {{ showInherited ? t('harvester.addons.vmMigration.storageDefaults.applyOverride') : t('harvester.addons.vmMigration.storageDefaults.apply') }}
-            </button>
-          </div>
-        </div>
-      </template>
-    </Card>
-  </app-modal>
-</template>
-
-<style lang="scss" scoped>
-  .storage-defaults-modal {
-    z-index: 45;
-  }
-
-  .storage-defaults-card {
-    margin: 0;
-    padding: 20px;
-  }
-
-  .description {
-    margin-bottom: 16px;
-    line-height: 20px;
-  }
-
-  .settings-box {
-    display: flex;
-    flex-direction: column;
-    gap: 20px;
-    padding: 16px;
-    border-radius: 6px;
-    background-color: var(--category-active);
-  }
-
-  .volume-mode {
-    max-width: 280px;
-  }
-
-  .access-mode {
-    max-width: 280px;
-  }
-
-  .buttons {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-
-    .right-buttons {
-      display: flex;
-    }
-  }
-</style>

pkg/harvester/config/feature-flags.js

@@ -73,9 +73,7 @@ const FEATURE_FLAGS = {
     'supportFilesystem',
     'disableResourcePooling',
     'expandOnlineEncryptedVolume',
-    'longhornV2HugepageSettings',
+    'longhornV2HugepageSettings'
-    'staticIPForVM',
-    'fsFreezeDeadline',
   ],
 };
 

pkg/harvester/config/harvester-cluster.js

@@ -1378,7 +1378,7 @@ export function init($plugin, store) {
   virtualType({
     name:       HCI.FORKLIFT_NETWORK_MAP,
     labelKey:   'harvester.addons.vmMigration.labels.networkMap',
-    group:      'vmMigration::Configurations',
+    group:      'vmMigration::Advanced',
     namespaced: true,
     route:      {
       name:   `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1405,7 +1405,7 @@ export function init($plugin, store) {
   virtualType({
     name:       HCI.FORKLIFT_STORAGE_MAP,
     labelKey:   'harvester.addons.vmMigration.labels.storageMap',
-    group:      'vmMigration::Configurations',
+    group:      'vmMigration::Advanced',
     namespaced: true,
     route:      {
       name:   `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1433,7 +1433,7 @@ export function init($plugin, store) {
   virtualType({
     name:       HCI.FORKLIFT_PLAN,
     labelKey:   'harvester.addons.vmMigration.labels.plan',
-    group:      'vmMigration::Configurations',
+    group:      'vmMigration::Advanced',
     namespaced: true,
     route:      {
       name:   `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1459,7 +1459,7 @@ export function init($plugin, store) {
   virtualType({
     name:       HCI.FORKLIFT_MIGRATION,
     labelKey:   'harvester.addons.vmMigration.labels.migration',
-    group:      'vmMigration::Configurations',
+    group:      'vmMigration::Advanced',
     namespaced: true,
     route:      {
       name:   `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1479,16 +1479,11 @@ export function init($plugin, store) {
     }
   });
 
+  // Register the dashboard entry directly — it's a virtual type with no schema,
+  // so it cannot go through registerAddonSideNav (which filters by schema).
+  basicType(['forklift-create'], 'vmMigration');
+
   // Enable SideNav based on Forklift Addon Status
-  // The dashboard entry ('forklift-create') is a schema-less virtual type, so it
-  // is registered with requireSchema:false to still be gated by the addon status.
-  registerAddonSideNav(store, PRODUCT_NAME, {
-    addonName:     ADD_ONS.FORKLIFT_OPERATOR,
-    resourceType:  HCI.ADD_ONS,
-    navGroup:      'vmMigration',
-    requireSchema: false,
-    types:         ['forklift-create']
-  });
   registerAddonSideNav(store, PRODUCT_NAME, {
     addonName:    ADD_ONS.FORKLIFT_OPERATOR,
     resourceType: HCI.ADD_ONS,
@@ -1500,7 +1495,7 @@ export function init($plugin, store) {
   registerAddonSideNav(store, PRODUCT_NAME, {
     addonName:    ADD_ONS.FORKLIFT_OPERATOR,
     resourceType: HCI.ADD_ONS,
-    navGroup:     'vmMigration::Configurations',
+    navGroup:     'vmMigration::Advanced',
     types:        [
       HCI.FORKLIFT_NETWORK_MAP,
       HCI.FORKLIFT_STORAGE_MAP,

pkg/harvester/config/labels-annotations.js

@@ -16,7 +16,6 @@ export const HCI = {
   CREATOR:                          'harvesterhci.io/creator',
   OS:                               'harvesterhci.io/os',
   GOLDEN_IMAGE:                     'harvesterhci.io/goldenImage',
-  CLUSTER_NETWORK:                  'network.harvesterhci.io/clusternetwork',
   NETWORK_TYPE:                     'network.harvesterhci.io/type',
   VM_NAME:                          'harvesterhci.io/vmName',
   VM_NAME_PREFIX:                   'harvesterhci.io/vmNamePrefix',
@@ -81,10 +80,8 @@ export const HCI = {
   VOLUME_MODE_ACCESS_MODES:         'cdi.harvesterhci.io/storageProfileVolumeModeAccessModes',
   VOLUME_SNAPSHOT_CLASS:            'cdi.harvesterhci.io/storageProfileVolumeSnapshotClass',
   MAC_ADDRESS:                      'harvesterhci.io/mac-address',
-  STATIC_IP:                        'static-ip.harvesterhci.io',
   NODE_UPGRADE_PAUSE_MAP:           'harvesterhci.io/node-upgrade-pause-map',
   CDI_POPULATOR_KIND:               'cdi.kubevirt.io/storage.populator.kind',
   CNI_NETWORKS:                     'k8s.v1.cni.cncf.io/networks',
   WINDOWS_SYSPREP:                  'harvesterhci.io/windows-sysprep',
-  SKIP_MIG_CONFIGURATION:           'harvesterhci.io/skip-mig-configuration',
 };

pkg/harvester/config/table-headers.js

@@ -286,7 +286,7 @@ export const FORKLIFT_PLAN_VM_COUNT = {
   labelKey: 'harvester.tableHeaders.vmMigrationPlanVmCount',
   value:    'spec.vms.length',
   sort:     'spec.vms.length',
-  align:    'center',
+  align:    'left',
 };
 
 // Plan reference column in forklift.konveyor.io.migration list page

pkg/harvester/config/types.js

@@ -15,13 +15,6 @@ export const VOLUME_MODE = {
   FILE_SYSTEM: 'Filesystem'
 };
 
-export const ACCESS_MODE = {
-  READ_WRITE_MANY:     'ReadWriteMany',
-  READ_WRITE_ONCE:     'ReadWriteOnce',
-  READ_ONLY_MANY:      'ReadOnlyMany',
-  READ_WRITE_ONCE_POD: 'ReadWriteOncePod',
-};
-
 export const NETWORK_PROTOCOL = {
   IPv4: 'IPv4',
   IPv6: 'IPv6',

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

@@ -7,7 +7,6 @@ import { MiniMap } from '@vue-flow/minimap';
 import { allHash } from '@shell/utils/promise';
 import { NETWORK_ATTACHMENT } from '@shell/config/types';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
-import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { HCI } from '../types';
 import { NETWORK_TYPE } from '../config/types';
 
@@ -455,10 +454,10 @@ export default {
         const overlayName = nad?.parseConfig?.name || nad?.metadata?.name;
 
         const clusterNetwork =
-          nad?.metadata?.labels?.[HCI_ANNOTATIONS.CLUSTER_NETWORK] || 'mgmt';
+          nad?.metadata?.labels?.[HCI.CLUSTER_NETWORK] || 'mgmt';
 
         const nadType =
-          nad?.metadata?.labels?.[HCI_ANNOTATIONS.NETWORK_TYPE] || NETWORK_TYPE.OVERLAY;
+          nad?.metadata?.labels?.[HCI.NETWORK_TYPE] || NETWORK_TYPE.OVERLAY;
         const overlayNodeId = `overlay-${ provider }`;
 
         nodes.push({

pkg/harvester/dialog/EnableSriovGpuDevice.vue

@@ -1,133 +0,0 @@
-<script>
-import { mapGetters } from 'vuex';
-import { Card } from '@components/Card';
-import AsyncButton from '@shell/components/AsyncButton';
-import { Checkbox } from '@components/Form/Checkbox';
-import { escapeHtml } from '@shell/utils/string';
-import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
-
-export default {
-  name: 'HarvesterEnableSriovGpuDevice',
-
-  emits: ['close'],
-
-  components: {
-    AsyncButton,
-    Card,
-    Checkbox,
-  },
-
-  props: {
-    resources: {
-      type:     Array,
-      required: true
-    }
-  },
-
-  data() {
-    return { skipMigConfiguration: this.resources[0]?.metadata?.annotations?.[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] === 'true' };
-  },
-
-  computed: { ...mapGetters({ t: 'i18n/t' }) },
-
-  methods: {
-    close() {
-      this.$emit('close');
-    },
-
-    async save(buttonCb) {
-      const actionResource = this.resources[0];
-      const prevEnabled = actionResource.spec.enabled;
-      const prevAnnotation = actionResource.metadata.annotations?.[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION];
-
-      try {
-        if (this.skipMigConfiguration) {
-          if (!actionResource.metadata.annotations) {
-            actionResource.metadata.annotations = {};
-          }
-          actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] = 'true';
-        } else {
-          if (actionResource.metadata.annotations) {
-            delete actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION];
-          }
-        }
-
-        actionResource.spec.enabled = true;
-        await actionResource.save();
-        buttonCb(true);
-        this.close();
-      } catch (err) {
-        actionResource.spec.enabled = prevEnabled;
-        if (prevAnnotation !== undefined) {
-          actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] = prevAnnotation;
-        } else if (actionResource.metadata.annotations) {
-          delete actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION];
-        }
-
-        this.$store.dispatch('growl/fromError', {
-          title: this.t('generic.notification.title.error', { name: escapeHtml(actionResource.metadata.name) }),
-          err,
-        }, { root: true });
-        buttonCb(false);
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <Card :show-highlight-border="false">
-    <template #title>
-      <h4
-        v-clean-html="t('harvester.sriovgpu.enable.title')"
-        class="text-default-text"
-      />
-    </template>
-
-    <template #body>
-      <div class="body">
-        <Checkbox
-          v-model:value="skipMigConfiguration"
-          :label="t('harvester.sriovgpu.enable.skipMigConfiguration')"
-        />
-        <p class="note mt-10">
-          {{ t('harvester.sriovgpu.enable.note') }}
-        </p>
-      </div>
-    </template>
-
-    <template #actions>
-      <div class="buttons actions">
-        <button
-          class="btn role-secondary mr-10"
-          @click="close"
-        >
-          {{ t('generic.cancel') }}
-        </button>
-
-        <AsyncButton
-          mode="enable"
-          @click="save"
-        />
-      </div>
-    </template>
-  </Card>
-</template>
-
-<style lang="scss" scoped>
-.actions {
-  width: 100%;
-}
-
-.buttons {
-  display: flex;
-  justify-content: flex-end;
-  width: 100%;
-}
-
-.note {
-  font-size: 12px;
-  color: var(--muted);
-  line-height: 1.5;
-}
-</style>

pkg/harvester/dialog/HarvesterBackupModal.vue

@@ -5,8 +5,6 @@ import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import AsyncButton from '@shell/components/AsyncButton';
 import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { DEFAULT_FS_FREEZE_DEADLINE, getFsFreezeDeadlineOptions } from '../utils/backup';
 
 export default {
   name: 'HarvesterBackupModal',
@@ -17,7 +15,6 @@ export default {
     AsyncButton,
     Card,
     LabeledInput,
-    LabeledSelect,
     Banner
   },
 
@@ -31,8 +28,7 @@ export default {
   data() {
     return {
       backUpName: '',
-      errors:           [],
+      errors:     []
-      fsFreezeDeadline: DEFAULT_FS_FREEZE_DEADLINE
     };
   },
 
@@ -41,22 +37,12 @@ export default {
 
     actionResource() {
       return this.resources[0];
-    },
-
-    fsFreezeDeadlineEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('fsFreezeDeadline');
-    },
-
-    fsFreezeDeadlineOptions() {
-      return getFsFreezeDeadlineOptions(this.t);
     }
   },
 
   methods: {
     close() {
       this.backUpName = '';
-      this.fsFreezeDeadline = DEFAULT_FS_FREEZE_DEADLINE;
-      this.errors = [];
       this.$emit('close');
     },
 
@@ -65,7 +51,7 @@ export default {
         try {
           const res = await this.actionResource.doAction(
             'backup',
-            { name: this.backUpName, fsFreezeDeadline: this.fsFreezeDeadline },
+            { name: this.backUpName },
             {},
             false
           );
@@ -114,18 +100,9 @@ export default {
     <template #body>
       <LabeledInput
         v-model:value="backUpName"
-        class="mt-20"
         :label="t('generic.name')"
         required
       />
-      <LabeledSelect
-        v-if="fsFreezeDeadlineEnabled"
-        v-model:value="fsFreezeDeadline"
-        class="mt-20"
-        :options="fsFreezeDeadlineOptions"
-        :label="t('harvester.modal.backup.fileSystemFreezeDeadline.label')"
-        required
-      />
       <Banner
         v-for="(err, i) in errors"
         :key="i"

pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue

@@ -5,10 +5,8 @@ import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import AsyncButton from '@shell/components/AsyncButton';
 import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { HCI } from '../types';
 import { BACKUP_TYPE } from '../config/types';
-import { DEFAULT_FS_FREEZE_DEADLINE, getFsFreezeDeadlineOptions } from '../utils/backup';
 
 export default {
   name: 'HarvesterVMSnapshotDialog',
@@ -19,7 +17,6 @@ export default {
     AsyncButton,
     Card,
     LabeledInput,
-    LabeledSelect,
     Banner
   },
 
@@ -34,8 +31,7 @@ export default {
     return {
       snapshotName:      '',
       snapshotNamespace: '',
-      errors:            [],
+      errors:            []
-      fsFreezeDeadline:  DEFAULT_FS_FREEZE_DEADLINE
     };
   },
 
@@ -44,23 +40,13 @@ export default {
 
     actionResource() {
       return this.resources[0];
-    },
-
-    fsFreezeDeadlineEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('fsFreezeDeadline');
-    },
-
-    fsFreezeDeadlineOptions() {
-      return getFsFreezeDeadlineOptions(this.t);
     }
   },
 
   methods: {
     close() {
-      this.fsFreezeDeadline = DEFAULT_FS_FREEZE_DEADLINE;
       this.snapshotNamespace = '';
       this.snapshotName = '';
-      this.errors = [];
       this.$emit('close');
     },
 
@@ -74,7 +60,6 @@ export default {
               ownerReferences: this.getOwnerReferencesFromVM(this.actionResource)
             },
             spec: {
-              fsFreezeDeadline: this.fsFreezeDeadline,
               source: {
                 apiGroup: 'kubevirt.io',
                 kind:     'VirtualMachine',
@@ -147,14 +132,6 @@ export default {
         :label="t('generic.name')"
         required
       />
-      <LabeledSelect
-        v-if="fsFreezeDeadlineEnabled"
-        v-model:value="fsFreezeDeadline"
-        class="mt-20"
-        :options="fsFreezeDeadlineOptions"
-        :label="t('harvester.modal.vmSnapshot.fileSystemFreezeDeadline.label')"
-        required
-      />
       <Banner
         v-for="(err, i) in errors"
         :key="i"

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

@@ -468,15 +468,10 @@ export default {
           const size = formatSi(sizeBytes, { increment: 1024, suffix: UNIT_SUFFIX });
           const parentDevice = d.status?.deviceStatus?.parentDevice;
           const isChildAdded = this.newDisks.find((newDisk) => newDisk.blockDevice?.status?.deviceStatus?.parentDevice === devPath);
-          const mountPoint = d.status?.deviceStatus?.fileSystem?.mountPoint;
           const name = d.displayName;
 
           let label = `${ name } (Type: ${ deviceType }, Size: ${ size })`;
 
-          if (mountPoint) {
-            label = `${ label } - ${ this.t('harvester.host.disk.mounted') }`;
-          }
-
           if (parentDevice) {
             label = `- ${ label }`;
           }
@@ -486,7 +481,7 @@ export default {
             value:    d.id,
             action:   this.addDisk,
             kind:     !parentDevice ? 'group' : '',
-            disabled: !!isChildAdded || !!mountPoint,
+            disabled: !!isChildAdded,
             group:    parentDevice || devPath,
             isParent: !!parentDevice,
           };

pkg/harvester/edit/harvesterhci.io.storage/CDISettings.vue

@@ -1,5 +1,5 @@
 <script>
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import ArrayList from '@shell/components/form/ArrayList';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -10,10 +10,6 @@ import { HCI_SETTING } from '../../config/settings';
 import { allHash } from '@shell/utils/promise';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 
-const {
-  READ_WRITE_ONCE, READ_ONLY_MANY, READ_WRITE_MANY, READ_WRITE_ONCE_POD
-} = ACCESS_MODE;
-
 export default {
   name: 'CDISettings',
 
@@ -94,10 +90,10 @@ export default {
 
     accessModeOptions() {
       return [
-        { label: READ_WRITE_ONCE, value: READ_WRITE_ONCE },
+        { label: 'ReadWriteOnce', value: 'ReadWriteOnce' },
-        { label: READ_ONLY_MANY, value: READ_ONLY_MANY },
+        { label: 'ReadOnlyMany', value: 'ReadOnlyMany' },
-        { label: READ_WRITE_MANY, value: READ_WRITE_MANY },
+        { label: 'ReadWriteMany', value: 'ReadWriteMany' },
-        { label: READ_WRITE_ONCE_POD, value: READ_WRITE_ONCE_POD },
+        { label: 'ReadWriteOncePod', value: 'ReadWriteOncePod' },
       ];
     },
 

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

@@ -26,11 +26,9 @@ import { HCI, VOLUME_SNAPSHOT } from '../types';
 import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
 import { DATA_ENGINE_V2 } from '../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../utils/unit';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { isInternalStorageClass } from '../utils/storage-class';
 
-const { READ_WRITE_MANY, READ_WRITE_ONCE, READ_ONLY_MANY } = ACCESS_MODE;
-
 export default {
   name: 'HarvesterVolume',
 
@@ -85,7 +83,7 @@ export default {
     if (this.mode === _CREATE) {
       // default volumeMode to Block
       this.value.spec.volumeMode = VOLUME_MODE.BLOCK;
-      this.value.spec.accessModes = [READ_WRITE_MANY];
+      this.value.spec.accessModes = ['ReadWriteMany'];
     }
 
     const storage = this.value?.spec?.resources?.requests?.storage || null;
@@ -162,7 +160,7 @@ export default {
     },
 
     accessModeOptions() {
-      return [READ_WRITE_ONCE, READ_WRITE_MANY, READ_ONLY_MANY];
+      return ['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany'];
     },
 
     imageOption() {
@@ -357,7 +355,7 @@ export default {
 
     getAccessMode() {
       if (!this.longhornV2LVMSupport) {
-        return [READ_WRITE_MANY];
+        return ['ReadWriteMany'];
       }
 
       if (this.value?.spec?.accessModes && this.value?.spec?.accessModes?.length > 0) {
@@ -373,7 +371,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.value.thirdPartyStorageFeatureEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? [READ_WRITE_ONCE] : [READ_WRITE_MANY];
+      return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
     },
     buildDataVolumeObj() {
       const storage = {

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/DataTemplate.vue

@@ -68,6 +68,12 @@ export default {
   },
 
   watch: {
+    osType(neu) {
+      if (neu === 'windows') {
+        this.id = '';
+      }
+    },
+
     value(neu) {
       this.yamlScript = neu;
     },

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineNetwork/base.vue

@@ -133,10 +133,6 @@ export default {
       }];
 
       return this.isMasquerade ? masquerade : other;
-    },
-
-    staticIPForVMEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('staticIPForVM');
     }
   },
 
@@ -154,7 +150,6 @@ export default {
     isSingle(neu) {
       if (!neu) {
         this.value['macAddress'] = '';
-        this.value['staticIp'] = '';
         this.update();
       }
     }
@@ -168,7 +163,6 @@ export default {
       if (neu === MANAGEMENT_NETWORK) {
         this.value.isPod = true;
         this.value.macAddress = '';
-        this.value.staticIp = '';
       } else {
         this.value.isPod = false;
       }
@@ -295,30 +289,9 @@ export default {
         </a>
       </div>
 
+      <div class="row">
         <div
           v-if="showAdvanced"
-        class="row"
-      >
-        <div
-          v-if="staticIPForVMEnabled"
-          data-testid="input-hen-staticIp"
-          class="col span-6"
-        >
-          <InputOrDisplay
-            :name="t('harvester.fields.staticIp')"
-            :value="value.staticIp"
-            :mode="mode"
-          >
-            <LabeledInput
-              v-model:value="value.staticIp"
-              label-key="harvester.fields.staticIp"
-              :mode="mode"
-              :tooltip="t('harvester.virtualMachine.volume.staticIpTip', { nic_name: value.name || 'default' })"
-              @update:value="update"
-            />
-          </InputOrDisplay>
-        </div>
-        <div
           data-testid="input-hen-macAddress"
           class="col span-6"
         >

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

@@ -16,12 +16,10 @@ import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs';
 import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
 import { HCI } from '../../../types';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { OFF } from '../../../models/kubevirt.io.virtualmachine';
 import { EMPTY_IMAGE } from '../../../utils/vm';
 
-const { READ_WRITE_MANY } = ACCESS_MODE;
-
 export default {
   emits: ['update:value'],
 
@@ -71,7 +69,7 @@ export default {
 
     customAccessMode: {
       type:    String,
-      default: READ_WRITE_MANY
+      default: 'ReadWriteMany'
     },
 
     resourceType: {

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue

@@ -14,9 +14,7 @@ import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storagec
 import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../../../../utils/unit';
 import { isInternalStorageClass } from '../../../../utils/storage-class';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
-
-const { READ_WRITE_MANY, READ_WRITE_ONCE } = ACCESS_MODE;
 
 export default {
   name: 'HarvesterEditVolume',
@@ -207,7 +205,7 @@ export default {
 
     getAccessMode(storageClassName) {
       if (!this.longhornV2LVMSupport) {
-        return READ_WRITE_MANY;
+        return 'ReadWriteMany';
       }
 
       const storageClass = this.storageClasses.find((sc) => sc.name === storageClassName);
@@ -218,7 +216,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.thirdPartyStorageClassEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? READ_WRITE_ONCE : READ_WRITE_MANY;
+      return readWriteOnce ? 'ReadWriteOnce' : 'ReadWriteMany';
     },
 
     update() {

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

@@ -93,9 +93,6 @@ export default {
 
     const hostname = this.value.spec.template.spec.hostname || '';
 
-    // Display name can contain arbitrary strings. There is no XSS risk because the value is
-    // rendered via Vue's {{ }} interpolation which auto-escapes HTML; v-html is never used for
-    // this field. See harvester/harvester#10423 for details.
     const customizeDisplayName = !!(this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME]);
 
     return {
@@ -487,20 +484,6 @@ export default {
         await value.save();
         await this.applyHooks(AFTER_SAVE_HOOKS);
       } catch (e) {
-        // Reset the generated secret name(s) so a retried create (e.g. after correcting an
-        // invalid/duplicate VM name) always regenerates them from the current name instead of
-        // reusing names derived from this failed attempt. Only do this for create: in edit mode
-        // secretName/sysprep.secretName may reference an existing secret loaded from the VM,
-        // which must not be discarded. See harvester/harvester#11174.
-        if (this.isCreate) {
-          this.secretName = '';
-          this.secretNamePrefixUsed = '';
-          if (this.sysprepSecretNamePrefixUsed !== '') {
-            this.sysprep.secretName = '';
-            this.sysprepSecretNamePrefixUsed = '';
-          }
-        }
-
         this.errors.push(...exceptionToErrorsArray(e));
         buttonCb(false);
       }
@@ -1062,6 +1045,7 @@ export default {
         </div>
 
         <CloudConfig
+          v-if="!isWindows"
           ref="yamlEditor"
           :user-script="userScript"
           :mode="mode"

pkg/harvester/edit/network.harvesterhci.io.hostnetworkconfig.vue

@@ -283,9 +283,9 @@ export default {
               v-model:value.number="vlanID"
               type="number"
               required
-              :min="1"
+              :min="2"
               :max="4094"
-              placeholder="e.g. 1 ~ 4094"
+              placeholder="e.g. 2 ~ 4094"
               :label="t('harvester.hostNetworkConfig.vlanID.label')"
               :mode="mode"
             />

pkg/harvester/formatters/HarvesterCPUUsed.vue

@@ -1,11 +1,11 @@
 <script>
-import PercentageBar from '@shell/components/PercentageBar';
+import ConsumptionGauge from '@shell/components/ConsumptionGauge';
 import { METRIC, NODE } from '@shell/config/types';
 import { parseSi } from '@shell/utils/units';
 
 export default {
   name:       'HarvesterCpuUsed',
-  components: { PercentageBar },
+  components: { ConsumptionGauge },
 
   props: {
     value: {
@@ -74,89 +74,54 @@ export default {
         return 0;
       }
     },
-
+  }
-    reservedPercentage() {
-      return this.cpuTotal ? (this.reserved * 100) / this.cpuTotal : 0;
-    },
-
-    usedPercentage() {
-      return this.cpuTotal ? (this.used * 100) / this.cpuTotal : 0;
-    },
-
-    reservedAmountTemplateValues() {
-      return {
-        used:  this.numberFormatter(this.reserved || 0),
-        total: this.numberFormatter(this.cpuTotal || 0),
-        unit:  ` ${ this.cpuUnits }`,
-      };
-    },
-
-    usedAmountTemplateValues() {
-      return {
-        used:  this.numberFormatter(this.used || 0),
-        total: this.numberFormatter(this.cpuTotal || 0),
-        unit:  ` ${ this.cpuUnits }`,
-      };
-    },
-  },
-
-  methods: {
-    numberFormatter(value) {
-      return Number.isInteger(value) ? value : value.toFixed(2);
-    },
-  },
 };
 </script>
 
 <template>
   <div>
-    <div class="consumption-gauge">
+    <ConsumptionGauge
-      <div class="numbers">
+      :capacity="cpuTotal"
-        <span class="mr-5">
+      :used="reserved"
+      :units="cpuUnits"
+      :resource-name="resourceName"
+    >
+      <template #title="{amountTemplateValues, formattedPercentage}">
+        <span>
           {{ t('harvester.formatters.hardwareResourceGauge.reserved') }}
         </span>
         <span class="precent-data">
-          {{ t('node.detail.glance.consumptionGauge.amount', reservedAmountTemplateValues) }}
+          {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
+          <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
           </span>
-      </div>
+        </span>
-      <div class="mt-10">
+      </template>
-        <PercentageBar
+    </ConsumptionGauge>
-          :model-value="reservedPercentage"
-          show-percentage
-        />
-      </div>
-    </div>
     <div
       v-if="showUsed"
-      class="consumption-gauge mt-10"
+      class="mt-10"
     >
-      <div class="numbers">
+      <ConsumptionGauge
+        :capacity="cpuTotal"
+        :used="used"
+        :units="cpuUnits"
+      >
+        <template #title="{amountTemplateValues, formattedPercentage}">
           <span>
             {{ t('harvester.formatters.hardwareResourceGauge.used') }}
           </span>
           <span class="precent-data">
-          {{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }}
+            {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
+            <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
             </span>
-      </div>
+          </span>
-      <div class="mt-10">
+        </template>
-        <PercentageBar
+      </ConsumptionGauge>
-          :model-value="usedPercentage"
-          show-percentage
-        />
-      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.consumption-gauge {
-  .numbers {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-}
-
 .precent-data {
   white-space: nowrap;
 }

pkg/harvester/formatters/HarvesterIpAddress.vue

@@ -36,10 +36,6 @@ export default {
 
   computed: {
     ips() {
-      if (this.staticAnnotationIP.length) {
-        return this.staticAnnotationIP;
-      }
-
       if (this.vmiIp.length) {
         return [...this.vmiIp, ...this.networkAnnotationIP]
           .filter(Boolean)
@@ -49,24 +45,6 @@ export default {
       return this.customAnnotationIP;
     },
 
-    staticAnnotationIP() {
-      const annotations = this.row?.metadata?.annotations || {};
-      const staticIpPrefix = `${ HCI_ANNOTATIONS.STATIC_IP }/`;
-
-      return Object.entries(annotations)
-        .filter(([key, value]) => key.startsWith(staticIpPrefix) && !!value)
-        .map(([key, value]) => {
-          const nicName = key.slice(staticIpPrefix.length);
-          const ip = String(value).replace(/\/[\d\D]*/, '');
-
-          return {
-            ip,
-            name: nicName
-          };
-        })
-        .filter(({ ip }) => isIpv4(ip));
-    },
-
     customAnnotationIP() {
       const annotationIp = get(this.row, `metadata.annotations."${ HCI_ANNOTATIONS.CUSTOM_IP }"`);
 
@@ -132,28 +110,16 @@ export default {
 </script>
 
 <template>
-  <div
+  <div v-if="showIP">
-    v-if="showIP"
+    <span
-    class="ip-list"
-  >
-    <div
       v-for="{ ip, name, isCustom } in ips"
       :key="`${ip}-${name}`"
-      class="ip-item"
     >
       <CopyToClipboardText
         v-clean-tooltip="isCustom ? t('harvester.formatters.harvesterIpAddress.customIpTooltip') : name"
         :text="ip"
         :plain="isCustom"
       />
-    </div>
+    </span>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.ip-list {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-</style>

pkg/harvester/formatters/HarvesterMemoryUsed.vue

@@ -1,11 +1,11 @@
 <script>
-import PercentageBar from '@shell/components/PercentageBar';
+import ConsumptionGauge from '@shell/components/ConsumptionGauge';
 import { METRIC, NODE } from '@shell/config/types';
 import { formatSi, exponentNeeded, UNITS, parseSi } from '@shell/utils/units';
 import { UNIT_SUFFIX } from '../utils/unit';
 export default {
   name:       'HarvesterMemoryUsed',
-  components: { PercentageBar },
+  components: { ConsumptionGauge },
 
   props: {
     value: {
@@ -76,30 +76,6 @@ export default {
         return 0;
       }
     },
-
-    reservedPercentage() {
-      return this.memoryTotal ? (this.reserved * 100) / this.memoryTotal : 0;
-    },
-
-    usedPercentage() {
-      return this.memoryTotal ? (this.used * 100) / this.memoryTotal : 0;
-    },
-
-    reservedAmountTemplateValues() {
-      return {
-        used:  this.memoryFormatter(this.reserved || 0),
-        total: this.memoryFormatter(this.memoryTotal || 0),
-        unit:  ` ${ this.memoryUnits }`,
-      };
-    },
-
-    usedAmountTemplateValues() {
-      return {
-        used:  this.memoryFormatter(this.used || 0),
-        total: this.memoryFormatter(this.memoryTotal || 0),
-        unit:  ` ${ this.memoryUnits }`,
-      };
-    },
   },
 
   methods: {
@@ -120,53 +96,50 @@ export default {
 
 <template>
   <div>
-    <div class="consumption-gauge">
+    <ConsumptionGauge
-      <div class="numbers">
+      :capacity="memoryTotal"
-        <span class="mr-10">
+      :used="reserved"
+      :units="memoryUnits"
+      :number-formatter="memoryFormatter"
+      :resource-name="resourceName"
+    >
+      <template #title="{amountTemplateValues, formattedPercentage}">
+        <span>
           {{ t('harvester.formatters.hardwareResourceGauge.reserved') }}
         </span>
         <span class="precent-data">
-          {{ t('node.detail.glance.consumptionGauge.amount', reservedAmountTemplateValues) }}
+          {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
+          <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
           </span>
-      </div>
+        </span>
-      <div class="mt-10">
+      </template>
-        <PercentageBar
+    </ConsumptionGauge>
-          :model-value="reservedPercentage"
-          show-percentage
-        />
-      </div>
-    </div>
     <div
       v-if="showUsed"
-      class="consumption-gauge mt-10"
+      class="mt-10"
     >
-      <div class="numbers">
+      <ConsumptionGauge
+        :capacity="memoryTotal"
+        :used="used"
+        :units="memoryUnits"
+        :number-formatter="memoryFormatter"
+      >
+        <template #title="{amountTemplateValues, formattedPercentage}">
           <span>
             {{ t('harvester.formatters.hardwareResourceGauge.used') }}
           </span>
           <span class="precent-data">
-          {{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }}
+            {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
+            <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
             </span>
-      </div>
+          </span>
-      <div class="mt-10">
+        </template>
-        <PercentageBar
+      </ConsumptionGauge>
-          :model-value="usedPercentage"
-          show-percentage
-        />
-      </div>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.consumption-gauge {
-  .numbers {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-}
-
 .precent-data {
   white-space: nowrap;
 }

pkg/harvester/formatters/HarvesterStorageUsed.vue

@@ -1,12 +1,12 @@
 <script>
-import PercentageBar from '@shell/components/PercentageBar';
+import ConsumptionGauge from '@shell/components/ConsumptionGauge';
 import { LONGHORN } from '@shell/config/types';
 import { formatSi, exponentNeeded, UNITS } from '@shell/utils/units';
 import { UNIT_SUFFIX } from '../utils/unit';
 
 export default {
   name:       'HarvesterStorageUsed',
-  components: { PercentageBar },
+  components: { ConsumptionGauge },
 
   props: {
     value: {
@@ -120,14 +120,6 @@ export default {
         unit:  this.allocatedUnits,
       };
     },
-
-    usedPercentage() {
-      return this.storageStats.maximum ? (this.storageStats.used * 100) / this.storageStats.maximum : 0;
-    },
-
-    allocatedPercentage() {
-      return this.storageStats.total ? (this.storageStats.scheduled * 100) / this.storageStats.total : 0;
-    },
   },
 
   methods: {
@@ -152,54 +144,53 @@ export default {
   <div>
     <div
       v-if="showAllocated"
-      class="consumption-gauge"
     >
-      <div class="numbers">
+      <ConsumptionGauge
-        <span class="mr-10">
+        :capacity="storageStats.total"
+        :used="storageStats.scheduled"
+        :units="allocatedUnits"
+        :number-formatter="formatter"
+        :resource-name="resourceName"
+      >
+        <template #title="{formattedPercentage}">
+          <span>
             {{ t('harvester.dashboard.hardwareResourceGauge.allocated') }}
           </span>
           <span class="precent-data">
             {{ t('node.detail.glance.consumptionGauge.amount', allocatedAmountTemplateValues) }}
+            <span class="ml-10 percentage">
+              /&nbsp;{{ formattedPercentage }}
             </span>
+          </span>
+        </template>
+      </ConsumptionGauge>
     </div>
-      <div class="mt-10">
+    <ConsumptionGauge
-        <PercentageBar
+      :capacity="storageStats.maximum"
-          :model-value="allocatedPercentage"
+      :used="storageStats.used"
-          show-percentage
+      :units="usedUnits"
-        />
+      :number-formatter="formatter"
-      </div>
+      :resource-name="showAllocated ? '' : resourceName"
-    </div>
+      :class="{
-    <div
+        'mt-10': showAllocated,
-      class="consumption-gauge"
+      }"
-      :class="{ 'mt-10': showAllocated }"
     >
-      <div class="numbers">
+      <template #title="{formattedPercentage}">
         <span>
           {{ t('node.detail.glance.consumptionGauge.used') }}
         </span>
         <span class="precent-data">
           {{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }}
+          <span class="ml-10 percentage">
+            /&nbsp;{{ formattedPercentage }}
           </span>
-      </div>
+        </span>
-      <div class="mt-10">
+      </template>
-        <PercentageBar
+    </ConsumptionGauge>
-          :model-value="usedPercentage"
-          show-percentage
-        />
-      </div>
-    </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.consumption-gauge {
-  .numbers {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-}
-
 .precent-data {
   white-space: nowrap;
 }

pkg/harvester/l10n/en-us.yaml

@@ -13,15 +13,6 @@ generic:
   basic: Basic
   loading: Loading...
   none: None
-  duration:
-    infinite: Infinite
-    1s: 1 second
-    5s: 5 seconds
-    10s: 10 seconds
-    30s: 30 seconds
-    1m: 1 minute
-    3m: 3 minutes
-    5m: 5 minutes
 
 unsupported:
   serverVersion: 'Current version: <code>{serverVersion}</code>'
@@ -36,8 +27,7 @@ nav:
     Logging: Logging
     'Monitoring and Logging': Monitoring and Logging
     vmimport: Virtual Machine Imports
-    vmMigration: Virtual Machine Migration
+    vmMigration: VM Migration
-    Configurations: Configurations
 
 resourceTable:
   groupBy:
@@ -93,8 +83,6 @@ harvester:
     backup:
       success: 'Backup { backUpName } has been initiated.'
       addBackup: Add Backup
-      fileSystemFreezeDeadline:
-        label: 'File System Freeze Deadline'
     quota:
       editVMQuota: Edit VM Quota
       editQuota: Edit Quota
@@ -234,8 +222,6 @@ harvester:
       title: Take Virtual Machine Snapshot
       name: Name
       success: 'Take virtual machine Snapshot { name } successfully.'
-      fileSystemFreezeDeadline:
-        label: 'File System Freeze Deadline'
     restart:
       title: Restart Virtual Machine
       tip: Restart the virtual machine for configuration changes to take effect.
@@ -331,8 +317,7 @@ harvester:
     message: Message
     phase: Phase
     attachedVM: Attached Virtual Machine
-    cpuManager: CPU<br>Manager
+    cpuManager: CPU Manager
-    diskState: Disk
     routeConnectivityTooltip: Connectivity between the VM network and the management network, which the Harvester nodes are connected to.
     fingerprint: Fingerprint
     value: Value
@@ -380,7 +365,7 @@ harvester:
     vmMigrationMapSourceProvider: Source Provider
     vmMigrationMapDestProvider: Destination Provider
     vmMigrationPlanTargetNs: Target Namespace
-    vmMigrationPlanVmCount: VM Count
+    vmMigrationPlanVmCount: VMs
     vmMigrationMigrationPlan: Plan
   tab:
     volume: Volumes
@@ -406,7 +391,6 @@ harvester:
     network: Network
     model: Model
     macAddress: MAC address
-    staticIp: Static IP
     port: Port
     protocol: Protocol
     remove: Remove
@@ -488,6 +472,7 @@ harvester:
       volume:
         upperType: Volume name
         lowerType: volume name
+        needAtLeastOneBootable: 'At least one bootable volume is required!'
     image:
       ruleTip: 'The URL you have entered ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
       ruleFileTip: 'The file you have chosen ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
@@ -641,7 +626,6 @@ harvester:
       notification:
         success: 'Update host "{name}" storage configurations successfully.'
       error: Host has unready or unschedulable disks.
-      mounted: Already Mounted
       fileSystem:
         info: Current file system is {system}, You can format it manually.
         formatting: Disk is formatting, please wait.
@@ -781,7 +765,6 @@ harvester:
       dragTip: Drag and drop volumes, or use the volume's arrows, to change the boot order.
       volumeTip: The virtual machine only contains a CD-ROM volume. You may want to add additional disk volumes.
       macTip: "MAC address as seen inside the guest system."
-      staticIpTip: "Static IP that will be stored to annotation static-ip.harvesterhci.io/{nic_name}."
       volumeUpdate: 'Set volume { name } successfully'
       type: Type
       size: Size
@@ -1099,8 +1082,6 @@ harvester:
       downloadLog: Download Log
       logStatus: Log Download Status
     dismissMessage: Dismiss it
-    upgradeAvailable: Upgrade Available
-    upgradeUnavailable: Upgrade Unavailable
     upgradeInfo:
       warning: WARNING
       doc: Read the <a href="{url}" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
@@ -1838,7 +1819,6 @@ harvester:
         unknown: Unknown
         identifier: Identifier
         podNetwork: Pod Network
-        ignored: Ignored
         usedBy: "Used by:"
         vlan: "VLAN {id}"
         vCpu: "{count} vCPU"
@@ -1859,7 +1839,7 @@ harvester:
         connectionFailed: Connection failed
         providerNotReady: Provider not ready
       labels:
-        dashboard: Migration Overview
+        dashboard: Migrations
         provider: Providers
         networkMap: Network Maps
         storageMap: Storage Maps
@@ -1893,14 +1873,11 @@ harvester:
         providerSelect: Provider
         createNew: Create new provider
         requirementsTitle: Requirements
-        requirementsText: "To migrate virtual machines from VMware, you will need a vCenter Server running version 6.5 or higher with a user account that has at least read permissions, and the source environment must be network-accessible from Harvester Node."
+        requirementsText: "To migrate virtual machines from VMware, you will need a vCenter Server running version 6.5 or higher with a user account that has at least read permissions, and the source environment must be network-accessible from Rancher."
         name: Name
         urlLabel: vCenter/ESXi URL
         urlPlaceholder: "https://vcenter.example.com/sdk"
         urlHint: Enter the full URL including https://
-        vddkImageLabel: VMware VDDK Image
-        vddkImagePlaceholder: "[your-private-registry]/vddk-image:latest"
-        vddkImageTooltip: Specify the VMware VDDK (Virtual Disk Development Kit) Image to accelerate and optimize VMware virtual machine migration.
         skipSsl: Skip SSL certificate verification
         skipSslHint: Not recommended for production environments
         testConnection:
@@ -1922,7 +1899,6 @@ harvester:
         refreshNow: Refresh now
         availableVms: Available Virtual Machines
         selected: selected
-        clearAll: Clear All
         saveSelection: Save Selection and Continue
         selectAllBanner:
           pageOnly: "Your current selection includes only VMs currently shown on the page."
@@ -1945,8 +1921,8 @@ harvester:
           network: Network
           datastore: Datastore
       dashboard:
-        title: Virtual Machine Migration Overview
+        title: VMware to Harvester Migration
-        description: "Migrate virtual machines from VMware vSphere to Harvester using cold migration for data consistency. Create a migration plan to select VMs, map networks and storage, and prepare a migration to Harvester."
+        description: Migrate virtual machines from VMware vSphere to Harvester using cold migration for data consistency. Create a migration plan to select VMs, map networks and storage, and prepare a migration to Harvester.
         createPlan: Create Migration
         tableTitle: Migrations
         columns:
@@ -1954,85 +1930,48 @@ harvester:
           plan: Migration Plan
           progress: Progress
           mappings: Mappings
-          duration: Duration
         progress:
           failed: Failed
           migration: Migration
           initializingMigration: Initializing migration
           finishedSuccessfully: Finished Successfully
           step: "Step {index}"
-          vmCount: "{count, plural, one {# VM} other {# VMs}}"
+          vmCount: "{count} VMs"
           vmId: "id: {id}"
-          checkMigratedVm: Click to check migrated VM details
       configureMappings:
         title: Set Mappings
         description: Map VMware networks and datastores to Harvester and Longhorn target resources
         save: Save Mappings and Continue
         noTemplate: Start from scratch
-        removeMap: Remove mapping
+        removeMap: Remove Map
         networkMapping:
           title: Network Mapping
           description: Map VMware port groups to Harvester networks
           placeholder: Choose a Harvester network
           template: Use existing network mapping as template
           options:
-            podNetworking: Management Network
+            podNetworking: Pod Networking
-            ignored: Ignored (No NIC will be created)
+            ignored: Ignored
         storageMapping:
           title: Storage Mapping
           description: Map VMware datastores to Harvester storage classes
-          placeholder: Choose a Harvester Storage Class
+          placeholder: Choose a Longhorn Storage Volume
           template: Use existing storage mapping as template
-      storageDefaults:
-        title: 'Storage defaults — {name}'
-        description: 'Set the volume mode and access modes applied to every datastore in this storage map that maps to {name}.'
-        descriptionInherited: 'Applies to every datastore in this storage map that maps to {name}. The provider default for {provider} stays unchanged.'
-        summary: 'Volume mode: {volumeMode} · Access mode: {accessModes}'
-        inherited: 'Inherited from provider {provider}'
-        volumeMode: Volume Mode
-        accessMode: Access Mode
-        edit: Edit
-        cancel: Cancel
-        apply: Apply
-        resetToProviderDefault: Reset to Provider Default
-        applyOverride: Apply Override
       reviewMigration:
         title: Review Migration Plan
         description: Confirm your migration settings before starting the transfer of VMs to the target cluster.
         planName: Name
         planNamePlaceholder: "e.g. my-migration-plan"
-        planNameProviderConflict: 'The name “{name}” is already used by an existing provider. Please input a different plan name.'
-        planNamePlanConflict: 'The name “{name}” is already used by an existing migration plan. Please input a different plan name.'
         migrationDetails: Migration Details
-        migrationDetailsDescription: Name this plan and choose the namespace where migrated VMs will be created.
         totalVms: Total VMs
         vcpu: vCPU
         memory: Memory
         storage: Storage
         source: Source
-        provider: Provider
+        targetNamespace: Target Namespace
-        targetNamespace: Namespace
-        targetNamespacePlaceholder: "Select target namespace"
         migrationMode: Migration Mode
         coldMigration: Cold Migration
-        coldMigrationDescription: All source VMs will be powered off during migration.
-        coldMigrationHint: Plan a maintenance window and notify relevant stakeholders before starting.
         virtualMachines: Virtual Machines
-        editSelection: Edit selection
-        noVmSelected: "No VMs selected. Return to "
-        noVmSelectedLink: "Step 2 to select virtual machines."
-        columns:
-          vmName: VM Name
-          os: Operating System
-          resources: Resources
-          powerState: Power State
-          networkMapping: Network Mapping
-          storageMapping: Storage Mapping
-          sourceTarget: "Source \u2192 Target"
-        actions:
-          menuLabel: Actions
-          editMappings: Edit Mappings
-          removeFromPlan: Remove from Plan
         warningTitle: "Cold Migration Warning"
         warningMessage: "All source VMs will be powered off, and downtime will occur during migration. Plan your maintenance window accordingly and notify relevant stakeholders"
         startMigration: Start Migration Plan
@@ -2046,8 +1985,6 @@ harvester:
           start: Start
           restart: Restart
           stop: Stop
-      deleteDialog:
-        warning: Deleting this migration plan will also delete the following related resources
 
     vmImport:
       titles:
@@ -2297,12 +2234,6 @@ harvester:
       prefix: The nvidia-driver-toolkit add-on is not enabled, click
       middle: here
       suffix: to enable it to manage your SR-IOV GPU devices.
-    enable:
-      title: Enable SR-IOV GPU Device
-      skipMigConfiguration: Use timesliced mode (skip MIG configuration)
-      note: If unchecked, MIG mode will be attempted by default. If MIG mode is not supported or fails to initialize, it will fall back to timesliced mode. The actual mode depends on whether the GPU supports MIG.
-    timeslicedBadge: timesliced mode
-    timesliced: Timesliced
 
   migconfiguration:
     label: vGPU MIG Configurations

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

@@ -86,13 +86,6 @@ export default {
           value: 'spec.address',
           sort:  ['spec.address']
         },
-        {
-          name:      'timesliced',
-          labelKey:  'harvester.sriovgpu.timesliced',
-          value:     'isTimesliced',
-          formatter: 'Checked',
-          align:     'center',
-        },
         {
           name:        'vfAddresses',
           label:       'VF Addresses',

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

@@ -53,6 +53,7 @@ export default {
 
     devices() {
       const inStore = this.$store.getters['currentProduct'].inStore;
+
       const data = this.$store.getters[`${ inStore }/all`](HCI.USB_DEVICE) || [];
 
       data.forEach((row) => {

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

@@ -84,7 +84,7 @@ export default {
         },
         {
           ...NAME,
-          width: 150,
+          width: 130,
         },
         {
           name:      'host-ip',
@@ -136,14 +136,14 @@ export default {
           value:         'id',
           formatter:     'HarvesterCPUPinning',
           formatterOpts: { rows: this.rows },
-          width:         75,
+          width:         150,
           align:         'center',
         });
       }
       if (this.hasLonghornSchema) {
         out.push({
           name:      'diskState',
-          labelKey:  'harvester.tableHeaders.diskState',
+          labelKey:  'tableHeaders.diskState',
           value:     'diskState',
           formatter: 'HarvesterDiskState',
           width:     130,
@@ -156,6 +156,7 @@ export default {
         name:  'console',
         label: ' ',
         align: 'right',
+        width: 80,
       });
 
       return out;
@@ -238,8 +239,6 @@ export default {
             v-if="!row.consoleUrl"
             :href="consoleDocLink"
             target="_blank"
-            rel="noopener noreferrer"
-            class="console-info"
           ><i class="icon icon-info" /></a>
         </div>
       </template>
@@ -250,13 +249,5 @@ export default {
 <style lang="scss" scoped>
   .console-button {
     display: flex;
-    position: relative;
-    justify-content: flex-end;
-  }
-
-  .console-info {
-    position: absolute;
-    top: -8px;
-    right: -3px;
   }
 </style>

pkg/harvester/list/network.harvesterhci.io.clusternetwork.vue

@@ -59,7 +59,7 @@ export default {
 
       const configs = this.$store.getters[`${ inStore }/all`](HCI.VLAN_CONFIG);
 
-      return configs.filter((config) => config.spec?.clusterNetwork !== 'mgmt');
+      return configs;
     },
 
     vlanConfigSchema() {
@@ -121,22 +121,6 @@ export default {
 
       return [...this.rows, ...fakeRows];
     },
-
-    managementVlanConfigs() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      const configs = this.$store.getters[`${ inStore }/all`](HCI.VLAN_CONFIG);
-
-      return configs
-        .filter((vc) => vc.spec?.clusterNetwork === 'mgmt')
-        .map((vc) => ({
-          id:         vc.id,
-          node:       vc.id.replace('mgmt-vlanconfig-', ''),
-          bondMode:   vc.spec?.uplink?.bondOptions?.mode || '-',
-          interfaces: (vc.spec?.uplink?.nics?.length ? vc.spec.uplink.nics.join(', ') : '-'),
-          mtu:        vc.spec?.uplink?.linkAttributes?.mtu || '-',
-        }));
-    },
   },
 
   methods: {
@@ -240,29 +224,6 @@ export default {
               </button>
             </div>
           </div>
-
-          <div
-            v-if="group.key === 'mgmt'"
-            class="mgmt-summary"
-          >
-            <div class="mgmt-header">
-              <div>{{ t('harvester.tableHeaders.vm.node') }}</div>
-              <div>{{ t('harvester.vlanConfig.uplink.bondOptions.mode.label') }}</div>
-              <div>{{ t('harvester.vlanConfig.uplink.nics.label') }}</div>
-              <div>{{ t('harvester.vlanConfig.uplink.linkAttributes.mtu.label') }}</div>
-            </div>
-
-            <div
-              v-for="config in managementVlanConfigs"
-              :key="config.id"
-              class="mgmt-row"
-            >
-              <div>{{ config.node }}</div>
-              <div>{{ config.bondMode }}</div>
-              <div>{{ config.interfaces }}</div>
-              <div>{{ config.mtu }}</div>
-            </div>
-          </div>
         </template>
         <template
           v-for="(clusterNetwork, i) in clusterNetworkWithoutConfigs"
@@ -312,21 +273,6 @@ export default {
     }
   }
 }
-
-.mgmt-header,
-.mgmt-row {
-  display: grid;
-  grid-template-columns: 2fr 2fr 2fr 1fr;
-  padding: 8px 12px;
-}
-
-.mgmt-header {
-  font-weight: 600;
-}
-
-.mgmt-row {
-  border-top: 1px solid var(--border);
-}
 </style>
 
 <style lang="scss">

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

@@ -25,9 +25,7 @@ import { HCI } from '../../types';
 import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
 import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { GIBIBYTE } from '../../utils/unit';
-import { VOLUME_MODE, ACCESS_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
-
-const { READ_WRITE_MANY } = ACCESS_MODE;
 
 const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
 
@@ -164,12 +162,6 @@ export default {
       machineType:                   '',
       machineTypes:                  [],
       secretName:                    '',
-      // Tracks the name prefix that `secretName` was generated from, so it can be
-      // regenerated if the VM name changes (e.g. after a failed create attempt is retried
-      // with a different name). See harvester/harvester#11174.
-      secretNamePrefixUsed:          '',
-      // Same purpose as secretNamePrefixUsed, but for the Windows sysprep secret name.
-      sysprepSecretNamePrefixUsed:   '',
       secretRef:                     null,
       showAdvanced:                  false,
       deleteAgent:                   true,
@@ -278,7 +270,7 @@ export default {
     },
 
     customAccessMode() {
-      return this.storageClassSetting.accessModes || READ_WRITE_MANY;
+      return this.storageClassSetting.accessModes || 'ReadWriteMany';
     },
 
     isWindows() {
@@ -506,7 +498,7 @@ export default {
           id:               randomStr(5),
           source:           SOURCE_TYPE.IMAGE,
           name:             'disk-0',
-          accessMode:       READ_WRITE_MANY, // root disk only support LHv1 volume, should be RWX
+          accessMode:       'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
           bus,
           volumeName:       '',
           size,
@@ -572,7 +564,7 @@ export default {
               const pvcResource = allPVCs.find( (O) => O.id === `${ namespace }/${ volume?.persistentVolumeClaim?.claimName }`);
 
               source = SOURCE_TYPE.ATTACH_VOLUME;
-              accessMode = pvcResource?.spec?.accessModes?.[0] || READ_WRITE_MANY;
+              accessMode = pvcResource?.spec?.accessModes?.[0] || 'ReadWriteMany';
               size = pvcResource?.spec?.resources?.requests?.storage || '10Gi';
               storageClassName = pvcResource?.spec?.storageClassName;
               volumeMode = pvcResource?.spec?.volumeMode || VOLUME_MODE.BLOCK;
@@ -638,8 +630,6 @@ export default {
 
       const networks = vm.spec.template.spec.networks || [];
       const interfaces = vm.spec.template.spec.domain.devices.interfaces || [];
-      const annotations = vm.metadata?.annotations || {};
-      const staticIpPrefix = `${ HCI_ANNOTATIONS.STATIC_IP }/`;
 
       const out = interfaces.map( (I, index) => {
         const network = networks.find( (N) => I.name === N.name);
@@ -656,7 +646,6 @@ export default {
           newCreateId: (fromTemplate || init) ? randomStr(10) : false,
           model:       I.model,
           networkName: isPod ? MANAGEMENT_NETWORK : network?.multus?.networkName,
-          staticIp:    annotations[`${ staticIpPrefix }${ I.name }`] || '',
         };
       });
 
@@ -758,8 +747,6 @@ export default {
 
       const vm = this.resourceType === HCI.VM ? this.value : this.value.spec.vm;
 
-      this.syncStaticIpAnnotations(vm);
-
       // parse reserved memory
       if (!this.reservedMemory) {
         delete vm.metadata.annotations[HCI_ANNOTATIONS.VM_RESERVED_MEMORY];
@@ -781,53 +768,6 @@ export default {
       }
     },
 
-    syncStaticIpAnnotations(vm) {
-      if (!vm?.metadata) {
-        return;
-      }
-
-      if (!vm.metadata.annotations) {
-        vm.metadata.annotations = {};
-      }
-
-      const staticIpPrefix = `${ HCI_ANNOTATIONS.STATIC_IP }/`;
-      const annotations = vm.metadata.annotations;
-
-      const desired = {};
-
-      this.networkRows.forEach((row) => {
-        if (row.name && row.staticIp) {
-          desired[`${ staticIpPrefix }${ row.name }`] = row.staticIp;
-        }
-      });
-
-      const current = {};
-
-      Object.keys(annotations).forEach((key) => {
-        if (key.startsWith(staticIpPrefix)) {
-          current[key] = annotations[key];
-        }
-      });
-
-      // Skip mutation when already in sync to avoid triggering a reactive update loop.
-      const desiredKeys = Object.keys(desired);
-      const currentKeys = Object.keys(current);
-      const isSame = desiredKeys.length === currentKeys.length &&
-        desiredKeys.every((key) => current[key] === desired[key]);
-
-      if (isSame) {
-        return;
-      }
-
-      currentKeys.forEach((key) => {
-        delete annotations[key];
-      });
-
-      Object.entries(desired).forEach(([key, value]) => {
-        annotations[key] = value;
-      });
-    },
-
     setCPUAndMemory() {
       if (this.cpuMemoryHotplugEnabled) {
         // set CPU
@@ -897,30 +837,18 @@ export default {
         }
       });
 
-      // Regenerate the cloud-init secret name whenever it hasn't been generated yet, or the VM
+      if (this.needNewSecret || !this.secretName) {
-      // name has changed since it was last generated (e.g. a previous create attempt failed with
-      // an invalid/duplicate name and the user corrected it). Without this, a stale secret name
-      // derived from a rejected attempt gets reused for the VM that's actually created.
-      // See harvester/harvester#11174.
-      if (this.needNewSecret || !this.secretName || (this.isCreate && this.secretNamePrefixUsed !== this.secretNamePrefix)) {
         this.secretName = this.generateSecretName(this.secretNamePrefix);
-        this.secretNamePrefixUsed = this.secretNamePrefix;
       }
 
       if (!disks.find((D) => D.name === 'sysprep') && this.isWindows) {
         const hasSysprepContent = !!this.sysprep.xmlContent?.trim?.();
 
-        // If we have content but no secret name, it's a new secret that needs a name. Also
+        // If we have content but no secret name, it's a new secret that needs a name.
-        // regenerate when creating a VM if the name prefix has changed since it was last
+        if (hasSysprepContent && !this.sysprep.secretName?.trim?.()) {
-        // generated.
-        const sysprepNeedsNewSecretName = !this.sysprep.secretName?.trim?.() ||
-          (this.isCreate && this.sysprepSecretNamePrefixUsed !== '' && this.sysprepSecretNamePrefixUsed !== this.secretNamePrefix);
-
-        if (hasSysprepContent && sysprepNeedsNewSecretName) {
           const prefix = this.secretNamePrefix ? `${ this.secretNamePrefix }-windows-sysprep` : 'windows-sysprep';
 
           this.sysprep.secretName = `${ this.value.metadata.namespace }/${ this.generateSecretName(prefix) }`;
-          this.sysprepSecretNamePrefixUsed = this.secretNamePrefix;
         }
 
         // Preserve/attach sysprep whenever a secret is selected/known.
@@ -939,7 +867,8 @@ export default {
         }
       }
 
-      if (!disks.find( (D) => D.name === 'cloudinitdisk') && (this.userData || this.networkScript)) {
+      if (!disks.find( (D) => D.name === 'cloudinitdisk') && (this.userData || this.networkData)) {
+        if (!this.isWindows) {
           disks.push({
             name: 'cloudinitdisk',
             disk: { bus: 'virtio' }
@@ -965,6 +894,7 @@ export default {
 
           volumes.push(cloudinitdisk);
         }
+      }
 
       const specDisks = this.spec?.template?.spec?.domain?.devices?.disks;
       const mergedDisks = this.mergeDeviceList(specDisks, disks);
@@ -1165,16 +1095,6 @@ export default {
     },
 
     getInitUserData(config) {
-      // Windows guests don't use qemu-guest-agent via systemd (VMDP installs
-      // the QGA as a Windows service), and the Linux `runcmd` recipe would
-      // fail on Cloudbase-Init. Return an empty string so `this.userData`
-      // stays falsy on Windows until the user actually enters cloud-config
-      // content — this prevents emitting a spurious cloudinitdisk volume
-      // and Secret for every Windows VM (Copilot review comment on #984).
-      if (config.osType === 'windows') {
-        return '';
-      }
-
       const _QGA_JSON = this.getMatchQGA(config.osType);
 
       const out = jsyaml.dump(_QGA_JSON);
@@ -1377,22 +1297,13 @@ export default {
      */
     deleteYamlDocProp(doc, paths) {
       try {
-        const items = doc.getIn([])?.items;
+        const item = doc.getIn([])?.items[0];
-        const firstKey = items?.[0]?.key;
+        const key = item?.key;
-        const hasCloudConfigComment = !!firstKey?.commentBefore?.includes('cloud-config');
+        const hasCloudConfigComment = !!key?.commentBefore?.includes('cloud-config');
-        const isFirstProp = firstKey?.source === paths[paths.length - 1];
+        const isMatchProp = key.source === paths[paths.length - 1];
 
-        if (firstKey && hasCloudConfigComment && isFirstProp) {
+        if (key && hasCloudConfigComment && isMatchProp) {
-          const comment = firstKey.commentBefore;
+          // Comments are mounted on the next node and we should not delete the node containing cloud-config
-
-          doc.deleteIn(paths);
-
-          // Move the comment to the new first key; if no keys remain the comment is lost.
-          const newFirstKey = doc.getIn([])?.items?.[0]?.key;
-
-          if (newFirstKey) {
-            newFirstKey.commentBefore = comment;
-          }
         } else {
           doc.deleteIn(paths);
         }
@@ -1443,6 +1354,7 @@ export default {
       if (packages.length > 0) {
         userDataDoc.setIn(['packages'], packages);
       } else {
+        userDataDoc.setIn(['packages'], []); // It needs to be set empty first, as it is possible that cloud-init comments are mounted on this node
         this.deleteYamlDocProp(userDataDoc, ['packages']);
         this.deleteYamlDocProp(userDataDoc, ['package_update']);
       }
@@ -1457,7 +1369,7 @@ export default {
     },
 
     deleteQGA(config) {
-      const { osType, userDataDoc } = config;
+      const { osType, userDataDoc, deletePackage = false } = config;
 
       const userDataTemplateValue = this.$store.getters['harvester/byId'](CONFIG_MAP, this.userDataTemplateId)?.data?.cloudInit || '';
 
@@ -1466,15 +1378,6 @@ export default {
       const packages = userDataJSON?.packages || [];
       const runcmd = userDataJSON?.runcmd || [];
 
-      // Special handling of OS types.
-      let deletePackage = config.deletePackage ?? false;
-
-      switch (osType) {
-      case 'windows':
-        deletePackage = true;
-        break;
-      }
-
       if (Array.isArray(packages) && deletePackage) {
         const templateHasQGAPackage = this.convertToJson(userDataTemplateValue);
 
@@ -1500,6 +1403,7 @@ export default {
       if (packages.length > 0) {
         userDataDoc.setIn(['packages'], packages);
       } else {
+        userDataDoc.setIn(['packages'], []);
         this.deleteYamlDocProp(userDataDoc, ['packages']);
         this.deleteYamlDocProp(userDataDoc, ['package_update']);
       }
@@ -1532,7 +1436,7 @@ export default {
     },
 
     async saveSecret(vm) {
-      if (!vm?.spec || !this.secretName) {
+      if (!vm?.spec || !this.secretName || this.isWindows) {
         return true;
       }
 
@@ -1855,18 +1759,7 @@ export default {
         const specDevice = specDeviceMap.get(device.name);
 
         if (specDevice) {
-          const merged = { ...specDevice, ...device };
+          return { ...specDevice, ...device };
-
-          // A disk entry must be either `disk` or `cdrom`, never both.
-          const type = device?.cdrom ? CD_ROM : device?.disk ? HARD_DISK : '';
-
-          if (type === CD_ROM) {
-            delete merged.disk;
-          } else if (type === HARD_DISK) {
-            delete merged.cdrom;
-          }
-
-          return merged;
         }
 
         return device;
@@ -1914,15 +1807,6 @@ export default {
   },
 
   watch: {
-    networkRows: {
-      handler() {
-        const vm = this.resourceType === HCI.VM ? this.value : this.value?.spec?.vm;
-
-        this.syncStaticIpAnnotations(vm);
-      },
-      deep: true
-    },
-
     diskRows: {
       handler(neu, old) {
         if (Array.isArray(neu)) {
@@ -1953,6 +1837,8 @@ export default {
     isWindows(val) {
       if (val) {
         this['sshKey'] = [];
+        this['userScript'] = undefined;
+        this['networkScript'] = undefined;
         this['installAgent'] = false;
       }
     },
@@ -2012,8 +1898,9 @@ export default {
 
     osType(neu, old) {
       this.installAgent = old === 'windows' ? true : this.installAgent;
-      this.userScript = this.getUserData({ installAgent: this.installAgent, osType: neu });
+      const out = old === 'windows' ? this.getInitUserData({ osType: neu }) : this.getUserData({ installAgent: this.installAgent, osType: neu });
 
+      this['userScript'] = out;
       this.refreshYamlEditor();
     },
 

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

@@ -69,15 +69,16 @@ export default class SRIOVDevice extends SteveModel {
     return this.spec.enabled && this.status?.vfAddresses?.length > 0 && this.status?.vGPUDevices?.length > 0;
   }
 
-  get isTimesliced() {
+  async enableDevice() {
-    return this.metadata?.annotations?.[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] === 'true';
+    try {
+      this.spec.enabled = true;
+      await this.save();
+    } catch (err) {
+      this.$dispatch('growl/fromError', {
+        title: this.t('generic.notification.title.error', { name: escapeHtml(this.metadata.name) }),
+        err,
+      }, { root: true });
     }
-
-  enableDevice() {
-    this.$dispatch('promptModal', {
-      resources: [this],
-      component: 'EnableSriovGpuDevice'
-    });
   }
 
   async disableDevice() {

pkg/harvester/models/forklift.konveyor.io.plan.js

@@ -14,17 +14,6 @@ export default class ForkliftPlan extends HarvesterResource {
     };
   }
 
-  /**
-   * The base HarvesterResource sets `doneOverride` to `listLocation`, which would
-   * force every single-item delete to redirect to the VM Migration dashboard.
-   * Return undefined so the delete flow stays on the current page (list/dashboard)
-   * and only falls back to the shell's default navigation when a now-invalid
-   * detail page is being viewed.
-   */
-  get doneOverride() {
-    return undefined;
-  }
-
   get planFailed() {
     const conditions = this.status?.conditions || [];
 
@@ -46,10 +35,6 @@ export default class ForkliftPlan extends HarvesterResource {
   }
 
   get stateDescription() {
-    if (this.metadata?.deletionTimestamp) {
-      return null;
-    }
-
     const messages = [];
     const conditions = this.status?.conditions || [];
 
@@ -71,7 +56,7 @@ export default class ForkliftPlan extends HarvesterResource {
   get stateObj() {
     return {
       error:         this.planFailed || this.planCritical,
-      transitioning: this.isMigrating || this.isPendingMigrationStart || !!this.metadata?.deletionTimestamp,
+      transitioning: this.isMigrating,
       message:       this.stateDescription,
     };
   }
@@ -82,14 +67,6 @@ export default class ForkliftPlan extends HarvesterResource {
     return !!migration?.started && !migration?.completed;
   }
 
-  // Right after creating a plan, controller status can lag briefly.
-  // Treat this window as in-progress so we don't flash a succeeded badge.
-  get isPendingMigrationStart() {
-    const vmCount = this.spec?.vms?.length || 0;
-
-    return vmCount > 0 && !this.planFailed && !this.planCritical && !this.planCanceled && !this.planSucceeded && !this.isMigrating;
-  }
-
   get planCanceled() {
     const history = this.status?.migration?.history || [];
 
@@ -110,10 +87,6 @@ export default class ForkliftPlan extends HarvesterResource {
   }
 
   get stateDisplay() {
-    if (this.metadata?.deletionTimestamp) {
-      return 'Terminating';
-    }
-
     if (this.planFailed) {
       return this.t('harvester.addons.vmMigration.plan.states.error');
     }
@@ -130,18 +103,10 @@ export default class ForkliftPlan extends HarvesterResource {
       return this.t('harvester.addons.vmMigration.plan.states.inProgress');
     }
 
-    if (this.isPendingMigrationStart) {
-      return this.t('harvester.addons.vmMigration.plan.states.inProgress');
-    }
-
     return this.t('harvester.addons.vmMigration.plan.states.active');
   }
 
   get stateBackground() {
-    if (this.metadata?.deletionTimestamp) {
-      return 'bg-info';
-    }
-
     if (this.planFailed) {
       return 'bg-error';
     }
@@ -158,10 +123,6 @@ export default class ForkliftPlan extends HarvesterResource {
       return 'bg-info';
     }
 
-    if (this.isPendingMigrationStart) {
-      return 'bg-info';
-    }
-
     return 'bg-success';
   }
 
@@ -283,4 +244,15 @@ export default class ForkliftPlan extends HarvesterResource {
   async deletePlan() {
     await this.remove();
   }
+
+  /**
+   * Deleting a Plan cascades via ownerReferences set at creation time.
+   * Kubernetes GC will automatically delete: Migration, NetworkMap, StorageMap, Provider (→ Secret).
+   * Use foreground propagation to ensure children are deleted before the parent.
+   */
+  remove(opt = {}) {
+    opt.params = { ...(opt.params || {}), propagationPolicy: 'Foreground' };
+
+    return this._remove(opt);
+  }
 }

pkg/harvester/package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.10.0-dev",
+  "version": "1.9.0-dev",
   "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.15.0-0",
+      "catalog.cattle.io/rancher-version": ">= 2.14.0-0",
       "catalog.cattle.io/ui-extensions-version": ">= 3.0.0 < 4.0.0"
     }
   },

pkg/harvester/pages/c/_cluster/vm-migration/index.vue

@@ -11,8 +11,6 @@ import { SCHEMA } from '@shell/config/types';
 import { useI18n } from '@shell/composables/useI18n';
 import { HCI } from '../../../../types';
 import { PRODUCT_NAME } from '../../../../config/harvester';
-import { ADD_ONS } from '../../../../config/harvester-map';
-import { currentRouter } from '../../../../utils/router';
 import { FORKLIFT_PLAN_VM_COUNT } from '../../../../config/table-headers';
 import { STATE, NAME as NAME_COL, AGE } from '@shell/config/table-headers';
 
@@ -37,88 +35,6 @@ const inStore = computed(() => store.getters['currentProduct'].inStore);
 const allPlans = computed(() => store.getters[`${ inStore.value }/all`](HCI.FORKLIFT_PLAN));
 const allNetworkMaps = computed(() => store.getters[`${ inStore.value }/all`](HCI.FORKLIFT_NETWORK_MAP));
 const allStorageMaps = computed(() => store.getters[`${ inStore.value }/all`](HCI.FORKLIFT_STORAGE_MAP));
-const allVMs = computed(() => store.getters[`${ inStore.value }/all`](HCI.VM));
-
-const escapeHtml = (value = '') => String(value)
-  .replaceAll('&', '&')
-  .replaceAll('<', '&lt;')
-  .replaceAll('>', '&gt;')
-  .replaceAll('"', '&quot;')
-  .replaceAll("'", '&#39;');
-
-const getPipelineStepMeta = (step = {}) => {
-  const phase = String(step.phase || '').toLowerCase();
-  const hasProgress = typeof step.progress?.completed === 'number' && typeof step.progress?.total === 'number' && step.progress.total > 0;
-  const progressPct = hasProgress ? Math.round((step.progress.completed / step.progress.total) * 1000) / 10 : null;
-
-  if (phase === 'completed' || phase === 'succeeded') {
-    return {
-      icon:  '✓',
-      color: 'var(--success)',
-      text:  ''
-    };
-  }
-
-  if (phase === 'running' || phase === 'inprogress' || phase === 'progressing' || phase === 'started' || (hasProgress && progressPct > 0)) {
-    return {
-      icon:  '↻',
-      color: 'var(--primary)',
-      text:  progressPct !== null ? `${ step.phase || t('generic.inProgress') } (${ progressPct }%)` : (step.phase || t('generic.inProgress'))
-    };
-  }
-
-  if (phase === 'failed' || phase === 'error') {
-    return {
-      icon:  '✕',
-      color: 'var(--error)',
-      text:  step.phase || t('harvester.addons.vmMigration.dashboard.progress.failed')
-    };
-  }
-
-  return {
-    icon:  '○',
-    color: 'var(--muted)',
-    text:  ''
-  };
-};
-
-const formatPipelineTooltip = (pipeline = []) => {
-  if (!pipeline.length) {
-    return `<div style="display:flex;align-items:center;gap:8px;"><span style="color:var(--muted);font-weight:700;">○</span><span>${ escapeHtml(t('harvester.addons.vmMigration.dashboard.progress.initializingMigration')) }</span></div>`;
-  }
-
-  return pipeline
-    .map((step, idx) => {
-      const stepName = step.name || t('harvester.addons.vmMigration.dashboard.progress.step', { index: idx + 1 });
-      const meta = getPipelineStepMeta(step);
-      const lineText = meta.text ? `${ escapeHtml(stepName) } : ${ escapeHtml(meta.text) }` : escapeHtml(stepName);
-
-      return `<div style="display:flex;align-items:center;gap:8px;"><span style="color:${ meta.color };font-weight:700;">${ meta.icon }</span><span>${ lineText }</span></div>`;
-    })
-    .join('');
-};
-
-const formatDuration = (started, completed) => {
-  if (!started) {
-    return { display: null, seconds: -1 };
-  }
-
-  const startMs = new Date(started).getTime();
-  const endMs = completed ? new Date(completed).getTime() : Date.now();
-
-  if (isNaN(startMs) || isNaN(endMs) || endMs < startMs) {
-    return { display: null, seconds: -1 };
-  }
-
-  const totalSeconds = Math.floor((endMs - startMs) / 1000);
-  const hours = Math.floor(totalSeconds / 3600);
-  const minutes = Math.floor((totalSeconds % 3600) / 60);
-  const seconds = totalSeconds % 60;
-
-  const display = hours > 0 ? `${ hours }h ${ minutes }m` : `${ minutes }m ${ seconds }s`;
-
-  return { display, seconds: totalSeconds };
-};
 
 const rows = computed(() => {
   return allPlans.value.map((plan) => {
@@ -130,8 +46,8 @@ const rows = computed(() => {
     const netMap = allNetworkMaps.value.find((m) => m.metadata.name === netMapName && m.metadata.namespace === netMapNs);
     const storMap = allStorageMaps.value.find((m) => m.metadata.name === storMapName && m.metadata.namespace === storMapNs);
 
-    plan.networkEntries = (netMap?.spec?.map || []).map((e) => `${ e.source?.id || 'Ignored' } → ${ e.destination?.type === 'pod' ? t('harvester.addons.vmMigration.configureMappings.networkMapping.options.podNetworking') : (e.destination?.name || 'Ignored') }`);
+    plan.networkEntries = (netMap?.spec?.map || []).map((e) => `${ e.source?.id || '-' } → ${ e.destination?.type === 'pod' ? t('harvester.addons.vmMigration.generic.podNetwork') : (e.destination?.name || '-') }`);
-    plan.storageEntries = (storMap?.spec?.map || []).map((e) => `${ e.source?.id || 'Ignored' } → ${ e.destination?.storageClass || 'Ignored' }`);
+    plan.storageEntries = (storMap?.spec?.map || []).map((e) => `${ e.source?.id || '-' } → ${ e.destination?.storageClass || '-' }`);
 
     plan.vmIdsDisplay = (plan.spec?.vms || []).map((vm) => vm.id || vm.name || '').filter(Boolean).join(', ') || '-';
 
@@ -179,44 +95,18 @@ const rows = computed(() => {
 
       overallProgress = Math.round(overallProgress * 10) / 10;
 
-      // If no step-level error but the plan itself is failed, surface it.
+      // If no step-level error but the plan itself is failed, surface it
-      // Skip VMs that already reached 100% (they finished successfully before
+      if (!errorMsg && plan.planFailed) {
-      // the plan failed) so their bar stays green instead of turning red.
-      if (!errorMsg && plan.planFailed && overallProgress < 100) {
         errorMsg = `${ currentStep || t('harvester.addons.vmMigration.dashboard.progress.migration') }: ${ t('harvester.addons.vmMigration.dashboard.progress.failed') }`;
       }
 
-      const vmNamespace = vm.namespace || plan.spec?.targetNamespace || plan.metadata?.namespace;
-      const routeParams = currentRouter().currentRoute?.value?.params || {};
-      const product = routeParams.product || store.getters['productId'];
-      const cluster = routeParams.cluster || store.getters['clusterId'];
-      const vmNameCandidates = [vm.targetName, vm.name, vm.id].filter(Boolean);
-      const targetVm = allVMs.value.find((item) => vmNameCandidates.includes(item.metadata?.name) && (!vmNamespace || item.metadata?.namespace === vmNamespace));
-      // A VM that individually reached 100% without error should be navigable
-      // even when the overall plan failed (other VMs in the plan may have
-      // failed); `overallProgress >= 100 && !errorMsg && targetVm` already
-      // guarantees this VM migrated successfully.
-      const canNavigateToVm = overallProgress >= 100 && !errorMsg && !plan.planCanceled && !!targetVm && !!product && !!cluster;
-      const vmDetailLocation = canNavigateToVm ? {
-        name:   `${ PRODUCT_NAME }-c-cluster-resource-namespace-id`,
-        params: {
-          product,
-          cluster,
-          resource:  HCI.VM,
-          namespace: targetVm.metadata.namespace,
-          id:        targetVm.metadata.name,
-        }
-      } : null;
-
       return {
         vmName:   vm.name || vm.id || t('harvester.addons.vmMigration.generic.unknown'),
         vmId:     vm.id || '',
         progress: overallProgress,
         currentStep,
-        pipelineTooltip: formatPipelineTooltip(pipeline),
         errorMsg,
         canceled: plan.planCanceled,
-        vmDetailLocation,
       };
     });
 
@@ -227,7 +117,6 @@ const rows = computed(() => {
         vmId:        vm.id || '',
         progress:    0,
         currentStep: t('harvester.addons.vmMigration.dashboard.progress.initializingMigration'),
-        pipelineTooltip: formatPipelineTooltip([]),
         errorMsg:    '',
         canceled:    false,
       }));
@@ -235,11 +124,6 @@ const rows = computed(() => {
 
     plan.progress = plan.vmProgress.length > 0 ? Math.round(plan.vmProgress.reduce((sum, vm) => sum + vm.progress, 0) / plan.vmProgress.length * 10) / 10 : 0;
 
-    const durationResult = formatDuration(plan.status?.migration?.started, plan.status?.migration?.completed);
-
-    plan.duration = durationResult.display;
-    plan.durationSeconds = durationResult.seconds;
-
     return plan;
   });
 });
@@ -263,63 +147,22 @@ const headers = [
     name:     'progress',
     labelKey: 'harvester.addons.vmMigration.dashboard.columns.progress',
     value:    'progress',
-    width:    450,
+    width:    500,
   },
   {
     name:     'mappings',
     labelKey: 'harvester.addons.vmMigration.dashboard.columns.mappings',
   },
-  {
-    name:     'duration',
-    labelKey: 'harvester.addons.vmMigration.dashboard.columns.duration',
-    value:    'duration',
-    sort:     'durationSeconds',
-    width:    90,
-  },
   { ...AGE },
 ];
 
 const init = async() => {
   try {
-    // Guard: the Forklift dashboard is only available when the Forklift addon is
-    // enabled. Redirect back to the Harvester dashboard otherwise (e.g. direct URL).
-    let forkliftEnabled = false;
-
-    if (store.getters[`${ inStore.value }/schemaFor`](HCI.ADD_ONS)) {
-      const addons = await store.dispatch(`${ inStore.value }/findAll`, { type: HCI.ADD_ONS });
-
-      forkliftEnabled = addons.find((a) => a.metadata?.name === ADD_ONS.FORKLIFT_OPERATOR)?.spec?.enabled === true;
-    }
-
-    if (!forkliftEnabled) {
-      await currentRouter().replace({
-        name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-        params: {
-          product:  store.getters['productId'],
-          cluster:  store.getters['clusterId'],
-          resource: HCI.DASHBOARD,
-        },
-      });
-
-      return;
-    }
-
     await Promise.all([
       store.dispatch(`${ inStore.value }/findAll`, { type: HCI.FORKLIFT_PLAN }),
       store.dispatch(`${ inStore.value }/findAll`, { type: HCI.FORKLIFT_NETWORK_MAP }),
       store.dispatch(`${ inStore.value }/findAll`, { type: HCI.FORKLIFT_STORAGE_MAP }),
     ]);
-
-    // VMs are only needed to conditionally show the post-migration VM-detail
-    // link, so load them separately and non-fatally: a failure here (or the
-    // cost of findAll on large clusters) should not block plans/maps from
-    // rendering.
-    try {
-      await store.dispatch(`${ inStore.value }/findAll`, { type: HCI.VM });
-    } catch (e) {
-      // Intentionally ignored: the dashboard still works without the VM list,
-      // the migrated VM-detail link simply won't be shown.
-    }
   } catch (e) {
     errors.value = [e?.message || t('harvester.addons.vmMigration.errors.failedLoadPlans')];
   } finally {
@@ -346,10 +189,9 @@ init();
     >
       <template #subHeader>
         <div class="mmt-5">
-          <p
+          <p class="text-muted">
-            v-clean-html="t('harvester.addons.vmMigration.dashboard.description')"
+            {{ t('harvester.addons.vmMigration.dashboard.description') }}
-            class="text-muted"
+          </p>
-          ></p>
         </div>
       </template>
       <template #createButton>
@@ -371,19 +213,14 @@ init();
       :search="false"
       key-field="_key"
     >
+      <template #header-left>
+        <h3 class="table-title m-0">
+          {{ t('harvester.addons.vmMigration.dashboard.tableTitle') }}
+        </h3>
+      </template>
       <template #cell:name="{ row }">
         <div class="plan-name-cell">
-          <router-link
+          <div class="plan-name">
-            v-if="row.detailLocation"
-            :to="row.detailLocation"
-            class="plan-name"
-          >
-            {{ row.metadata.name }}
-          </router-link>
-          <div
-            v-else
-            class="plan-name"
-          >
             {{ row.metadata.name }}
           </div>
         </div>
@@ -403,31 +240,17 @@ init();
           >
             <div class="vm-progress-header">
               <div class="vm-name-block">
-                <span class="vm-name">
+                <span class="vm-name">{{ vm.vmName }}</span>
-                  {{ vm.vmName }}
-                  <router-link
-                    v-if="vm.vmDetailLocation"
-                    v-clean-tooltip="t('harvester.addons.vmMigration.dashboard.progress.checkMigratedVm')"
-                    :to="vm.vmDetailLocation"
-                    class="vm-detail-link"
-                  >
-                    <i class="icon icon-external-link" />
-                  </router-link>
-                </span>
                 <span class="text-muted vm-id">{{ t('harvester.addons.vmMigration.dashboard.progress.vmId', { id: vm.vmId }) }}</span>
               </div>
             </div>
             <div class="vm-pct-block">
-              <div
-                v-clean-tooltip="{ content: vm.pipelineTooltip, html: true }"
-                class="vm-bar"
-              >
               <PercentageBar
                 :model-value="vm.progress"
                 :color-stops="vm.errorMsg ? { 100: '--error' } : vm.canceled ? { 100: '--darker' } : vm.progress >= 100 ? { 100: '--success' } : { 100: '--primary' }"
                 preferred-direction="MORE"
+                class="vm-bar"
               />
-              </div>
               <span class="vm-pct text-muted mr-10">{{ vm.progress }}%</span>
             </div>
             <div
@@ -464,13 +287,6 @@ init();
           :storage-entries="row.storageEntries"
         />
       </template>
-      <template #cell:duration="{ row }">
-        <span v-if="row.duration">{{ row.duration }}</span>
-        <span
-          v-else
-          class="text-muted"
-        >&mdash;</span>
-      </template>
     </ResourceTable>
   </div>
 </template>
@@ -504,14 +320,6 @@ init();
 
   .vm-name {
     font-size: 14px;
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-  }
-
-  .vm-detail-link {
-    display: inline-flex;
-    align-items: center;
   }
 
   .vm-name-block {

pkg/harvester/pages/c/_cluster/vm-migration/provider-wizard.vue

@@ -5,7 +5,6 @@ import CruResource from '@shell/components/CruResource';
 import Loading from '@shell/components/Loading';
 import { SECRET } from '@shell/config/types';
 import { useI18n } from '@shell/composables/useI18n';
-import { exceptionToErrorsArray, stringify } from '@shell/utils/error';
 import ConfigureProviderStep from '@pkg/harvester/components/vm-migration/ConfigureProviderStep.vue';
 import ConfigureMappingsStep from '@pkg/harvester/components/vm-migration/ConfigureMappingsStep.vue';
 import { PRODUCT_NAME } from '@pkg/harvester/config/harvester';
@@ -47,7 +46,6 @@ const stepData = reactive({
     username:         '',
     password:         '',
     skipTlsVerify:    false,
-    vddkInitImage:    '',
     testPassed:       false,
     testResult:       null,
     testError:        null,
@@ -164,7 +162,7 @@ const onFinish = async(buttonCb) => {
     buttonCb(true);
     currentRouter().push(providerListLocation);
   } catch (err) {
-    errors.value = exceptionToErrorsArray(err).map((e) => (typeof e === 'string' ? e : stringify(e)));
+    errors.value = [err instanceof Error ? err.message : String(err)];
     buttonCb(false);
   }
 };
@@ -195,7 +193,6 @@ const init = async() => {
     stepData.provider.selectedProvider = fetchedProvider.metadata.name;
     stepData.provider.providerName = fetchedProvider.metadata.name;
     stepData.provider.url = fetchedProvider.spec?.url || '';
-    stepData.provider.vddkInitImage = fetchedProvider.spec?.settings?.vddkInitImage || '';
     stepData.provider.createdProvider = fetchedProvider;
 
     const secretRef = fetchedProvider.spec?.secret;
@@ -234,7 +231,7 @@ const init = async() => {
       // Maps may not exist yet
     }
   } catch (err) {
-    errors.value = [t('harvester.addons.vmMigration.errors.failedLoadProvider', { error: err.message || stringify(err) })];
+    errors.value = [t('harvester.addons.vmMigration.errors.failedLoadProvider', { error: err.message || err })];
   }
 
   initialLoading.value = false;

pkg/harvester/pages/c/_cluster/vm-migration/vm-migration-wizard.vue

@@ -9,7 +9,6 @@ import ConfigureMappingsStep from '@pkg/harvester/components/vm-migration/Config
 import ReviewMigrationStep from '@pkg/harvester/components/vm-migration/ReviewMigrationStep.vue';
 import { PRODUCT_NAME } from '@pkg/harvester/config/harvester';
 import { currentRouter } from '@pkg/harvester/utils/router';
-import { exceptionToErrorsArray, stringify } from '@shell/utils/error';
 
 const store = useStore();
 const { t } = useI18n(store);
@@ -41,7 +40,6 @@ const stepData = reactive({
     username:         '',
     password:         '',
     skipTlsVerify:    false,
-    vddkInitImage:    '',
     testPassed:       false,
     testResult:       null,
     testError:        null,
@@ -57,7 +55,7 @@ const stepData = reactive({
     networkEntries:  [],
     storageEntries:  [],
   },
-  review: { planName: '', targetNamespace: '' },
+  review: { planName: '' },
 });
 
 const steps = reactive([
@@ -174,24 +172,6 @@ const onReviewReady = (ready) => {
   reviewReady.value = ready;
 };
 
-const onEditSelection = () => {
-  wizardComponent.value?.goToStep(2);
-};
-
-const onEditMappings = () => {
-  wizardComponent.value?.goToStep(3);
-};
-
-const onRemoveVm = (id) => {
-  selectedVMs.value = selectedVMs.value.filter((vm) => vm.id !== id);
-  stepData.vms.selectedVMIds.delete(id);
-
-  vmsReady.value = selectedVMs.value.length > 0;
-  if (!vmsReady.value) {
-    reviewReady.value = false;
-  }
-};
-
 // Clear downstream data when provider changes
 watch(() => stepData.provider.providerName, (newVal, oldVal) => {
   if (oldVal && newVal !== oldVal) {
@@ -210,13 +190,13 @@ watch(() => stepData.provider.providerName, (newVal, oldVal) => {
   }
 });
 
-// Clear mappings and review when VMs are added to the selection. Pure removals
+// Clear mappings and review when VM selection changes
-// (e.g. "Remove from Plan" on the review step) keep the existing mappings and plan name.
 watch(selectedVMs, (newVal, oldVal) => {
+  const newIds = new Set(newVal.map((v) => v.id));
   const oldIds = new Set(oldVal.map((v) => v.id));
-  const added = newVal.some((v) => !oldIds.has(v.id));
+  const changed = newIds.size !== oldIds.size || [...newIds].some((id) => !oldIds.has(id));
 
-  if (oldVal.length > 0 && added) {
+  if (oldVal.length > 0 && changed) {
     stepData.mappings.networkEntries = [];
     stepData.mappings.storageEntries = [];
     mappingsReady.value = false;
@@ -240,13 +220,7 @@ const onFinish = async(buttonCb) => {
     buttonCb(true);
     currentRouter().push(migrationListLocation);
   } catch (err) {
-    errors.value = exceptionToErrorsArray(err).map((e) => {
+    errors.value = [err instanceof Error ? err.message : String(err)];
-      if (typeof e === 'string') {
-        return e;
-      }
-
-      return stringify(e);
-    });
     buttonCb(false);
   }
 };
@@ -309,9 +283,6 @@ const onCancel = () => {
         :mapping-entries="stepData.mappings"
         :step-data="stepData.review"
         @ready="onReviewReady"
-        @edit-selection="onEditSelection"
-        @edit-mappings="onEditMappings"
-        @remove-vm="onRemoveVm"
       />
     </template>
   </CruResource>

pkg/harvester/promptRemove/forklift.konveyor.io.plan.vue

@@ -1,308 +0,0 @@
-<script>
-import { defineComponent } from 'vue';
-import { mapState, mapGetters } from 'vuex';
-import { resourceNames } from '@shell/utils/string';
-import { exceptionToErrorsArray } from '@shell/utils/error';
-import { HCI } from '../types';
-
-export default defineComponent({
-  name: 'PromptRemoveForkliftPlanDialog',
-
-  emits: ['errors'],
-
-  props: {
-    value: {
-      type:    Array,
-      default: () => []
-    },
-
-    names: {
-      type:    Array,
-      default: () => []
-    },
-
-    type: {
-      type:     String,
-      required: true
-    },
-
-    close: {
-      type:     Function,
-      required: true
-    },
-
-    doneLocation: {
-      type:    Object,
-      default: () => {}
-    }
-  },
-
-  data() {
-    return {
-      errors:        [],
-      removing:      false,
-    };
-  },
-
-  computed: {
-    ...mapState('action-menu', ['toRemove']),
-    ...mapGetters({ t: 'i18n/t' }),
-
-    existingRelatedResources() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      return {
-        [HCI.FORKLIFT_MIGRATION]:   this.$store.getters[`${ inStore }/all`](HCI.FORKLIFT_MIGRATION) || [],
-        [HCI.FORKLIFT_NETWORK_MAP]: this.$store.getters[`${ inStore }/all`](HCI.FORKLIFT_NETWORK_MAP) || [],
-        [HCI.FORKLIFT_STORAGE_MAP]: this.$store.getters[`${ inStore }/all`](HCI.FORKLIFT_STORAGE_MAP) || [],
-      };
-    },
-
-    resourceType() {
-      return this.t('typeLabel."forklift.konveyor.io.plan"', { count: this.names?.length || 1 });
-    },
-
-    relatedSummary() {
-      const existing = this.existingRelatedResources;
-
-      return (this.value || []).map((plan) => {
-        const planName = plan?.metadata?.name || '-';
-        const namespace = plan?.metadata?.namespace || '';
-
-        const migrations = existing[HCI.FORKLIFT_MIGRATION]
-          .filter((resource) => this.ownedByPlan(resource, plan))
-          .map((resource) => ({
-            name:      resource?.metadata?.name,
-            namespace: resource?.metadata?.namespace || namespace,
-          }));
-
-        const matchedNetworkMap = existing[HCI.FORKLIFT_NETWORK_MAP].find((resource) => this.ownedByPlan(resource, plan));
-        const matchedStorageMap = existing[HCI.FORKLIFT_STORAGE_MAP].find((resource) => this.ownedByPlan(resource, plan));
-
-        return {
-          planName,
-          namespace,
-          migrations,
-          networkMap: matchedNetworkMap ? {
-            namespace: matchedNetworkMap?.metadata?.namespace || namespace,
-            name:      matchedNetworkMap?.metadata?.name,
-          } : null,
-          storageMap: matchedStorageMap ? {
-            namespace: matchedStorageMap?.metadata?.namespace || namespace,
-            name:      matchedStorageMap?.metadata?.name,
-          } : null,
-        };
-      });
-    },
-  },
-
-  async mounted() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    try {
-      await Promise.all([
-        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_MIGRATION }),
-        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_NETWORK_MAP }),
-        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_STORAGE_MAP }),
-      ]);
-    } catch {
-      // Best-effort: the dialog can still function without this prefetch.
-    }
-  },
-
-  methods: {
-    resourceNames,
-
-    /**
-     * Determine whether a related resource (migration / network map / storage map)
-     * is owned by the given plan by inspecting its `metadata.ownerReferences`.
-     * Matches on `kind: Plan` and the plan name; when both sides expose a uid it
-     * must match too, to disambiguate same-named plans.
-     */
-    ownedByPlan(resource, plan) {
-      const planName = plan?.metadata?.name;
-      const planUid = plan?.metadata?.uid;
-      const owners = resource?.metadata?.ownerReferences || [];
-
-      if (!planName) {
-        return false;
-      }
-
-      return owners.some((owner) => owner?.kind === 'Plan' &&
-        owner?.name === planName &&
-        (!planUid || !owner?.uid || owner.uid === planUid));
-    },
-
-    buildDeleteTargets() {
-      const existing = this.existingRelatedResources;
-      const targets = new Map();
-
-      const addTarget = (type, resource) => {
-        const name = resource?.metadata?.name;
-        const ns = resource?.metadata?.namespace;
-
-        if (!name) {
-          return;
-        }
-
-        const key = `${ type }|${ ns }|${ name }`;
-
-        targets.set(key, {
-          type, name, namespace: ns
-        });
-      };
-
-      for (const plan of this.value || []) {
-        existing[HCI.FORKLIFT_NETWORK_MAP]
-          .filter((resource) => this.ownedByPlan(resource, plan))
-          .forEach((resource) => addTarget(HCI.FORKLIFT_NETWORK_MAP, resource));
-
-        existing[HCI.FORKLIFT_STORAGE_MAP]
-          .filter((resource) => this.ownedByPlan(resource, plan))
-          .forEach((resource) => addTarget(HCI.FORKLIFT_STORAGE_MAP, resource));
-
-        existing[HCI.FORKLIFT_MIGRATION]
-          .filter((resource) => this.ownedByPlan(resource, plan))
-          .forEach((resource) => addTarget(HCI.FORKLIFT_MIGRATION, resource));
-      }
-
-      return [...targets.values()];
-    },
-
-    async deleteRelatedResources() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const targets = this.buildDeleteTargets();
-
-      if (!targets.length) {
-        return;
-      }
-      let cache = {};
-
-      try {
-        cache = {
-          [HCI.FORKLIFT_MIGRATION]:   await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_MIGRATION }),
-          [HCI.FORKLIFT_NETWORK_MAP]: await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_NETWORK_MAP }),
-          [HCI.FORKLIFT_STORAGE_MAP]: await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_STORAGE_MAP }),
-        };
-      } catch (err) {
-        // Best-effort cleanup; don't block closing the dialog if listing related resources fails.
-        return;
-      }
-
-      for (const target of targets) {
-        const matched = (cache[target.type] || []).find((resource) => resource?.metadata?.name === target.name && resource?.metadata?.namespace === target.namespace
-        );
-
-        if (!matched) {
-          continue;
-        }
-
-        try {
-          await matched.remove({ params: { propagationPolicy: 'Background' } });
-        } catch (err) {
-          // Continue deleting remaining resources and let final plan deletion fail if needed.
-        }
-      }
-    },
-
-    async remove(buttonDone) {
-      this.errors = [];
-      this.removing = true;
-
-      try {
-        const results = await Promise.allSettled((this.value || []).map((resource) => resource.remove({ params: { propagationPolicy: 'Background' } })));
-
-        await this.deleteRelatedResources();
-        const rejected = results.filter((r) => r.status === 'rejected');
-
-        if (rejected.length) {
-          throw rejected[0].reason;
-        }
-
-        this.close(buttonDone);
-      } catch (err) {
-        this.errors = exceptionToErrorsArray(err);
-        this.$emit('errors', err);
-        if (buttonDone) {
-          buttonDone(false);
-        }
-      } finally {
-        this.removing = false;
-      }
-    },
-  }
-});
-</script>
-
-<template>
-  <div class="mt-10">
-    <div class="mb-10">
-      {{ t('promptRemove.attemptingToRemove', { type: resourceType }) }}
-      <span v-clean-html="resourceNames(names, null, t)" />
-    </div>
-
-    <hr class="mb-10">
-
-    <div class="mb-10 text-warning">
-      <i class="icon icon-warning icon-lg mr-5" />
-      {{ t('harvester.addons.vmMigration.deleteDialog.warning') }}
-    </div>
-
-    <div
-      v-for="summary in relatedSummary"
-      :key="`${ summary.namespace }/${ summary.planName }`"
-      class="mb-10"
-    >
-      <div>• {{ t('harvester.addons.vmMigration.labels.migration') }}:</div>
-      <template v-if="summary.migrations.length">
-        <div
-          v-for="migration in summary.migrations"
-          :key="`${ migration.namespace }/${ migration.name }`"
-        >
-          <div class="ml-20">
-            - {{ migration.name }}
-          </div>
-        </div>
-      </template>
-      <div
-        v-else
-        class="ml-20"
-      >
-        - -
-      </div>
-
-      <div>• {{ t('harvester.addons.vmMigration.labels.networkMap') }}:</div>
-      <template v-if="summary.networkMap">
-        <div class="ml-20">
-          - {{ summary.networkMap.name }}
-        </div>
-      </template>
-      <div
-        v-else
-        class="ml-20"
-      >
-        - -
-      </div>
-
-      <div>• {{ t('harvester.addons.vmMigration.labels.storageMap') }}:</div>
-      <template v-if="summary.storageMap">
-        <div class="ml-20">
-          - {{ summary.storageMap.name }}
-        </div>
-      </template>
-      <div
-        v-else
-        class="ml-20"
-      >
-        - -
-      </div>
-    </div>
-
-    <Banner
-      v-for="(error, i) in errors"
-      :key="i"
-      color="error"
-      :label="error"
-    />
-  </div>
-</template>

pkg/harvester/utils/backup.js

@@ -1,43 +0,0 @@
-export const DEFAULT_FS_FREEZE_DEADLINE = '1s';
-
-/**
- * Generate filesystem freeze deadline options with i18n translations
- * @param {Function} t - i18n translation function
- * @returns {Array} Array of deadline options
- */
-export function getFsFreezeDeadlineOptions(t) {
-  return [
-    {
-      label: t('generic.duration.infinite'),
-      value: '0s'
-    },
-    {
-      label: t('generic.duration.1s'),
-      value: '1s'
-    },
-    {
-      label: t('generic.duration.5s'),
-      value: '5s'
-    },
-    {
-      label: t('generic.duration.10s'),
-      value: '10s'
-    },
-    {
-      label: t('generic.duration.30s'),
-      value: '30s'
-    },
-    {
-      label: t('generic.duration.1m'),
-      value: '1m'
-    },
-    {
-      label: t('generic.duration.3m'),
-      value: '3m'
-    },
-    {
-      label: t('generic.duration.5m'),
-      value: '5m'
-    }
-  ];
-}

pkg/harvester/utils/dynamic-nav.js

@@ -8,11 +8,9 @@
  * @param {String} config.resourceType - The schema ID for addons.
  * @param {String} config.navGroup - The group name in the side nav.
  * @param {Array<String>} config.types - Array of Resource IDs to show/hide.
- * @param {Boolean} [config.requireSchema=true] - When true, only types with an
- *        accessible schema are shown. Set false for schema-less virtual types.
  */
 export function registerAddonSideNav(store, productName, {
-  addonName, resourceType, navGroup, types, requireSchema = true
+  addonName, resourceType, navGroup, types
 }) {
   if (typeof window === 'undefined') {
     return;
@@ -24,14 +22,13 @@ export function registerAddonSideNav(store, productName, {
   const kickSideNav = () => {
     const TRIGGER = 'ui.refresh.trigger';
 
-    // Toggle the trigger a few times so an early kick (fired before the SideNav
-    // has mounted on first login) is retried once the component is listening.
-    [0, 600, 1500].forEach((delay) => {
-      setTimeout(() => {
     store.dispatch('type-map/addFavorite', TRIGGER);
-        setTimeout(() => store.dispatch('type-map/removeFavorite', TRIGGER), 300);
+
-      }, delay);
+    // SideNav component seem to ignore rapid state changes.
-    });
+    // Wait 600ms to ensure the toggle event triggers a re-render.
+    setTimeout(() => {
+      store.dispatch('type-map/removeFavorite', TRIGGER);
+    }, 600);
   };
 
   const hasAccessibleSchema = (t) => {
@@ -60,7 +57,7 @@ export function registerAddonSideNav(store, productName, {
 
   // Adds or removes the resource IDs from the product visibility whitelist.
   const setMenuVisibility = (visible) => {
-    const accessibleTypes = visible ? (requireSchema ? types.filter(hasAccessibleSchema) : types) : [];
+    const accessibleTypes = visible ? types.filter(hasAccessibleSchema) : [];
 
     // Always clear first to remove any previously-registered types that are
     // no longer accessible (e.g. partial permission changes like types=[A,B] where B is dropped).
@@ -93,25 +90,16 @@ export function registerAddonSideNav(store, productName, {
         // Store is ready. Stop polling.
         clearInterval(waitForStore);
 
-        // Watch the addon's enabled status together with the schema availability
+        // Watch the specific addon resource for changes to its enabled status.
-        // of the gated types. Schemas (e.g. forklift CRDs) can load after the
-        // addon is already enabled, so the watcher must also re-run when they
-        // become accessible; otherwise the menu never updates until a refresh.
         store.watch(
           (state, getters) => {
             const addons = getters[`${ productName }/all`](resourceType);
             const addon = addons.find((a) => a.metadata.name === addonName);
-            const isEnabled = addon?.spec?.enabled === true;
 
-            const schemaReady = requireSchema ? types.every(hasAccessibleSchema) : true;
+            return addon?.spec?.enabled === true;
-
-            return `${ isEnabled }:${ schemaReady }`;
           },
-          () => {
+          (isEnabled) => {
-            const addons = store.getters[`${ productName }/all`](resourceType);
+            setMenuVisibility(isEnabled);
-            const addon = addons.find((a) => a.metadata.name === addonName);
-
-            setMenuVisibility(addon?.spec?.enabled === true);
           },
           { immediate: true, deep: true }
         );

pkg/harvester/utils/forklift.js

@@ -73,21 +73,8 @@ export function buildNetworkMapEntries(entries = [], defaultNamespace) {
 export function buildStorageMapEntries(entries = []) {
   return entries
     .filter((entry) => !!entry.target)
-    .map((entry) => {
+    .map((entry) => ({
-      const destination = { storageClass: entry.target };
-
-      if (entry.volumeMode) {
-        destination.volumeMode = entry.volumeMode;
-      }
-
-      // Forklift StorageMap destination expects a single `accessMode` value.
-      if (Array.isArray(entry.accessModes) && entry.accessModes.length) {
-        destination.accessMode = entry.accessModes[0];
-      }
-
-      return {
       source:      { name: entry.name, id: entry.id },
-        destination,
+      destination: { storageClass: entry.target },
-      };
+    }));
-    });
 }

pkg/harvester/validators/vm.js

@@ -69,11 +69,17 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
     validName(getters, errors, D.name, diskNames, prefix, type, lowerType, upperType);
   });
 
+  let hasBootableVolume = false;
+
   _volumes.forEach((V, idx) => {
     const { type, typeValue } = getVolumeType(getters, V, _volumeClaimTemplates, value);
 
     const prefix = V.name || idx + 1;
 
+    if ([SOURCE_TYPE.IMAGE, SOURCE_TYPE.ATTACH_VOLUME, SOURCE_TYPE.CONTAINER].includes(type)) {
+      hasBootableVolume = true;
+    }
+
     if (type === SOURCE_TYPE.NEW || type === SOURCE_TYPE.IMAGE) {
       if (!/([1-9]|[1-9][0-9]+)[a-zA-Z]+/.test(typeValue?.spec?.resources?.requests?.storage)) {
         const key = getters['i18n/t']('harvester.fields.size');
@@ -130,6 +136,13 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
     }
   });
 
+  /**
+   *  At least one bootable volume must be provided.  (Verify only when create.)
+   */
+  if (!hasBootableVolume && !value.links) {
+    errors.push(getters['i18n/t']('harvester.validation.vm.volume.needAtLeastOneBootable'));
+  }
+
   return errors;
 }
 

scripts/extract-release-label.mjs

@@ -7,11 +7,7 @@ if (process.argv.length < 3) {
 }
 
 const prTitle = process.argv[2];
-
+const prLabel = prTitle.split(':')[0].trim();
-// Parse the conventional-commit prefix `type(scope)!:`, keeping only the type
-// and dropping an optional scope and breaking-change marker.
-const prefixMatch = prTitle.match(/^\s*([a-zA-Z]+)(?:\([^)]*\))?!?:/);
-const prLabel = prefixMatch ? prefixMatch[1].toLowerCase() : '';
 
 const config = await load({ extends: ["./commitlint.config.js"] });
 const commitPrefix = config?.rules?.['type-enum']?.[2] || [];

yarn.lock

@@ -2846,10 +2846,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@25.3.3", "@types/node@25.9.5":
+"@types/node@*", "@types/node@25.3.3", "@types/node@25.9.4":
-  version "25.9.5"
+  version "25.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.9.5.tgz#0fefc09e6e82e94cde291bacf43522e989eb01a4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.9.4.tgz#18b63c47f88c1fbbed9d55ea2b66ffd494a47001"
-  integrity sha512-OScDchr2fwuUmWdf4kZ9h7PcJiYDVInhJizG/biAq3cAvqwYktuy/TYGGdZNMtNTFUP7rnb0NU4TUdm82kt4Rg==
+  integrity sha512-dszCsrKb5U7ZsVZBWiHFklTloVl0mSEnWH/iZXfZUlI4rzCUnsvGmgqfuVRHL54ugE7/wRuxEIXRa2iMZ+BG6g==
   dependencies:
     undici-types ">=7.24.0 <7.24.7"