From ec3d88aeb7787d8107c8ad8ec3370c86cdf14765 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 19 Sep 2024 10:37:36 +0200
Subject: [PATCH] Latest changes from harvester/master

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/harvester/components/DiskTags.vue         |    2 +-
 pkg/harvester/components/HarvesterUpgrade.vue |   14 +-
 pkg/harvester/components/SettingList.vue      |   43 +-
 pkg/harvester/components/UpgradeInfo.vue      |   10 +-
 pkg/harvester/components/VMConsoleBar.vue     |    2 +-
 ...additional-guest-memory-overhead-ratio.vue |   39 +
 .../components/settings/storage-network.vue   |    8 +-
 pkg/harvester/config/doc-links.js             |   12 +
 pkg/harvester/config/harvester-map.js         |   23 +-
 pkg/harvester/config/labels-annotations.js    |  100 +-
 pkg/harvester/config/settings.js              |   86 +-
 pkg/harvester/config/table-headers.js         |    8 +
 .../HarvesterHostBasic.vue                    |   12 +-
 .../HarvesterHostDisk.vue                     |   32 +-
 .../VirtualMachineInstance.vue                |    2 +-
 .../detail/harvesterhci.io.host/index.vue     |    6 +-
 .../index.vue                                 |   10 +
 .../kubevirt.io.virtualmachine/index.vue      |   39 +-
 .../network.harvesterhci.io.vlanconfig.vue    |    4 +
 .../dialog/HarvesterMaintenanceDialog.vue     |   36 +-
 .../dialog/HarvesterMigrationDialog.vue       |    7 +-
 pkg/harvester/dialog/HarvesterQuotaDialog.vue |  121 ++
 .../dialog/HarvesterRestoreDialog.vue         |    2 +-
 .../harvesterhci.io.host/HarvesterDisk.vue    |   34 +-
 .../HarvesterKsmtuned.vue                     |    7 +-
 .../edit/harvesterhci.io.host/index.vue       |   14 +-
 ...sterhci.io.networkattachmentdefinition.vue |   15 +-
 .../edit/harvesterhci.io.storage/index.vue    |    6 +-
 .../harvesterhci.io.virtualmachineimage.vue   |    2 +
 ...erhci.io.virtualmachinetemplateversion.vue |  104 +-
 pkg/harvester/edit/harvesterhci.io.volume.vue |   18 +-
 .../VirtualMachineVolume/type/vmImage.vue     |   23 +-
 .../edit/kubevirt.io.virtualmachine/index.vue |  195 ++-
 .../index.vue                                 |   21 +-
 .../formatters/HarvesterCPUPinning.vue        |   44 +
 .../formatters/HarvesterStorageUsed.vue       |  105 +-
 pkg/harvester/l10n/en-us.yaml                 |  442 ++---
 pkg/harvester/l10n/zh-hans.yaml               | 1432 -----------------
 .../list/harvesterhci.io.dashboard.vue        |   99 +-
 pkg/harvester/list/harvesterhci.io.host.vue   |   48 +-
 ...erhci.io.monitoring.alertmanagerconfig.vue |    1 -
 pkg/harvester/list/harvesterhci.io.volume.vue |   22 +-
 .../list/kubevirt.io.virtualmachine.vue       |   19 +-
 pkg/harvester/mixins/harvester-vm/impl.js     |    4 +
 pkg/harvester/mixins/harvester-vm/index.js    |   85 +-
 pkg/harvester/models/harvester/namespace.js   |   29 +
 pkg/harvester/models/harvester/node.js        |   55 +-
 .../models/harvester/persistentvolumeclaim.js |   27 +-
 .../models/harvesterhci.io.upgrade.js         |    8 +-
 .../harvesterhci.io.virtualmachineimage.js    |   26 +-
 .../models/kubevirt.io.virtualmachine.js      |   56 +-
 .../pages/c/_cluster/support/index.vue        |   59 +-
 .../store/harvester-store/actions.ts          |   50 +-
 .../store/harvester-store/getters.ts          |   22 +-
 pkg/harvester/store/harvester-store/index.ts  |    4 +-
 pkg/harvester/types.ts                        |    1 +
 56 files changed, 1498 insertions(+), 2197 deletions(-)
 create mode 100644 pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue
 create mode 100644 pkg/harvester/config/doc-links.js
 create mode 100644 pkg/harvester/dialog/HarvesterQuotaDialog.vue
 create mode 100644 pkg/harvester/formatters/HarvesterCPUPinning.vue
 delete mode 100644 pkg/harvester/l10n/zh-hans.yaml

diff --git a/pkg/harvester/components/DiskTags.vue b/pkg/harvester/components/DiskTags.vue
index b86c593b..63121061 100644
--- a/pkg/harvester/components/DiskTags.vue
+++ b/pkg/harvester/components/DiskTags.vue
@@ -3,7 +3,7 @@ import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params';
 import Tag from '@shell/components/Tag';
 
 export default {
-  name: 'DiskTags',
+  name: 'Tags',
 
   components: { Tag },
 
diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
index f451292a..da4c6c7c 100644
--- a/pkg/harvester/components/HarvesterUpgrade.vue
+++ b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -35,13 +35,23 @@ export default {
       version:          '',
       enableLogging:    true,
       readyReleaseNote: false,
-      isOpen:           false,
+      isOpen:           false
     };
   },
 
   computed: {
     ...mapGetters(['currentCluster']),
 
+    latestUpgrade() {
+      return this.upgrade?.find(u => u.isLatestUpgrade);
+    },
+
+    isUpgradeInProgress() {
+      return this.latestUpgrade &&
+        !this.latestUpgrade.isUpgradeSucceeded &&
+        !this.latestUpgrade.isUpgradeFailed;
+    },
+
     versionOptions() {
       const versions = this.$store.getters['harvester/all'](HCI.VERSION);
 
@@ -133,7 +143,7 @@ export default {
         />
       </h1>
       <button
-        v-if="versionOptions.length"
+        v-if="versionOptions.length && !isUpgradeInProgress"
         type="button"
         class="btn bg-warning btn-sm"
         @click="open"
diff --git a/pkg/harvester/components/SettingList.vue b/pkg/harvester/components/SettingList.vue
index ae23a743..e9e2072c 100644
--- a/pkg/harvester/components/SettingList.vue
+++ b/pkg/harvester/components/SettingList.vue
@@ -34,15 +34,7 @@ export default {
   },
 
   data() {
-    const categorySettings = this.settings.filter((s) => {
-      if (this.category !== 'advanced') {
-        return (CATEGORY[this.category] || []).find(item => item === s.id);
-      } else if (this.category === 'advanced') {
-        const allCategory = Object.keys(CATEGORY);
-
-        return !allCategory.some(category => (CATEGORY[category] || []).find(item => item === s.id));
-      }
-    }) || [];
+    const categorySettings = this.filterCategorySettings();
 
     return {
       HCI_SETTING,
@@ -52,7 +44,27 @@ export default {
 
   computed: { ...mapGetters({ t: 'i18n/t' }) },
 
+  watch: {
+    settings: {
+      deep: true,
+      handler() {
+        this['categorySettings'] = this.filterCategorySettings();
+      }
+    }
+  },
+
   methods: {
+    filterCategorySettings() {
+      return this.settings.filter((s) => {
+        if (this.category !== 'advanced') {
+          return (CATEGORY[this.category] || []).find(item => item === s.id);
+        } else if (this.category === 'advanced') {
+          const allCategory = Object.keys(CATEGORY);
+
+          return !allCategory.some(category => (CATEGORY[category] || []).find(item => item === s.id));
+        }
+      }) || [];
+    },
     showActionMenu(e, setting) {
       const actionElement = e.srcElement;
 
@@ -104,7 +116,7 @@ export default {
 
 <template>
   <div>
-    <div  v-for="(setting, i) in categorySettings" class="advanced-setting mb-20" :key="i" >
+    <div v-for="(setting, i) in categorySettings" :key="i">
       <div class="header">
         <div class="title">
           <h1>
@@ -112,6 +124,9 @@ export default {
             <span v-if="setting.customized" class="modified">
               Modified
             </span>
+            <span v-if="setting.technicalPreview" v-clean-tooltip="t('advancedSettings.technicalPreview')" class="technical-preview">
+              Technical Preview
+            </span>
           </h1>
           <h2 v-clean-html="t(setting.description, {}, true)">
           </h2>
@@ -200,4 +215,12 @@ export default {
   padding: 2px 10px;
   font-size: 12px;
 }
+
+.technical-preview {
+  margin-left: 10px;
+  border: 1px solid var(--warning);
+  border-radius: 5px;
+  padding: 2px 10px;
+  font-size: 12px;
+}
 </style>
diff --git a/pkg/harvester/components/UpgradeInfo.vue b/pkg/harvester/components/UpgradeInfo.vue
index 192eb406..03e58c08 100644
--- a/pkg/harvester/components/UpgradeInfo.vue
+++ b/pkg/harvester/components/UpgradeInfo.vue
@@ -1,5 +1,6 @@
 <script>
 import { Banner } from '@components/Banner';
+import { DOC_LINKS } from '../config/doc-links';
 
 export default {
   name: 'HarvesterUpgradeInfo',
@@ -16,6 +17,10 @@ export default {
   computed: {
     releaseVersion() {
       return !!this.version ? `https://github.com/harvester/harvester/releases/tag/${ this.version }` : `https://github.com/harvester/harvester/releases`;
+    },
+
+    upgradeLink() {
+      return DOC_LINKS.UPGRADE_URL;
     }
   },
 };
@@ -26,15 +31,14 @@ export default {
     <Banner color="warning">
       <div>
         <strong>{{ t('harvester.upgradePage.upgradeInfo.warning') }}:</strong>
-        <p v-clean-html="t('harvester.upgradePage.upgradeInfo.doc', {}, true)" class="mb-5">
-        </p>
+        <p v-clean-html="t('harvester.upgradePage.upgradeInfo.doc', {url: upgradeLink}, true)" class="mb-5"></p>
 
         <p class="mb-5">
           {{ t('harvester.upgradePage.upgradeInfo.tip') }}
         </p>
 
         <p class="mb-5">
-          {{ t('harvester.upgradePage.upgradeInfo.moreNotes') }} <a :href="releaseVersion" target="_blank">{{ t('generic.moreInfo') }} </a>
+          {{ t('harvester.upgradePage.upgradeInfo.moreNotes') }} <a :href="releaseVersion" target="_blank">{{ t('generic.moreInfo') }}</a>
         </p>
       </div>
     </Banner>
diff --git a/pkg/harvester/components/VMConsoleBar.vue b/pkg/harvester/components/VMConsoleBar.vue
index 2b6621f8..4cbe3fe1 100644
--- a/pkg/harvester/components/VMConsoleBar.vue
+++ b/pkg/harvester/components/VMConsoleBar.vue
@@ -61,7 +61,7 @@ export default {
       window.open(
         url,
         '_blank',
-        'toolbars=0,width=900,height=700,left=0,top=0,noreferrer'
+        `toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
       );
     },
 
diff --git a/pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue b/pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue
new file mode 100644
index 00000000..47007fae
--- /dev/null
+++ b/pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue
@@ -0,0 +1,39 @@
+<script>
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
+export default {
+  name: 'AdditionalGuestMemoryOverheadRatio',
+
+  components: { LabeledInput },
+
+  mixins: [CreateEditView],
+
+  data() {
+    return { ratio: this.value.value || this.value.default };
+  },
+
+  methods: {
+    update() {
+      this.value['value'] = this.ratio;
+    },
+
+    useDefault() {
+      this['ratio'] = this.value.default;
+      this.update();
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="row">
+    <div class="col span-12">
+      <LabeledInput
+        v-model:value="ratio"
+        :label="t('harvester.setting.ratio')"
+        @update:value="update"
+      />
+    </div>
+  </div>
+</template>
diff --git a/pkg/harvester/components/settings/storage-network.vue b/pkg/harvester/components/settings/storage-network.vue
index dcf588e1..d7030ac5 100644
--- a/pkg/harvester/components/settings/storage-network.vue
+++ b/pkg/harvester/components/settings/storage-network.vue
@@ -10,6 +10,7 @@ import Tip from '@shell/components/Tip';
 import { allHash } from '@shell/utils/promise';
 import { NODE } from '@shell/config/types';
 import { HCI } from '../../types';
+import { DOC_LINKS } from '../../config/doc-links';
 
 export default {
   name: 'HarvesterEditStorageNetwork',
@@ -85,6 +86,9 @@ export default {
   },
 
   computed: {
+    storageNetworkExampleLink() {
+      return DOC_LINKS.STORAGE_NETWORK_EXAMPLE;
+    },
     clusterNetworkOptions() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
@@ -206,8 +210,8 @@ export default {
         :placeholder="t('harvester.setting.storageNetwork.range.placeholder')"
         label-key="harvester.setting.storageNetwork.range.label"
       />
-      <Tip class="mb-20" icon="icon icon-info" :text="t('harvester.setting.storageNetwork.tip')">
-        <t k="harvester.setting.storageNetwork.tip" :raw="true" />
+      <Tip class="mb-20" icon="icon icon-info">
+        <t k="harvester.setting.storageNetwork.tip" :raw="true" :url="storageNetworkExampleLink" />
       </Tip>
 
       <ArrayList
diff --git a/pkg/harvester/config/doc-links.js b/pkg/harvester/config/doc-links.js
new file mode 100644
index 00000000..d5768932
--- /dev/null
+++ b/pkg/harvester/config/doc-links.js
@@ -0,0 +1,12 @@
+const pkgJson = require('../package.json');
+import semver from 'semver';
+
+const docVersion = `v${ semver.major(pkgJson.version) }.${ semver.minor(pkgJson.version) }`;
+
+export const DOC_LINKS = {
+  CONSOLE_URL:             `https://docs.harvesterhci.io/${ docVersion }/host/`,
+  RANCHER_INTEGRATION_URL: `https://docs.harvesterhci.io/${ docVersion }/rancher/rancher-integration`,
+  STORAGE_NETWORK_EXAMPLE: `https://docs.harvesterhci.io/${ docVersion }/advanced/storagenetwork#configuration-example`,
+  KSMTUNED_MODE:           `https://docs.harvesterhci.io/${ docVersion }/host/#ksmtuned-mode`,
+  UPGRADE_URL:             `https://docs.harvesterhci.io/${ docVersion }/upgrade/index`
+};
diff --git a/pkg/harvester/config/harvester-map.js b/pkg/harvester/config/harvester-map.js
index 7a682931..02cbfe25 100644
--- a/pkg/harvester/config/harvester-map.js
+++ b/pkg/harvester/config/harvester-map.js
@@ -23,7 +23,7 @@ export const InterfaceOption = [{
 
 export const SOURCE_TYPE = {
   NEW:           'New',
-  IMAGE:         'VM Image',
+  IMAGE:         'Virtual Machine Image',
   ATTACH_VOLUME: 'Existing Volume',
   CONTAINER:     'Container'
 };
@@ -41,7 +41,14 @@ export const ACCESS_CREDENTIALS = {
   INJECT_SSH: 'sshPublicKey'
 };
 
-export const RunStrategys = ['Always', 'RerunOnFailure', 'Manual', 'Halted'];
+export const runStrategies = ['Always', 'RerunOnFailure', 'Manual', 'Halted'];
+
+export const maintenanceStrategies = [
+  'Migrate',
+  'ShutdownAndRestartAfterEnable',
+  'ShutdownAndRestartAfterDisable',
+  'Shutdown'
+];
 
 export const VOLUME_DATA_SOURCE_KIND = {
   VolumeSnapshot:        'VolumeSnapshot',
@@ -55,10 +62,10 @@ export const FLOW_TYPE = {
 };
 
 export const ADD_ONS = {
-  HARVESTER_SEEDER:      'harvester-seeder',
-  PCI_DEVICE_CONTROLLER: 'pcidevices-controller',
-  RANCHER_LOGGING:       'rancher-logging',
-  RANCHER_MONITORING:    'rancher-monitoring',
-  VM_IMPORT_CONTROLLER:  'vm-import-controller',
-  NVIDIA_DRIVER_TOOLKIT_CONTROLLER: 'nvidia-driver-toolkit'
+  HARVESTER_SEEDER:                 'harvester-seeder',
+  PCI_DEVICE_CONTROLLER:            'pcidevices-controller',
+  NVIDIA_DRIVER_TOOLKIT_CONTROLLER: 'nvidia-driver-toolkit',
+  RANCHER_LOGGING:                  'rancher-logging',
+  RANCHER_MONITORING:               'rancher-monitoring',
+  VM_IMPORT_CONTROLLER:             'vm-import-controller',
 };
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
index 29226994..1a010345 100644
--- a/pkg/harvester/config/labels-annotations.js
+++ b/pkg/harvester/config/labels-annotations.js
@@ -1,49 +1,55 @@
 export const HCI = {
-  CLOUD_INIT:                   'harvesterhci.io/cloud-init-template',
-  CURRENT_IP:                   'rke2.io/internal-ip',
-  OWNED_BY:                     'harvesterhci.io/owned-by',
-  IMAGE_ID:                     'harvesterhci.io/imageId',
-  SSH_NAMES:                    'harvesterhci.io/sshNames',
-  NETWORK_IPS:                  'network.harvesterhci.io/ips',
-  TEMPLATE_VERSION_CUSTOM_NAME: 'template-version.harvesterhci.io/customName',
-  CREATOR:                      'harvesterhci.io/creator',
-  OS:                           'harvesterhci.io/os',
-  NETWORK_TYPE:                 'network.harvesterhci.io/type',
-  VM_NAME:                      'harvesterhci.io/vmName',
-  VM_NAME_PREFIX:               'harvesterhci.io/vmNamePrefix',
-  VM_RESERVED_MEMORY:           'harvesterhci.io/reservedMemory',
-  MAINTENANCE_STATUS:           'harvesterhci.io/maintain-status',
-  HOST_CUSTOM_NAME:             'harvesterhci.io/host-custom-name',
-  HOST_CONSOLE_URL:             'harvesterhci.io/host-console-url',
-  RESTORE_NAME:                 'restore.harvesterhci.io/name',
-  NODE_ROLE_MASTER:             'node-role.kubernetes.io/master',
-  NODE_ROLE_CONTROL_PLANE:      'node-role.kubernetes.io/control-plane',
-  PROMOTE_STATUS:               'harvesterhci.io/promote-status',
-  MIGRATION_STATE:              'harvesterhci.io/migrationState',
-  VOLUME_CLAIM_TEMPLATE:        'harvesterhci.io/volumeClaimTemplates',
-  IMAGE_NAME:                   'harvesterhci.io/image-name',
-  INIT_IP:                      'etcd.rke2.cattle.io/node-address',
-  NODE_SCHEDULABLE:             'kubevirt.io/schedulable',
-  NETWORK_ROUTE:                'network.harvesterhci.io/route',
-  OS_UPGRADE_IMAGE:             'harvesterhci.io/os-upgrade-image',
-  LATEST_UPGRADE:               'harvesterhci.io/latestUpgrade',
-  UPGRADE_STATE:                'harvesterhci.io/upgradeState',
-  REAY_MESSAGE:                 'harvesterhci.io/read-message',
-  DYNAMIC_SSHKEYS_NAMES:        'harvesterhci.io/dynamic-ssh-key-names',
-  DYNAMIC_SSHKEYS_USERS:        'harvesterhci.io/dynamic-ssh-key-users',
-  IMAGE_SUFFIX:                 'harvesterhci.io/image-type',
-  OS_TYPE:                      'harvesterhci.io/os-type',
-  HOST_REQUEST:                 'management.cattle.io/pod-requests',
-  STORAGE_CLASS:                'harvesterhci.io/storageClassName',
-  STORAGE_NETWORK:              'storage-network.settings.harvesterhci.io',
-  ADDON_EXPERIMENTAL:           'addon.harvesterhci.io/experimental',
-  VOLUME_ERROR:                 'longhorn.io/volume-scheduling-error',
-  KVM_AMD_CPU:                  'cpu-feature.node.kubevirt.io/svm',
-  KVM_INTEL_CPU:                'cpu-feature.node.kubevirt.io/vmx',
-  NODE_MANUFACTURER:            'manufacturer',
-  NODE_MODEL:                   'model',
-  NODE_SERIAL_NUMBER:           'serialNumber',
-  VM_INSUFFICIENT:              'harvesterhci.io/insufficient-resource-quota',
-  NODE_NTP_SYNC_STATUS:         'node.harvesterhci.io/ntp-service',
-  PARENT_SRIOV:                 'harvesterhci.io/parent-sriov-network-device',
+  CLOUD_INIT:                     'harvesterhci.io/cloud-init-template',
+  CURRENT_IP:                     'rke2.io/internal-ip',
+  IMAGE_ID:                       'harvesterhci.io/imageId',
+  SSH_NAMES:                      'harvesterhci.io/sshNames',
+  NETWORK_IPS:                    'network.harvesterhci.io/ips',
+  TEMPLATE_VERSION_CUSTOM_NAME:   'template-version.harvesterhci.io/customName',
+  CREATOR:                        'harvesterhci.io/creator',
+  OS:                             'harvesterhci.io/os',
+  NETWORK_TYPE:                   'network.harvesterhci.io/type',
+  VM_NAME:                        'harvesterhci.io/vmName',
+  VM_NAME_PREFIX:                 'harvesterhci.io/vmNamePrefix',
+  VM_RESERVED_MEMORY:             'harvesterhci.io/reservedMemory',
+  MAINTENANCE_STATUS:             'harvesterhci.io/maintain-status',
+  HOST_CUSTOM_NAME:               'harvesterhci.io/host-custom-name',
+  HOST_CONSOLE_URL:               'harvesterhci.io/host-console-url',
+  RESTORE_NAME:                   'restore.harvesterhci.io/name',
+  NODE_ROLE_MASTER:               'node-role.kubernetes.io/master',
+  NODE_ROLE_CONTROL_PLANE:        'node-role.kubernetes.io/control-plane',
+  NODE_ROLE_ETCD:                 'node-role.harvesterhci.io/witness',
+  PROMOTE_STATUS:                 'harvesterhci.io/promote-status',
+  MIGRATION_STATE:                'harvesterhci.io/migrationState',
+  VOLUME_CLAIM_TEMPLATE:          'harvesterhci.io/volumeClaimTemplates',
+  IMAGE_NAME:                     'harvesterhci.io/image-name',
+  INIT_IP:                        'etcd.rke2.cattle.io/node-address',
+  NODE_SCHEDULABLE:               'kubevirt.io/schedulable',
+  NETWORK_ROUTE:                  'network.harvesterhci.io/route',
+  MATCHED_NODES:                  'network.harvesterhci.io/matched-nodes',
+  OS_UPGRADE_IMAGE:               'harvesterhci.io/os-upgrade-image',
+  LATEST_UPGRADE:                 'harvesterhci.io/latestUpgrade',
+  UPGRADE_STATE:                  'harvesterhci.io/upgradeState',
+  REAY_MESSAGE:                   'harvesterhci.io/read-message',
+  DYNAMIC_SSHKEYS_NAMES:          'harvesterhci.io/dynamic-ssh-key-names',
+  DYNAMIC_SSHKEYS_USERS:          'harvesterhci.io/dynamic-ssh-key-users',
+  IMAGE_SUFFIX:                   'harvesterhci.io/image-type',
+  OS_TYPE:                        'harvesterhci.io/os-type',
+  STORAGE_PROVISIONER:            'harvesterhci.io/storageProvisioner',
+  HOST_REQUEST:                   'management.cattle.io/pod-requests',
+  STORAGE_CLASS:                  'harvesterhci.io/storageClassName',
+  STORAGE_NETWORK:                'storage-network.settings.harvesterhci.io',
+  ADDON_EXPERIMENTAL:             'addon.harvesterhci.io/experimental',
+  VOLUME_ERROR:                   'longhorn.io/volume-scheduling-error',
+  KVM_AMD_CPU:                    'cpu-feature.node.kubevirt.io/svm',
+  KVM_INTEL_CPU:                  'cpu-feature.node.kubevirt.io/vmx',
+  NODE_MANUFACTURER:              'manufacturer',
+  NODE_MODEL:                     'model',
+  NODE_SERIAL_NUMBER:             'serialNumber',
+  VM_INSUFFICIENT:                'harvesterhci.io/insufficient-resource-quota',
+  NODE_NTP_SYNC_STATUS:           'node.harvesterhci.io/ntp-service',
+  PARENT_SRIOV:                   'harvesterhci.io/parent-sriov-network-device',
+  PARENT_SRIOV_GPU:               'harvesterhci.io/parentSRIOVGPUDevice',
+  VM_MAINTENANCE_MODE_STRATEGY:   'harvesterhci.io/maintain-mode-strategy',
+  NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
+  CPU_MANAGER:                    'cpumanager'
 };
diff --git a/pkg/harvester/config/settings.js b/pkg/harvester/config/settings.js
index 9984938e..aabdd872 100644
--- a/pkg/harvester/config/settings.js
+++ b/pkg/harvester/config/settings.js
@@ -1,33 +1,39 @@
 export const HCI_SETTING = {
-  BACKUP_TARGET:             'backup-target',
-  CONTAINERD_REGISTRY:       'containerd-registry',
-  LOG_LEVEL:                 'log-level',
-  SERVER_VERSION:            'server-version',
-  UI_INDEX:                  'ui-index',
-  UI_PLUGIN_INDEX:           'ui-plugin-index',
-  UPGRADE_CHECKER_ENABLED:   'upgrade-checker-enabled',
-  UPGRADE_CHECKER_URL:       'upgrade-checker-url',
-  VLAN:                      'vlan',
-  UI_SOURCE:                 'ui-source',
-  UI_PL:                     'ui-pl',
-  HTTP_PROXY:                'http-proxy',
-  ADDITIONAL_CA:             'additional-ca',
-  OVERCOMMIT_CONFIG:         'overcommit-config',
-  CLUSTER_REGISTRATION_URL:  'cluster-registration-url',
-  DEFAULT_STORAGE_CLASS:     'default-storage-class',
-  SUPPORT_BUNDLE_TIMEOUT:    'support-bundle-timeout',
-  SUPPORT_BUNDLE_IMAGE:      'support-bundle-image',
-  STORAGE_NETWORK:           'storage-network',
-  VM_FORCE_RESET_POLICY:     'vm-force-reset-policy',
-  SSL_CERTIFICATES:          'ssl-certificates',
-  SSL_PARAMETERS:            'ssl-parameters',
-  SUPPORT_BUNDLE_NAMESPACES: 'support-bundle-namespaces',
-  AUTO_DISK_PROVISION_PATHS: 'auto-disk-provision-paths',
-  RELEASE_DOWNLOAD_URL:      'release-download-url',
-  CCM_CSI_VERSION:           'harvester-csi-ccm-versions',
-  CSI_DRIVER_CONFIG:         'csi-driver-config',
-  VM_TERMINATION_PERIOD:     'default-vm-termination-grace-period-seconds',
-  NTP_SERVERS:               'ntp-servers',
+  BACKUP_TARGET:                          'backup-target',
+  CONTAINERD_REGISTRY:                    'containerd-registry',
+  LOG_LEVEL:                              'log-level',
+  SERVER_VERSION:                         'server-version',
+  UI_INDEX:                               'ui-index',
+  UI_PLUGIN_INDEX:                        'ui-plugin-index',
+  UPGRADE_CHECKER_ENABLED:                'upgrade-checker-enabled',
+  UPGRADE_CHECKER_URL:                    'upgrade-checker-url',
+  VLAN:                                   'vlan',
+  UI_SOURCE:                              'ui-source',
+  UI_PL:                                  'ui-pl',
+  HTTP_PROXY:                             'http-proxy',
+  ADDITIONAL_CA:                          'additional-ca',
+  OVERCOMMIT_CONFIG:                      'overcommit-config',
+  CLUSTER_REGISTRATION_URL:               'cluster-registration-url',
+  DEFAULT_STORAGE_CLASS:                  'default-storage-class',
+  SUPPORT_BUNDLE_TIMEOUT:                 'support-bundle-timeout',
+  SUPPORT_BUNDLE_EXPIRATION:              'support-bundle-expiration',
+  SUPPORT_BUNDLE_IMAGE:                   'support-bundle-image',
+  SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT: 'support-bundle-node-collection-timeout',
+  STORAGE_NETWORK:                        'storage-network',
+  VM_FORCE_RESET_POLICY:                  'vm-force-reset-policy',
+  SSL_CERTIFICATES:                       'ssl-certificates',
+  SSL_PARAMETERS:                         'ssl-parameters',
+  SUPPORT_BUNDLE_NAMESPACES:              'support-bundle-namespaces',
+  AUTO_DISK_PROVISION_PATHS:              'auto-disk-provision-paths',
+  RELEASE_DOWNLOAD_URL:                   'release-download-url',
+  CCM_CSI_VERSION:                        'harvester-csi-ccm-versions',
+  CSI_DRIVER_CONFIG:                      'csi-driver-config',
+  VM_TERMINATION_PERIOD:                  'default-vm-termination-grace-period-seconds',
+  NTP_SERVERS:                            'ntp-servers',
+  AUTO_ROTATE_RKE2_CERTS:                 'auto-rotate-rke2-certs',
+  KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES:   'kubeconfig-default-token-ttl-minutes',
+  LONGHORN_V2_DATA_ENGINE_ENABLED:        'longhorn-v2-data-engine-enabled',
+  ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO: 'additional-guest-memory-overhead-ratio'
 };
 
 export const HCI_ALLOWED_SETTINGS = {
@@ -41,6 +47,7 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.VLAN]: {
     kind: 'custom', from: 'import', alias: 'vlan'
   },
+  [HCI_SETTING.AUTO_ROTATE_RKE2_CERTS]:  { kind: 'json', from: 'import' },
   [HCI_SETTING.CSI_DRIVER_CONFIG]:       { kind: 'json', from: 'import' },
   [HCI_SETTING.SERVER_VERSION]:          { readOnly: true },
   [HCI_SETTING.UPGRADE_CHECKER_ENABLED]: { kind: 'boolean' },
@@ -49,14 +56,16 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.ADDITIONAL_CA]:           {
     kind: 'multiline', canReset: true, from: 'import'
   },
-  [HCI_SETTING.OVERCOMMIT_CONFIG]:       { kind: 'json', from: 'import' },
-  [HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]:  {},
-  [HCI_SETTING.SUPPORT_BUNDLE_IMAGE]:    { kind: 'json', from: 'import' },
-  [HCI_SETTING.STORAGE_NETWORK]:         { kind: 'custom', from: 'import' },
-  [HCI_SETTING.VM_FORCE_RESET_POLICY]:   { kind: 'json', from: 'import' },
-  [HCI_SETTING.RANCHER_MANAGER_SUPPORT]: { kind: 'boolean' },
-  [HCI_SETTING.SSL_CERTIFICATES]:        { kind: 'json', from: 'import' },
-  [HCI_SETTING.SSL_PARAMETERS]:          {
+  [HCI_SETTING.OVERCOMMIT_CONFIG]:                      { kind: 'json', from: 'import' },
+  [HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]:                 {},
+  [HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]:              {},
+  [HCI_SETTING.SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT]: {},
+  [HCI_SETTING.SUPPORT_BUNDLE_IMAGE]:                   { kind: 'json', from: 'import' },
+  [HCI_SETTING.STORAGE_NETWORK]:                        { kind: 'custom', from: 'import' },
+  [HCI_SETTING.VM_FORCE_RESET_POLICY]:                  { kind: 'json', from: 'import' },
+  [HCI_SETTING.RANCHER_MANAGER_SUPPORT]:                { kind: 'boolean' },
+  [HCI_SETTING.SSL_CERTIFICATES]:                       { kind: 'json', from: 'import' },
+  [HCI_SETTING.SSL_PARAMETERS]:                         {
     kind: 'json', from: 'import', canReset: true
   },
   [HCI_SETTING.SUPPORT_BUNDLE_NAMESPACES]: { from: 'import', canReset: true },
@@ -75,6 +84,9 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.NTP_SERVERS]:           {
     kind: 'json', from: 'import', canReset: true
   },
+  [HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]:   {},
+  [HCI_SETTING.LONGHORN_V2_DATA_ENGINE_ENABLED]:        { kind: 'boolean', technicalPreview: true },
+  [HCI_SETTING.ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO]: { kind: 'string', from: 'import' },
 };
 
 export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
diff --git a/pkg/harvester/config/table-headers.js b/pkg/harvester/config/table-headers.js
index ecd7afa8..fa0c42bf 100644
--- a/pkg/harvester/config/table-headers.js
+++ b/pkg/harvester/config/table-headers.js
@@ -11,6 +11,14 @@ export const IMAGE_DOWNLOAD_SIZE = {
   width:    120
 };
 
+export const IMAGE_VIRTUAL_SIZE = {
+  name:     'virtualSize',
+  labelKey: 'harvester.tableHeaders.virtualSize',
+  value:    'virtualSize',
+  sort:     'status.virtualSize',
+  width:    120
+};
+
 export const IMAGE_PROGRESS = {
   name:      'Uploaded',
   labelKey:  'tableHeaders.progress',
diff --git a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue
index 3f7e86c6..a5c0aea7 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue
@@ -48,6 +48,13 @@ export default {
     customName() {
       return this.value.metadata?.annotations?.[HCI_ANNOTATIONS.HOST_CUSTOM_NAME];
     },
+    cpuManagerStatus() {
+      if (this.value.isCPUManagerEnableInProgress) {
+        return this.t('generic.loading');
+      }
+
+      return this.t(`generic.${ this.value.isCPUManagerEnabled ? 'enabled' : 'disabled' }`);
+    },
 
     consoleUrl() {
       const consoleUrl = this.value.metadata?.annotations?.[HCI_ANNOTATIONS.HOST_CONSOLE_URL];
@@ -224,6 +231,9 @@ export default {
     </div>
 
     <div class="row mb-20">
+      <div v-if="!value.isEtcd" class="col span-6">
+        <LabelValue :name="t('harvester.host.detail.cpuManager')" :value="cpuManagerStatus" />
+      </div>
       <div class="col span-6">
         <LabelValue :name="t('harvester.host.detail.consoleUrl')" :value="consoleUrl.value">
           <a slot="value" :href="consoleUrl.value" target="_blank">{{ consoleUrl.display }}</a>
@@ -268,7 +278,7 @@ export default {
           <HarvesterStorageUsed
             :row="value"
             :resource-name="t('harvester.host.detail.storage')"
-            :show-reserved="true"
+            :show-allocated="true"
           />
         </div>
       </div>
diff --git a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
index 0061c291..53ea78a6 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
@@ -4,13 +4,15 @@ import LabelValue from '@shell/components/LabelValue';
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
 import HarvesterDisk from '../../mixins/harvester-disk';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: {
     LabelValue,
     BadgeState,
     Banner,
-    Tag
+    Tag,
+    RadioGroup
   },
 
   mixins: [
@@ -37,6 +39,18 @@ export default {
     return {};
   },
   computed: {
+    targetDisk() {
+      return this.disks.find(disk => disk.name === this.value.name);
+    },
+    schedulableTooltipMessage() {
+      const { name, path } = this.value;
+
+      if (this.targetDisk && !this.targetDisk.allowScheduling && name && path) {
+        return this.t('harvester.host.disk.allowScheduling.tooltip', { name, path });
+      } else {
+        return this.schedulableCondition.message;
+      }
+    },
     allowSchedulingOptions() {
       return [{
         label: this.t('generic.enabled'),
@@ -117,6 +131,16 @@ export default {
       </div>
       <div class="row mt-10">
         <div class="col span-12">
+          <div class="pull-left">
+            <RadioGroup
+              v-model:value="value.allowScheduling"
+              name="diskScheduling"
+              :label="t('harvester.host.disk.allowScheduling.label')"
+              :mode="mode"
+              :options="allowSchedulingOptions"
+              :row="true"
+            />
+          </div>
           <div class="pull-right">
             {{ t('harvester.host.disk.conditions') }}:
             <BadgeState
@@ -127,9 +151,9 @@ export default {
               class="mr-10 ml-10 state"
             />
             <BadgeState
-              v-clean-tooltip="schedulableCondition.message"
-              :color="schedulableCondition.status === 'True' ? 'bg-success' : 'bg-error' "
-              :icon="schedulableCondition.status === 'True' ? 'icon-checkmark' : 'icon-warning' "
+              v-clean-tooltip="schedulableTooltipMessage"
+              :color="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'bg-success' : 'bg-error' "
+              :icon="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'icon-checkmark' : 'icon-warning' "
               label="Schedulable"
               class="mr-10 state"
             />
diff --git a/pkg/harvester/detail/harvesterhci.io.host/VirtualMachineInstance.vue b/pkg/harvester/detail/harvesterhci.io.host/VirtualMachineInstance.vue
index 02648723..e5bcde80 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/VirtualMachineInstance.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/VirtualMachineInstance.vue
@@ -104,7 +104,7 @@ export default {
         key-field="_key"
         
       >
-        <template cell:state="scope">
+        <template cell:state="scope" class="state-col">
           <div class="state">
             <HarvesterVmState class="vmstate" :row="scope.row" :all-cluster-network="allClusterNetwork" />
           </div>
diff --git a/pkg/harvester/detail/harvesterhci.io.host/index.vue b/pkg/harvester/detail/harvesterhci.io.host/index.vue
index d74dad90..dbcf299d 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/index.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/index.vue
@@ -311,14 +311,12 @@ export default {
         };
       }
 
-      const current = this.ntpSync?.currentNtpServers || '';
-
       if (status === 'unsynced') {
         return {
           status:  'unsynced',
           warning: {
-            key: 'harvester.host.ntp.ntpSyncStatus.isUnsynced',
-            current
+            key:     'harvester.host.ntp.ntpSyncStatus.isUnsynced',
+            current: this.ntpSync?.currentNtpServers ? `<code>${ this.ntpSync.currentNtpServers }</code>` : '',
           }
         };
       }
diff --git a/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue b/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue
index d62e6083..72236716 100644
--- a/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue
+++ b/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue
@@ -35,6 +35,10 @@ export default {
       return this.value?.downSize;
     },
 
+    virtualSize() {
+      return this.value?.virtualSize;
+    },
+
     url() {
       return this.value?.spec?.url || '-';
     },
@@ -100,6 +104,12 @@ export default {
         </div>
       </div>
 
+      <div class="row">
+        <div class="col span-12">
+          <LabelValue :name="t('harvester.image.virtualSize')" :value="virtualSize" class="mb-20" />
+        </div>
+      </div>
+
       <div class="row">
         <div class="col span-12">
           <LabelValue :name="t('nameNsDescription.description.label')" :value="description" class="mb-20" />
diff --git a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
index 5b33416d..beb16107 100644
--- a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
@@ -11,6 +11,7 @@ import NodeScheduling from '@shell/components/form/NodeScheduling';
 import PodAffinity from '@shell/components/form/PodAffinity';
 import KeyValue from '@shell/components/form/KeyValue';
 import Labels from '@shell/components/form/Labels';
+import LabelValue from '@shell/components/LabelValue';
 import { HCI } from '../../types';
 import VM_MIXIN from '../../mixins/harvester-vm';
 
@@ -22,6 +23,7 @@ import Events from './VirtualMachineTabs/VirtualMachineEvents';
 import Migration from './VirtualMachineTabs/VirtualMachineMigration';
 import OverviewBasics from './VirtualMachineTabs/VirtualMachineBasics';
 import OverviewKeypairs from './VirtualMachineTabs/VirtualMachineKeypairs';
+import { formatSi } from '@shell/utils/units';
 
 const VM_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/harvester-vm-detail-1/vm-info-detail?orgId=1';
 
@@ -33,6 +35,7 @@ export default {
     Tabbed,
     Events,
     OverviewBasics,
+    LabelValue,
     Volume,
     Network,
     OverviewKeypairs,
@@ -57,15 +60,18 @@ export default {
 
   data() {
     return {
-      switchToCloud: false,
+      hasResourceQuotaSchema: false,
+      switchToCloud:          false,
       VM_METRICS_DETAIL_URL,
-      showVmMetrics: false,
+      showVmMetrics:          false,
     };
   },
 
   async created() {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
+    this.hasResourceQuotaSchema = !!this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
+
     const hash = {
       pods:     this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
       services: this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE }),
@@ -75,6 +81,10 @@ export default {
       restore:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
     };
 
+    if (this.hasResourceQuotaSchema) {
+      hash.resourceQuotas = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA });
+    }
+
     await allHash(hash);
 
     setPromiseResult(
@@ -88,6 +98,22 @@ export default {
   computed: {
     ...mapGetters(['currentCluster']),
 
+    totalSnapshotSize() {
+      if (this.value.snapshotSizeQuota === undefined || this.value.snapshotSizeQuota === null) {
+        return ' - ';
+      }
+
+      if (this.value.snapshotSizeQuota === 0) {
+        return '0';
+      }
+
+      return formatSi(this.value.snapshotSizeQuota, {
+        increment: 1024,
+        addSuffix: true,
+        suffix:    'i',
+      });
+    },
+
     vmi() {
       const inStore = this.$store.getters['currentProduct'].inStore;
 
@@ -175,10 +201,17 @@ export default {
         <Network v-model:value="networkRows" mode="view" />
       </Tab>
 
-      <Tab name="keypairs" :label="t('harvester.virtualMachine.detail.tabs.keypairs')" class="bordered-table" :weight="3">
+      <Tab name="keypairs" :label="t('harvester.virtualMachine.detail.tabs.keypairs')" class="bordered-table" :weight="4">
         <OverviewKeypairs :value="value" />
       </Tab>
 
+      <Tab v-if="hasResourceQuotaSchema" name="quotas" :label="t('harvester.tab.quotas')" :weight="3">
+        <LabelValue
+          :name="t('harvester.snapshot.totalSnapshotSize')"
+          :value="totalSnapshotSize"
+        />
+      </Tab>
+
       <Tab
         v-if="showVmMetrics"
         name="vm-metrics"
diff --git a/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue b/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue
index f1f53a81..e82b356e 100644
--- a/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue
+++ b/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue
@@ -8,6 +8,7 @@ import { STATE, NAME, AGE } from '@shell/config/table-headers';
 import { matching } from '@shell/utils/selector';
 import { NODE } from '@shell/config/types';
 import { isEmpty } from '@shell/utils/object';
+import { HCI } from '@pkg/harvester/config/labels-annotations';
 
 export default {
   components: {
@@ -55,10 +56,13 @@ export default {
       const inStore = this.$store.getters['currentProduct'].inStore;
 
       const nodes = this.$store.getters[`${ inStore }/all`](NODE);
+      const matchedNodes = this.value?.metadata?.annotations?.[HCI.MATCHED_NODES];
       const selector = this.value?.spec?.nodeSelector;
 
       if (!isEmpty(selector)) {
         return matching(nodes, selector);
+      } else if (matchedNodes && matchedNodes.length > 0) {
+        return nodes.filter(node => matchedNodes.includes(node.id));
       } else {
         return nodes;
       }
diff --git a/pkg/harvester/dialog/HarvesterMaintenanceDialog.vue b/pkg/harvester/dialog/HarvesterMaintenanceDialog.vue
index 9deef72c..fa9a0d1a 100644
--- a/pkg/harvester/dialog/HarvesterMaintenanceDialog.vue
+++ b/pkg/harvester/dialog/HarvesterMaintenanceDialog.vue
@@ -6,6 +6,7 @@ import { Banner } from '@components/Banner';
 import { Checkbox } from '@components/Form/Checkbox';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { BadgeState } from '@components/BadgeState';
+import { ucFirst } from '@shell/utils/string';
 
 export default {
   components: {
@@ -25,9 +26,9 @@ export default {
 
   data() {
     return {
-      errors:      [],
-      unhealthyVM: '',
-      force:       false
+      errors:       [],
+      unhealthyVMs: [],
+      force:        false
     };
   },
 
@@ -40,13 +41,21 @@ export default {
   },
 
   methods: {
+    ucFirst,
+
+    onInputForce(v) {
+      if (v) {
+        this.unhealthyVMs = [];
+      }
+    },
+
     close() {
       this.$emit('close');
     },
 
     async apply(buttonCb) {
       this.errors = [];
-      this.unhealthyVM = '';
+      this.unhealthyVMs = [];
 
       try {
         const res = await this.actionResource.doAction('maintenancePossible');
@@ -62,8 +71,8 @@ export default {
         } else if (res._status === 200 || res._status === 204) {
           const res = await this.actionResource.doAction('listUnhealthyVM');
 
-          if (res.message) {
-            this.unhealthyVM = res;
+          if (res?.length) {
+            this.unhealthyVMs = res;
             buttonCb(false);
           } else {
             await this.actionResource.doAction('enableMaintenanceMode', { force: 'false' });
@@ -95,15 +104,20 @@ export default {
         <Checkbox
           v-model:value="force"
           label-key="harvester.host.enableMaintenance.force"
+          @update:value="onInputForce"
         />
       </div>
-      <Banner color="warning" :label="t('harvester.host.enableMaintenance.protip')" class="mb-0" />
-      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
 
-      <div v-if="unhealthyVM">
-        <Banner color="error mb-5">
+      <Banner color="warning" :label="t('harvester.host.enableMaintenance.protip')" />
+
+      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="ucFirst(err)" />
+
+      <Banner v-if="!force" class="mt-0" color="warning" :labelKey="'harvester.host.enableMaintenance.shutDownVMs'" />
+
+      <div v-for="(unhealthyVM, i) in unhealthyVMs" :key="i">
+        <Banner color="error mt-0 mb-5">
           <p>
-            {{ unhealthyVM.message }}
+            {{ ucFirst(unhealthyVM.message) }}
           </p>
         </Banner>
 
diff --git a/pkg/harvester/dialog/HarvesterMigrationDialog.vue b/pkg/harvester/dialog/HarvesterMigrationDialog.vue
index cf2031c4..259a6888 100644
--- a/pkg/harvester/dialog/HarvesterMigrationDialog.vue
+++ b/pkg/harvester/dialog/HarvesterMigrationDialog.vue
@@ -72,8 +72,11 @@ export default {
       const nodes = this.$store.getters['harvester/all'](NODE);
 
       return nodes.filter((n) => {
-        // do not allow to migrate to self node
-        return !!this.availableNodes.includes(n.id);
+        const isNotSelfNode = !!this.availableNodes.includes(n.id);
+        const isNotWitnessNode = n.isEtcd !== 'true'; // do not allow to migrate to self node and witness node
+        const matchingCpuManagerConfig = n.isCPUManagerEnabled; // If cpu-pinning is enabled, filter-out non-enabled CPU manager nodes.
+
+        return isNotSelfNode && isNotWitnessNode && matchingCpuManagerConfig;
       }).map((n) => {
         let label = n?.metadata?.name;
         const value = n?.metadata?.name;
diff --git a/pkg/harvester/dialog/HarvesterQuotaDialog.vue b/pkg/harvester/dialog/HarvesterQuotaDialog.vue
new file mode 100644
index 00000000..a0cd3f01
--- /dev/null
+++ b/pkg/harvester/dialog/HarvesterQuotaDialog.vue
@@ -0,0 +1,121 @@
+<script>
+import { mapGetters, mapState } from 'vuex';
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import AsyncButton from '@shell/components/AsyncButton';
+import UnitInput from '@shell/components/form/UnitInput';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+
+export default {
+  name: 'HarvesterVMQuotaDialog',
+
+  components: {
+    AsyncButton,
+    Card,
+    UnitInput,
+    Banner
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  created() {
+    this.totalSnapshotSize = this.modalData.snapshotSizeQuota;
+  },
+
+  data() {
+    return {
+      totalSnapshotSize: '',
+      errors:            []
+    };
+  },
+
+  computed: {
+    ...mapState('action-menu', ['modalData']),
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources[0];
+    },
+  },
+
+  methods: {
+
+    close() {
+      this.totalSnapshotSize = '';
+      this.$emit('close');
+    },
+
+    async save(buttonDone) {
+      try {
+        // call delete action if user input 0Gi or empty string
+        if (this.totalSnapshotSize === null || this.totalSnapshotSize === '0Gi' ) {
+          await this.actionResource.doAction('deleteResourceQuota');
+        } else {
+          await this.actionResource.doAction('updateResourceQuota', { totalSnapshotSizeQuota: this.totalSnapshotSize });
+        }
+        this.close();
+        buttonDone(true);
+      } catch (err) {
+        const error = err?.data || err;
+        const message = exceptionToErrorsArray(error);
+
+        this['errors'] = message;
+        buttonDone(false);
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <h4
+      slot="title"
+      v-clean-html="t('harvester.modal.quota.editQuota')"
+      class="text-default-text"
+    />
+    <template #body>
+      <Banner color="info">
+        {{ t('harvester.modal.quota.bannerMessage') }}
+      </Banner>
+      <UnitInput
+        v-model:value="totalSnapshotSize"
+        v-int-number
+        :label="t('harvester.snapshot.totalSnapshotSize')"
+        :disabled="false"
+        :mode="create"
+        :input-exponent="3"
+        :increment="1024"
+        :output-modifier="true"
+        suffix="GiB"
+        class="mb-20"
+      />
+    </template>
+    <div slot="actions" class="actions">
+      <div class="buttons">
+        <button class="btn role-secondary mr-10" @click="close">
+          {{ t('generic.cancel') }}
+        </button>
+        <AsyncButton @click="save" />
+      </div>
+      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
+    </div>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
diff --git a/pkg/harvester/dialog/HarvesterRestoreDialog.vue b/pkg/harvester/dialog/HarvesterRestoreDialog.vue
index a8b1c0bf..f9d9bc6c 100644
--- a/pkg/harvester/dialog/HarvesterRestoreDialog.vue
+++ b/pkg/harvester/dialog/HarvesterRestoreDialog.vue
@@ -149,7 +149,7 @@ export default {
         />
       </div>
 
-      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
+      <Banner v-for="(err, i) in errors" :key="i"/>
     </div>
   </Card>
 </template>
diff --git a/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue b/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
index 381cc459..25ec529f 100644
--- a/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
+++ b/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
@@ -5,7 +5,7 @@ import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
 import { RadioGroup, RadioButton } from '@components/Form/Radio';
 import HarvesterDisk from '../../mixins/harvester-disk';
-import DiskTags from '../../components/DiskTags';
+import Tags from '../../components/DiskTags';
 import { HCI } from '../../types';
 import { LONGHORN_SYSTEM } from './index';
 
@@ -17,7 +17,7 @@ export default {
     Banner,
     RadioGroup,
     RadioButton,
-    DiskTags,
+    Tags,
   },
 
   mixins: [
@@ -44,6 +44,18 @@ export default {
     return {};
   },
   computed: {
+    targetDisk() {
+      return this.disks.find(disk => disk.name === this.value.name);
+    },
+    schedulableTooltipMessage() {
+      const { name, path } = this.value;
+
+      if (this.targetDisk && !this.targetDisk.allowScheduling && name && path) {
+        return this.t('harvester.host.disk.allowScheduling.tooltip', { name, path });
+      } else {
+        return this.schedulableCondition.message;
+      }
+    },
     allowSchedulingOptions() {
       return [{
         label: this.t('generic.enabled'),
@@ -171,7 +183,7 @@ export default {
     <div v-if="!value.isNew">
       <div class="row">
         <div class="col span-12">
-          <DiskTags
+          <Tags
             v-model:value="value.tags"
             :label="t('harvester.host.disk.tags.label')"
             :add-label="t('harvester.host.disk.tags.addLabel')"
@@ -181,6 +193,16 @@ export default {
       </div>
       <div class="row mt-10">
         <div class="col span-12">
+          <div class="pull-left">
+            <RadioGroup
+              v-model:value="value.allowScheduling"
+              name="diskScheduling"
+              :label="t('harvester.host.disk.allowScheduling.label')"
+              :mode="mode"
+              :options="allowSchedulingOptions"
+              :row="true"
+            />
+          </div>
           <div class="pull-right">
             {{ t('harvester.host.disk.conditions') }}:
             <BadgeState
@@ -191,9 +213,9 @@ export default {
               class="mr-10 ml-10 state"
             />
             <BadgeState
-              v-clean-tooltip="schedulableCondition.message"
-              :color="schedulableCondition.status === 'True' ? 'bg-success' : 'bg-error' "
-              :icon="schedulableCondition.status === 'True' ? 'icon-checkmark' : 'icon-warning' "
+              v-clean-tooltip="schedulableTooltipMessage"
+              :color="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'bg-success' : 'bg-error' "
+              :icon="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'icon-checkmark' : 'icon-warning' "
               label="Schedulable"
               class="mr-10 state"
             />
diff --git a/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue b/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue
index 41a25b0d..07771ffb 100644
--- a/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue
+++ b/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue
@@ -5,6 +5,7 @@ import UnitInput from '@shell/components/form/UnitInput';
 import { RadioGroup } from '@components/Form/Radio';
 import { Checkbox } from '@components/Form/Checkbox';
 import { HCI } from '../../types';
+import { DOC_LINKS } from '../../config/doc-links';
 
 export const ksmtunedMode = [{
   value: 'standard',
@@ -86,6 +87,10 @@ export default {
 
     showKsmt() {
       return this.spec.run === 'run';
+    },
+
+    ksmtunedLink() {
+      return DOC_LINKS.KSMTUNED_MODE;
     }
   },
 
@@ -135,7 +140,7 @@ export default {
       <Checkbox v-model:value="enableMergeAcrossNodes" :mode="mode" class="check mb-20" type="checkbox" :label="t('harvester.host.ksmtuned.enableMergeNodes')" />
 
       <h3>
-        <t k="harvester.host.ksmtuned.modeLink" :raw="true" />
+        <t k="harvester.host.ksmtuned.modeLink" :raw="true" :url="ksmtunedLink" />
       </h3>
       <RadioGroup
         v-model:value="spec.mode"
diff --git a/pkg/harvester/edit/harvesterhci.io.host/index.vue b/pkg/harvester/edit/harvesterhci.io.host/index.vue
index cf220ce1..d781267f 100644
--- a/pkg/harvester/edit/harvesterhci.io.host/index.vue
+++ b/pkg/harvester/edit/harvesterhci.io.host/index.vue
@@ -25,10 +25,10 @@ import { _EDIT } from '@shell/config/query-params';
 import { sortBy } from '@shell/utils/sort';
 import { Banner } from '@components/Banner';
 import { HCI } from '../../types';
-import DiskTags from '../../components/DiskTags';
 import HarvesterDisk from './HarvesterDisk';
 import HarvesterSeeder from './HarvesterSeeder';
 import HarvesterKsmtuned from './HarvesterKsmtuned';
+import Tags from '../../components/DiskTags';
 
 export const LONGHORN_SYSTEM = 'longhorn-system';
 
@@ -46,7 +46,7 @@ export default {
     ButtonDropdown,
     KeyValue,
     Banner,
-    DiskTags,
+    Tags,
     Loading,
     HarvesterSeeder,
     MessageLink,
@@ -478,10 +478,11 @@ export default {
 
       const disks = this.longhornNode?.spec?.disks || {};
 
+      // update each disk tags and scheduling
       this.newDisks.map((disk) => {
         (disks[disk.name] || {}).tags = disk.tags;
+        (disks[disk.name] || {}).allowScheduling = disk.allowScheduling;
       });
-
       let count = 0;
 
       const retrySave = async() => {
@@ -505,7 +506,9 @@ export default {
         }
       };
 
-      await retrySave();
+      if (this.longhornNode) {
+        await retrySave();
+      }
     },
   },
 };
@@ -547,7 +550,7 @@ export default {
             class="row mb-20"
           >
             <div class="col span-12">
-              <DiskTags
+              <Tags
                 v-model:value="longhornNode.spec.tags"
                 :label="t('harvester.host.tags.label')"
                 :add-label="t('harvester.host.tags.addLabel')"
@@ -650,7 +653,6 @@ export default {
             :value="filteredLabels"
             :add-label="t('labels.addLabel')"
             :mode="mode"
-            :title="t('labels.labels.title')"
             :read-allowed="false"
             :value-can-be-empty="true"
             @update:value="updateHostLabels"
diff --git a/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue b/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue
index b9c30144..eeec144c 100644
--- a/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue
+++ b/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue
@@ -143,10 +143,19 @@ export default {
     },
 
     input(neu) {
-      const pattern = /^([1-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-9][0-4])$/;
+      if (neu === '') {
+        this.config.vlan = '';
 
-      if (!pattern.test(neu) && neu !== '') {
-        this.config.vlan = neu > 4094 ? 4094 : 1;
+        return;
+      }
+      const newValue = Number(neu);
+
+      if (newValue > 4094) {
+        this.config.vlan = 4094;
+      } else if (newValue < 1) {
+        this.config.vlan = 1;
+      } else {
+        this.config.vlan = newValue;
       }
     },
 
diff --git a/pkg/harvester/edit/harvesterhci.io.storage/index.vue b/pkg/harvester/edit/harvesterhci.io.storage/index.vue
index 8f7ec052..203ee049 100644
--- a/pkg/harvester/edit/harvesterhci.io.storage/index.vue
+++ b/pkg/harvester/edit/harvesterhci.io.storage/index.vue
@@ -17,7 +17,7 @@ import { STORAGE_CLASS, LONGHORN } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { clone } from '@shell/utils/object';
 import { CSI_DRIVER } from '../../types';
-import DiskTags from '../../components/DiskTags';
+import Tags from '../../components/DiskTags';
 
 const LONGHORN_DRIVER = 'driver.longhorn.io';
 
@@ -34,7 +34,7 @@ export default {
     Tab,
     Tabbed,
     Loading,
-    DiskTags,
+    Tags,
   },
 
   mixins: [CreateEditView],
@@ -304,7 +304,7 @@ export default {
                 />
               </div>
               <div class="col span-8 value">
-                <DiskTags
+                <Tags
                   v-model:value="scope.row.value.values"
                   :add-label="t('generic.add')"
                   :mode="modeOverride"
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
index e4d9f613..4d703be2 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
@@ -162,6 +162,7 @@ export default {
           buttonCb(false);
         }
       } else {
+        this.value.spec.url = this.value.spec.url?.trim() || '';
         this.save(buttonCb);
       }
     },
@@ -277,6 +278,7 @@ export default {
     :can-yaml="showEditAsYaml ? true : false"
     :apply-hooks="applyHooks"
     @finish="saveImage"
+    @error="e=>errors=e"
   >
     <NameNsDescription
       ref="nd"
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
index da8b5baa..80310af2 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
@@ -18,7 +18,6 @@ import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { AFTER_SAVE_HOOKS } from '@shell/mixins/child-hook';
 import { HCI } from '../types';
-import { RunStrategys } from '../config/harvester-map';
 import VM_MIXIN from '../mixins/harvester-vm';
 import Reserved from './kubevirt.io.virtualmachine/VirtualMachineReserved';
 import Volume from './kubevirt.io.virtualmachine/VirtualMachineVolume';
@@ -74,7 +73,6 @@ export default {
       description:      '',
       defaultVersion:   null,
       isDefaultVersion: false,
-      RunStrategys,
     };
   },
 
@@ -263,7 +261,7 @@ export default {
       <Tab
         name="nodeScheduling"
         :label="t('workload.container.titles.nodeScheduling')"
-        :weight="-89"
+        :weight="-3"
       >
         <template #default="{active}">
           <NodeScheduling
@@ -274,7 +272,7 @@ export default {
         </template>
       </Tab>
 
-      <Tab :label="t('harvester.tab.vmScheduling')" name="vmScheduling" :weight="-90">
+      <Tab :label="t('harvester.tab.vmScheduling')" name="vmScheduling" :weight="-4">
         <template #default="{active}">
           <PodAffinity
             :mode="mode"
@@ -287,13 +285,42 @@ export default {
         </template>
       </Tab>
 
+      <Tab
+        :name="t('generic.labels')"
+        :label="t('harvester.tab.instanceLabel')"
+        :weight="-5"
+      >
+        <Labels
+          :default-container-class="'labels-and-annotations-container'"
+          :value="value"
+          :mode="mode"
+          :display-side-by-side="false"
+          :show-annotations="false"
+          :show-label-title="false"
+        >
+          <template #labels="{toggler}">
+            <KeyValue
+              key="labels"
+              :value="value.instanceLabels"
+              :protected-keys="value.systemLabels || []"
+              :toggle-filter="toggler"
+              :add-label="t('labels.addLabel')"
+              :mode="mode"
+              :read-allowed="false"
+              :value-can-be-empty="true"
+              @input="value.setInstanceLabels($event)"
+            />
+          </template>
+        </Labels>
+      </Tab>
+
       <Tab name="advanced" :label="t('harvester.tab.advanced')" :weight="-99">
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
               v-model:value="runStrategy"
               label-key="harvester.virtualMachine.runStrategy"
-              :options="RunStrategys"
+              :options="runStrategies"
               :mode="mode"
             />
           </div>
@@ -308,6 +335,37 @@ export default {
           </div>
         </div>
 
+        <div class="row mb-20">
+          <div class="col span-6">
+            <LabeledSelect
+              v-model:value="maintenanceStrategy"
+              label-key="harvester.virtualMachine.maintenanceStrategy.label"
+              :options="maintenanceStrategies"
+              :get-option-label="getMaintenanceStrategyOptionLabel"
+              :mode="mode"
+            />
+          </div>
+          <div class="col span-6">
+            <Reserved
+              :reserved-memory="reservedMemory"
+              :mode="mode"
+              @updateReserved="updateReserved"
+            />
+          </div>
+        </div>
+
+        <div class="row mb-20">
+          <div class="col span-6">
+            <Checkbox
+              v-model:value="cpuPinning"
+              class="check"
+              type="checkbox"
+              label-key="harvester.virtualMachine.cpuPinning.label"
+              :mode="mode"
+            />
+          </div>
+        </div>
+
         <div class="row mb-20">
           <a v-if="showAdvanced" v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
           <a v-else v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
@@ -315,13 +373,6 @@ export default {
 
         <div v-if="showAdvanced">
           <div class="row mb-20">
-            <div class="col span-6">
-              <Reserved
-                :reserved-memory="reservedMemory"
-                :mode="mode"
-                @updateReserved="updateReserved"
-              />
-            </div>
             <div class="col span-6">
               <UnitInput
                 v-model:value="terminationGracePeriodSeconds"
@@ -386,35 +437,6 @@ export default {
           :mode="mode"
         />
       </Tab>
-
-      <Tab
-        :name="t('generic.labels')"
-        :label="t('harvester.tab.instanceLabel')"
-        :weight="-99"
-      >
-        <Labels
-          :default-container-class="'labels-and-annotations-container'"
-          :value="value"
-          :mode="mode"
-          :display-side-by-side="false"
-          :show-annotations="false"
-          :show-label-title="false"
-        >
-          <template #labels="{toggler}">
-            <KeyValue
-              key="labels"
-              :value="value.instanceLabels"
-              :protected-keys="value.systemLabels || []"
-              :toggle-filter="toggler"
-              :add-label="t('labels.addLabel')"
-              :mode="mode"
-              :read-allowed="false"
-              :value-can-be-empty="true"
-              @update:value="value.setInstanceLabels($event)"
-            />
-          </template>
-        </Labels>
-      </Tab>
     </Tabbed>
   </CruResource>
 </template>
diff --git a/pkg/harvester/edit/harvesterhci.io.volume.vue b/pkg/harvester/edit/harvesterhci.io.volume.vue
index c55c647d..2956ae4b 100644
--- a/pkg/harvester/edit/harvesterhci.io.volume.vue
+++ b/pkg/harvester/edit/harvesterhci.io.volume.vue
@@ -56,6 +56,7 @@ export default {
     const hash = await allHash(_hash);
 
     this.snapshots = hash.snapshots;
+    this.images = hash.images;
 
     const defaultStorage = this.$store.getters[`harvester/all`](STORAGE_CLASS).find( O => O.isDefault);
 
@@ -77,6 +78,7 @@ export default {
       storage,
       imageId,
       snapshots: [],
+      images:    [],
     };
   },
 
@@ -108,10 +110,8 @@ export default {
     },
 
     imageOption() {
-      const choices = this.$store.getters['harvester/all'](HCI.IMAGE);
-
       return sortBy(
-        choices
+        this.images
           .filter(obj => obj.isReady)
           .map((obj) => {
             return {
@@ -249,7 +249,17 @@ export default {
 
       this.value['spec'] = spec;
     },
+    updateImage() {
+      if (this.isVMImage && this.imageId) {
+        const imageResource = this.images?.find(image => this.imageId === image.id);
+        const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
 
+        if (imageSize) {
+          this.storage = `${ Math.ceil(imageSize / 1024 / 1024 / 1024) }Gi`;
+        }
+      }
+      this.update();
+    },
     generateYaml() {
       const out = saferDump(this.value);
 
@@ -300,7 +310,7 @@ export default {
           required
           :mode="mode"
           class="mb-20"
-          @update:value="update"
+          @update:value="updateImage"
         />
 
         <LabeledSelect
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
index 10919b98..43ab4f6c 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
@@ -140,15 +140,24 @@ export default {
 
     onImageChange() {
       const imageResource = this.$store.getters['harvester/all'](HCI.IMAGE)?.find( I => this.value.image === I.id);
+      const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
+      const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
 
-      if (this.idx === 0) {
-        if (/iso$/i.test(imageResource?.imageSuffix)) {
-          this.value['type'] = 'cd-rom';
-          this.value['bus'] = 'sata';
-        } else {
-          this.value['type'] = 'disk';
-          this.value['bus'] = 'virtio';
+      if (isIsoImage) {
+        this.value['type'] = 'cd-rom';
+        this.value['bus'] = 'sata';
+      } else {
+        this.value['type'] = 'disk';
+        this.value['bus'] = 'virtio';
+      }
+
+      if (imageSize) {
+        let imageSizeGiB = Math.ceil(imageSize / 1024 / 1024 / 1024);
+
+        if (!isIsoImage) {
+          imageSizeGiB = Math.max(imageSizeGiB, 10);
         }
+        this.value['size'] = `${ imageSizeGiB }Gi`;
       }
 
       this.update();
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index acb66419..54259ceb 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -28,7 +28,6 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 
 import { parseVolumeClaimTemplates } from '@pkg/utils/vm';
 import VM_MIXIN from '../../mixins/harvester-vm';
-import { RunStrategys } from '../../config/harvester-map';
 import { HCI } from '../../types';
 import RestartVMDialog from '../../dialog/RestartVMDialog';
 import VirtualMachineVGpuDevices from './VirtualMachineVGpuDevices/index';
@@ -40,6 +39,8 @@ import Network from './VirtualMachineNetwork';
 import Volume from './VirtualMachineVolume';
 import SSHKey from './VirtualMachineSSHKey';
 import Reserved from './VirtualMachineReserved';
+import { Banner } from '@components/Banner';
+import MessageLink from '@shell/components/MessageLink';
 
 export default {
   name: 'HarvesterEditVM',
@@ -68,6 +69,8 @@ export default {
     UnitInput,
     VirtualMachineVGpuDevices,
     KeyValue,
+    Banner,
+    MessageLink
   },
 
   mixins: [CreateEditView, VM_MIXIN],
@@ -96,13 +99,19 @@ export default {
       isOpen:            false,
       hostname,
       isRestartImmediately,
-      RunStrategys,
     };
   },
 
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
 
+    to() {
+      return {
+        name:   'harvester-c-cluster-resource',
+        params: { cluster: this.$store.getters['clusterId'], resource: HCI.HOST },
+      };
+    },
+
     machineTypeOptions() {
       return [{
         label: 'None',
@@ -173,6 +182,26 @@ export default {
     hasStartAction() {
       return this.value.hasAction('start');
     },
+
+    enableCpuPinningCheckbox() {
+      if (this.mode === 'create') {
+        return this.nodes.some(node => node.isCPUManagerEnabled); // any one of nodes has label cpuManager=true
+      }
+
+      return true;
+    },
+
+    showCpuPinningBanner() {
+      if (this.mode === 'edit') {
+        return this.cpuPinning !== !!this.cloneVM.spec.template.spec.domain.cpu.dedicatedCpuPlacement;
+      }
+
+      if (this.mode === 'create') {
+        return this.nodes.every(node => !node.isCPUManagerEnabled); // no node enabled CPU manager
+      }
+
+      return false;
+    }
   },
 
   watch: {
@@ -273,6 +302,15 @@ export default {
   },
 
   methods: {
+    cancelAction() {
+      const { fromPage = HCI.VM } = this.$route?.query; // default back to VM list page
+      const cancelOverride = {
+        name:   this.doneRoute,
+        params: { resource: fromPage }
+      };
+
+      this.$router.replace(cancelOverride);
+    },
     saveVM(buttonCb) {
       clear(this.errors);
 
@@ -437,12 +475,14 @@ export default {
     id="vm"
     :done-route="doneRoute"
     :resource="value"
+    :cancelEvent="true"
     :mode="mode"
     :can-yaml="isSingle ? true : false"
     :errors="errors"
     :generate-yaml="generateYaml"
     :apply-hooks="applyHooks"
     @finish="saveVM"
+    @cancel="cancelAction"
   >
     <RadioGroup
       v-if="isCreate"
@@ -606,44 +646,54 @@ export default {
         />
       </Tab>
 
-      <Tab
-        v-if="enabledSriovgpu"
-        :label="t('harvester.tab.vGpuDevices')"
-        name="vGpuDevices"
-        :weight="-6"
-      >
-        <VirtualMachineVGpuDevices
-          :mode="mode"
-          :value="spec.template.spec"
-          :vm="value"
-        />
+      <Tab v-if="enabledSriovgpu" :label="t('harvester.tab.vGpuDevices')" name="vGpuDevices" :weight="-6">
+        <VirtualMachineVGpuDevices :mode="mode" :value="spec.template.spec" :vm="value" />
+      </Tab>
+
+      <Tab v-if="isEdit" :label="t('harvester.tab.accessCredentials')" name="accessCredentials" :weight="-7">
+        <AccessCredentials v-model:value="accessCredentials" :mode="mode" :resource="value" :is-qemu-installed="isQemuInstalled" />
       </Tab>
 
       <Tab
-        v-if="isEdit"
-        :label="t('harvester.tab.accessCredentials')"
-        name="accessCredentials"
-        :weight="-7"
+        name="instanceLabel"
+        :label="t('harvester.tab.instanceLabel')"
+        :weight="-8"
       >
-        <AccessCredentials
-          v-model:value="accessCredentials"
+        <Labels
+          :default-container-class="'labels-and-annotations-container'"
+          :value="value"
           :mode="mode"
-          :resource="value"
-          :is-qemu-installed="isQemuInstalled"
-        />
+          :display-side-by-side="false"
+          :show-annotations="false"
+          :show-label-title="false"
+        >
+          <template #labels="{toggler}">
+            <KeyValue
+              key="labels"
+              :value="value.instanceLabels"
+              :protected-keys="value.systemLabels || []"
+              :toggle-filter="toggler"
+              :add-label="t('labels.addLabel')"
+              :mode="mode"
+              :read-allowed="false"
+              :value-can-be-empty="true"
+              @update:value="value.setInstanceLabels($event)"
+            />
+          </template>
+        </Labels>
       </Tab>
 
       <Tab
         name="advanced"
         :label="t('harvester.tab.advanced')"
-        :weight="-8"
+        :weight="-9"
       >
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
               v-model:value="runStrategy"
               label-key="harvester.virtualMachine.runStrategy"
-              :options="RunStrategys"
+              :options="runStrategies"
               :mode="mode"
             />
           </div>
@@ -659,24 +709,30 @@ export default {
         </div>
 
         <div class="row mb-20">
-          <a
-            v-if="showAdvanced"
-            v-t="'harvester.generic.showMore'"
-            role="button"
-            @click="toggleAdvanced"
-          />
-          <a
-            v-else
-            v-t="'harvester.generic.showMore'"
-            role="button"
-            @click="toggleAdvanced"
-          />
+          <div class="col span-6">
+            <LabeledSelect
+              v-model:value="maintenanceStrategy"
+              label-key="harvester.virtualMachine.maintenanceStrategy.label"
+              :options="maintenanceStrategies"
+              :get-option-label="getMaintenanceStrategyOptionLabel"
+              :mode="mode"
+            />
+          </div>
+          <div class="col span-6">
+            <Reserved
+              :reserved-memory="reservedMemory"
+              :mode="mode"
+              @updateReserved="updateReserved"
+            />
+          </div>
         </div>
 
-        <div
-          v-if="showAdvanced"
-          class="mb-20"
-        >
+        <div class="row mb-20">
+          <a v-if="showAdvanced" v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
+          <a v-else v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
+        </div>
+
+        <div v-if="showAdvanced" class="mb-20">
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
@@ -698,13 +754,6 @@ export default {
           </div>
 
           <div class="row mb-20">
-            <div class="col span-6">
-              <Reserved
-                :reserved-memory="reservedMemory"
-                :mode="mode"
-                @updateReserved="updateReserved"
-              />
-            </div>
             <div class="col span-6">
               <UnitInput
                 v-model:value="terminationGracePeriodSeconds"
@@ -730,6 +779,16 @@ export default {
           @updateDataTemplateId="updateDataTemplateId"
         />
 
+        <Checkbox
+          v-model:value="cpuPinning"
+          :disabled="!enableCpuPinningCheckbox"
+          class="check"
+          type="checkbox"
+          tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
+          label-key="harvester.virtualMachine.cpuPinning.label"
+          :mode="mode"
+        />
+
         <Checkbox
           v-model:value="installUSBTablet"
           class="check mt-20"
@@ -773,35 +832,21 @@ export default {
           :label="t('harvester.virtualMachine.secureBoot')"
           :mode="mode"
         />
-      </Tab>
-
-      <Tab
-        name="instanceLabel"
-        :label="t('harvester.tab.instanceLabel')"
-        :weight="-99"
-      >
-        <Labels
-          :default-container-class="'labels-and-annotations-container'"
-          :value="value"
-          :mode="mode"
-          :display-side-by-side="false"
-          :show-annotations="false"
-          :show-label-title="false"
+        <Banner
+          v-if="showCpuPinningBanner"
+          color="warning"
         >
-          <template #labels="{toggler}">
-            <KeyValue
-              key="labels"
-              :value="value.instanceLabels"
-              :protected-keys="value.systemLabels || []"
-              :toggle-filter="toggler"
-              :add-label="t('labels.addLabel')"
-              :mode="mode"
-              :read-allowed="false"
-              :value-can-be-empty="true"
-              @update:value="value.setInstanceLabels($event)"
-            />
-          </template>
-        </Labels>
+          <MessageLink
+            v-if="mode === 'create'"
+            :to="to"
+            prefix-label="harvester.virtualMachine.advancedOptions.cpuManager.prefix"
+            middle-label="harvester.virtualMachine.advancedOptions.cpuManager.middle"
+            suffix-label="harvester.virtualMachine.advancedOptions.cpuManager.suffix"
+          />
+          <span v-if="mode==='edit'">
+            {{ t('harvester.virtualMachine.cpuPinning.restartVMMessage') }}
+          </span>
+        </Banner>
       </Tab>
     </Tabbed>
 
diff --git a/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue b/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue
index 882c65ed..cbf5300e 100644
--- a/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue
+++ b/pkg/harvester/edit/network.harvesterhci.io.vlanconfig/index.vue
@@ -314,12 +314,21 @@ export default {
       } else if (selector[HOSTNAME] && Object.keys(selector).length === 1) {
         const matchNode = allNodes.find(n => n.id === selector[HOSTNAME]);
 
-        this.matchingNodes = {
-          matched: 1,
-          total:   allNodes.length,
-          none:    false,
-          sample:  matchNode ? matchNode.nameDisplay : selector[HOSTNAME],
-        };
+        if (matchNode) {
+          this.matchingNodes = {
+            matched: 1,
+            total:   allNodes.length,
+            none:    false,
+            sample:  matchNode.nameDisplay,
+          };
+        } else {
+          this.matchingNodes = {
+            matched: 0,
+            total:   0,
+            none:    true,
+            sample:  null,
+          };
+        }
       } else {
         const match = matching(allNodes, selector);
 
diff --git a/pkg/harvester/formatters/HarvesterCPUPinning.vue b/pkg/harvester/formatters/HarvesterCPUPinning.vue
new file mode 100644
index 00000000..32b338a8
--- /dev/null
+++ b/pkg/harvester/formatters/HarvesterCPUPinning.vue
@@ -0,0 +1,44 @@
+<script>
+
+export default {
+  name:  'HarvesterCPUPinningFormatter',
+  props: {
+    value: {
+      type:    String, // id
+      default: '',
+    },
+    rows: {
+      type:     Array,
+      required: true,
+    },
+  },
+  computed: {
+    row() {
+      return this.rows.find(r => r.id === this.value);
+    },
+    cpuManagerStatus() {
+      if (this.row?.isCPUManagerEnableInProgress) {
+        return this.t('generic.loading');
+      }
+
+      return this.row?.isCPUManagerEnabled ? this.t('generic.enabled') : this.t('generic.disabled');
+    },
+  }
+};
+</script>
+
+<template>
+  <span v-if="row?.isCPUManagerEnableInProgress" v-clean-tooltip="cpuManagerStatus">
+    <i class="icon icon-spinner icon-spin" />
+  </span>
+  <span v-else-if="row?.isCPUManagerEnabled" v-clean-tooltip="cpuManagerStatus">
+    <i class="icon icon-checkmark" />
+  </span>
+  <span
+    v-else
+    v-clean-tooltip="cpuManagerStatus"
+    class="text-muted"
+  >
+    &mdash;
+  </span>
+</template>
diff --git a/pkg/harvester/formatters/HarvesterStorageUsed.vue b/pkg/harvester/formatters/HarvesterStorageUsed.vue
index 97ec63ea..edd4d417 100644
--- a/pkg/harvester/formatters/HarvesterStorageUsed.vue
+++ b/pkg/harvester/formatters/HarvesterStorageUsed.vue
@@ -23,77 +23,76 @@ export default {
       default: ''
     },
 
-    showReserved: {
+    showAllocated: {
       type:    Boolean,
       default: false,
     },
   },
 
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    this.longhornSettings = await this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.SETTINGS });
+  },
+
   data() {
-    return {};
+    const inStore = this.$store.getters['currentProduct'].inStore;
+    const longhornSettings = this.$store.getters[`${ inStore }/all`](LONGHORN.SETTINGS) || [];
+
+    return { longhornSettings };
   },
 
   computed: {
-    usage() {
+    storageStats() {
+      const stats = {
+        used:      0,
+        scheduled: 0,
+        maximum:   0,
+        reserved:  0,
+        total:     0
+      };
       const inStore = this.$store.getters['currentProduct'].inStore;
-      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`) || {};
+      const node = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`) || {};
+      const storageOverProvisioningPercentageSetting = this.longhornSettings.find(s => s.id === 'longhorn-system/storage-over-provisioning-percentage');
+      const disks = node?.spec?.disks || {};
+      const diskStatus = node?.status?.diskStatus || {};
 
-      return longhornNode?.used || 0;
-    },
+      stats.used += node?.spec?.allowScheduling ? node.used : 0;
 
-    reserved() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`);
-      let reserved = 0;
-
-      const disks = longhornNode?.spec?.disks || {};
-
-      Object.values(disks).map((disk) => {
-        if (disk.allowScheduling) {
-          reserved += disk.storageReserved;
-        }
+      Object.keys(disks).map((key) => {
+        stats.scheduled += node?.spec?.allowScheduling ? (diskStatus[key]?.storageScheduled || 0) : 0;
+        stats.reserved += disks[key]?.storageReserved || 0;
+      });
+      Object.values(diskStatus).map((diskStat) => {
+        stats.maximum += diskStat?.storageMaximum || 0;
       });
 
-      return reserved;
-    },
+      stats.total = ((stats.maximum - stats.reserved) * Number(storageOverProvisioningPercentageSetting?.value ?? 0)) / 100;
 
-    total() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`);
-      let out = 0;
-
-      const diskStatus = longhornNode?.status?.diskStatus || {};
-
-      Object.values(diskStatus).map((disk) => {
-        if (disk?.storageMaximum) {
-          out += disk.storageMaximum;
-        }
-      });
-
-      return out;
+      return stats;
     },
 
     units() {
-      const exponent = exponentNeeded(this.total, 1024);
+      const exponent = exponentNeeded(this.storageStats.maximum, 1024);
 
       return `${ UNITS[exponent] }iB`;
     },
 
     used() {
-      let out = this.formatter(this.usage || 0);
+      let out = this.formatter(this.storageStats.used);
 
       if (!Number.parseFloat(out) > 0) {
-        out = this.formatter(this.usage || 0, { canRoundToZero: false });
+        out = this.formatter(this.storageStats.used, { canRoundToZero: false });
       }
 
       return out;
     },
 
-    formatReserved() {
-      let out = this.formatter(this.reserved || 0);
+    formatAllocated() {
+      let out = this.formatter(this.storageStats.scheduled);
 
       if (!Number.parseFloat(out) > 0) {
-        out = this.formatter(this.reserved || 0, { canRoundToZero: false });
+        out = this.formatter(this.storageStats.scheduled, { canRoundToZero: false });
       }
 
       return out;
@@ -102,15 +101,15 @@ export default {
     usedAmountTemplateValues() {
       return {
         used:  this.used,
-        total: this.formatter(this.total || 0),
+        total: this.formatter(this.storageStats.maximum),
         unit:  this.units,
       };
     },
 
-    reservedAmountTemplateValues() {
+    allocatedAmountTemplateValues() {
       return {
-        used:  this.formatReserved,
-        total: this.formatter(this.total || 0),
+        used:  this.formatAllocated,
+        total: this.formatter(this.storageStats.total),
         unit:  this.units,
       };
     },
@@ -118,7 +117,7 @@ export default {
 
   methods: {
     formatter(value, format) {
-      const minExponent = exponentNeeded(this.total, 1024);
+      const minExponent = exponentNeeded(this.storageStats.maximum, 1024);
       const formatOptions = {
         addSuffix: false,
         increment: 1024,
@@ -137,21 +136,21 @@ export default {
 <template>
   <div>
     <div
-      v-if="showReserved"
+      v-if="showAllocated"
     >
       <ConsumptionGauge
-        :capacity="total"
-        :used="reserved"
+        :capacity="storageStats.total"
+        :used="storageStats.scheduled"
         :units="units"
         :number-formatter="formatter"
         :resource-name="resourceName"
       >
         <template #title="{formattedPercentage}">
           <span>
-            {{ t('clusterIndexPage.hardwareResourceGauge.reserved') }}
+            {{ t('clusterIndexPage.hardwareResourceGauge.allocated') }}
           </span>
           <span class="precent-data">
-            {{ t('node.detail.glance.consumptionGauge.amount', reservedAmountTemplateValues) }}
+            {{ t('node.detail.glance.consumptionGauge.amount', allocatedAmountTemplateValues) }}
             <span class="ml-10 percentage">
               /&nbsp;{{ formattedPercentage }}
             </span>
@@ -160,13 +159,13 @@ export default {
       </ConsumptionGauge>
     </div>
     <ConsumptionGauge
-      :capacity="total"
-      :used="usage"
+      :capacity="storageStats.maximum"
+      :used="storageStats.used"
       :units="units"
       :number-formatter="formatter"
-      :resource-name="showReserved ? '' : resourceName"
+      :resource-name="showAllocated ? '' : resourceName"
       :class="{
-        'mt-10': showReserved,
+        'mt-10': showAllocated,
       }"
     >
       <template #title="{formattedPercentage}">
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index 284a0686..2ab4af6f 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -6,14 +6,15 @@ generic:
   labels: Labels
   inProgress: In Progress
   basic: Basic
+  loading: Loading...
 
 nav:
   group:
     networks: Networks
-    backupAndSnapshot: Backup & Snapshot
+    backupAndSnapshot: Backup and Snapshots
     Monitoring: Monitoring
     Logging: Logging
-    'Monitoring & Logging': Monitoring & Logging
+    'Monitoring and Logging': Monitoring and Logging
 
 resourceTable:
   groupBy:
@@ -28,7 +29,7 @@ members:
 
 asyncButton:
   restart:
-    action: Save & Restart
+    action: Save and Restart
     success: Restarted
     waiting: Restarting&hellip;
 
@@ -38,9 +39,13 @@ harvester:
     backup:
       success: 'Backup { backUpName } has been initiated.'
       addBackup: Add Backup
+    quota:
+      editVMQuota: Edit VM Quota
+      editQuota: Edit Quota
+      bannerMessage: Set to empty string or 0 to remove total snapshot size quota.
     restore:
       success: 'Restore { name } created successfully.'
-      title: Backup and restore
+      title: Backup and Restore
       selectBackup: Select Backup
       message:
         backup: Please select the backup that needs to be restored.
@@ -53,16 +58,16 @@ harvester:
         success: 'Template { templateName } created successfully.'
         failed: 'Failed generated template!'
     cloneVM:
-      title: Clone VM
-      name: New VM Name
+      title: Clone Virtual Machine
+      name: New Virtual Machine Name
       type: Clone volume data
       action:
         create: Create
         clone: Clone
       message:
-        tip: Please enter a VM name!
-        success: 'VM { name } cloned successfully.'
-        failed: 'Failed clone VM!'
+        tip: Please enter a virtual machine name!
+        success: 'Virtual machine { name } cloned successfully.'
+        failed: 'Failed clone virtual machine!'
     exportImage:
       title: Export to Image
       name: Name
@@ -77,21 +82,21 @@ harvester:
           label: Target Node
           placeholder: Choose Target Node
     ejectCDROM:
-      title: Eject CDROM
+      title: Eject CD-ROM
       warnTip: Eject volume will restart the virtual machine.
       operationTip: 'Select the volume you want to delete:'
       delete: Delete
     bundle:
-      title: Generate Support Bundle
+      title: Generate a Support Bundle
       url: Issue URL
       description: Description
       requiredDesc: Description is required!
-      titleDescription: Collect system-related log in Harvester, to help with troubleshooting and support.
+      titleDescription: Collect system-related logs in Harvester to help with troubleshooting and support.
     hotplug:
-      success: 'Volume { diskName } is mounted to the VM { vm }.'
+      success: 'Volume { diskName } is mounted to the virtual machine { vm }.'
       title: Add Volume
     hotunplug:
-      success: 'Volume { name } is detach successfully.'
+      success: 'Volume { name } is detached successfully.'
     snapshot:
       title: Take Snapshot
       name: Name
@@ -109,10 +114,10 @@ harvester:
     vmSnapshot:
       title: Take VM Snapshot
       name: Name
-      success: 'Take VM Snapshot { name } successfully.'
+      success: 'Take virtual machine Snapshot { name } successfully.'
     restart:
-      title: Restart VM
-      tip: Restart the Virtual Machine now for configuration changes to take effect.
+      title: Restart Virtual Machine
+      tip: Restart the virtual machine for configuration changes to take effect.
       cancel: Save
   notification:
     title:
@@ -130,11 +135,12 @@ harvester:
     deepClone: Clone
     shallowClone: Clone Template
     unpause: Unpause
-    ejectCDROM: Eject CDROM
+    ejectCDROM: Eject CD-ROM
+    editVMQuota: Edit VM Quota
     launchFormTemplate: Launch instance from template
     modifyTemplate: Modify template (Create new version)
     setDefaultVersion: Set default version
-    addTemplateVersion: Add templateVersion
+    addTemplateVersion: Add template version
     backup: Take Backup
     restore: Restore
     restoreNewVM: Restore New
@@ -144,6 +150,8 @@ harvester:
     createTemplate: Generate Template
     enableMaintenance: Enable Maintenance Mode
     disableMaintenance: Disable Maintenance Mode
+    enableCPUManager: Enable CPU Manager
+    disableCPUManager: Disable CPU Manager
     cordon: Cordon
     uncordon: Uncordon
     addHotplug: Add Volume
@@ -152,23 +160,25 @@ harvester:
     cancelExpand: Cancel Expand
     snapshot: Take Snapshot
     pvcClone: Clone Volume
-    vmSnapshot: Take VM Snapshot
+    vmSnapshot: Take Virtual Machine Snapshot
     shutdown: Shut Down
     powerOn: Power On
     reboot: Reboot
     forceStop: Force Stop
   tableHeaders:
     size: Size
+    virtualSize: Virtual Size
     progress: Progress
     message: Message
     phase: Phase
-    attachedVM: Attached VM
+    attachedVM: Attached Virtual Machine
+    cpuManager: CPU Manager
     fingerprint: Fingerprint
     value: Value
     actions: Actions
     readyToUse: Ready To Use
     backupTarget: Backup Target
-    targetVm: Target VM
+    targetVm: Target Virtual Machine
     hostIp: Host IP
     vm:
       ipAddress: IP Address
@@ -176,10 +186,11 @@ harvester:
       defaultVersion: Default Version
     network:
       type: Type
-      vlan: Vlan ID
+      vlan: VLAN ID
     snapshotTargetVolume: Original Volume
     volumeSnapshotCounts: Snapshot Counts
     networkState: Network State
+    totalSnapshotQuota: Total Snapshot Quota
     storageClass: Storage Class
     restore: Restore
   tab:
@@ -188,8 +199,10 @@ harvester:
     advanced: Advanced Options
     accessCredentials: Access Credentials
     pciDevices: PCI Devices
-    vGpuDevices: VGPU Devices
-    vmScheduling: VM Scheduling
+    vGpuDevices: vGPU Devices
+    vmScheduling: Virtual Machine Scheduling
+    quotas: Quotas
+    snapshots: Snapshots
     instanceLabel: Instance Labels
   fields:
     version: Version
@@ -200,24 +213,24 @@ harvester:
     volume: Volume
     network: Network
     model: Model
-    macAddress: Mac Address
+    macAddress: MAC address
     port: Port
     protocol: Protocol
-    remove: REMOVE
+    remove: Remove
     PhysicalNic: Physical NIC
-    cpu: Cpu
+    cpu: CPU
     memory: Memory
     virtualName: Virtual machine name
     promiscuous: Promiscuous
-    ipv4Address: IPv4 Address
-    filterLabels: Filter Labels
-    storageClass: Storage Class
-    dockerImage: Docker Image 
+    ipv4Address: IPv4 address
+    filterLabels: Filter labels
+    storageClass: Storage class
+    dockerImage: Docker image
   pci:
     available: Available Devices
     compatibleNodes: Compatible Nodes
     impossibleSelection: 'There are no hosts with all of the selected devices.'
-    howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this VM.'
+    howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine.'
     deviceInTheSameHost: 'You can only select devices on the same host.'
     oldFormatDevices:
       help: |-
@@ -228,11 +241,11 @@ harvester:
           {oldFormatDevicesHTML}
         </ul>
         <p>
-          Please use the following instructions to update the VM:
+          Please use the following instructions to update the virtual machine:
         </p>
         <ol>
-          <li>Stop the VM, edit the VM YAML, and remove the <Code>hostDevices</Code> section, and save VM the changes to the YAML file.</li>
-          <li>Edit the VM, and add the already enabled PCIDevice from the list of available PCIDevices, and save and start VM.</li>
+          <li>Stop the virtual machine, edit the virtual machine YAML, and remove the <Code>hostDevices</Code> section, and save virtual machine the changes to the YAML file.</li>
+          <li>Edit the virtual machine, and add the already enabled PCI Device from the list of available PCIDevices, and save and start VM.</li>
         </ol>
     showCompatibility: Show device compatibility matrix
     hideCompatibility: Hide device compatibility matrix
@@ -241,12 +254,12 @@ harvester:
     cantUnclaim: You cannot disable passthrough on a device claimed by another user.
     enableGroup: Enable Group
     disableGroup: Disable Group
-    labelRequired: "This rule should not be manually altered: it ensures that the PCI devices selected for this virtual machine are available on the VM's host."
+    labelRequired: "This rule should not be manually altered: it ensures that the PCI devices selected for this virtual machine are available on the virtual machine's host."
     goSetting:
-      prefix: The pcidevices-controller addon is not enabled, click
+      prefix: The pcidevices-controller add-on is not enabled, click
       middle: here
       suffix: to enable it to manage your PCI devices.
-    noPCIPermission: Please contact system admin to enable the PCI devices first.
+    noPCIPermission: Please contact your system administrator to enable the PCI devices first.
     enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
     matrixHostName: Host Name
     matrixDeviceClaimName: Device Claim Name
@@ -299,20 +312,21 @@ harvester:
       events:
         label: Events
       vmMetrics:
-        label: VM Metrics
+        label: Virtual Machine Metrics
 
     version: Version
   host:
     console: Console
     label: Hosts
     inconsistentIP: "Host IP is inconsistent, current IP: { currentIP }, initial IP: { initIP }"
+    noConsoleUrl: 'Console URL not specified'
     promote:
       none: ' '
-      running: promoting
-      failed: promote failed
-      unknown: promote halted
-      promoteRestart: restarting
-      promoteSucceed: promote completed
+      running: Promoting
+      failed: Promote failed
+      unknown: Promote halted
+      promoteRestart: Restarting
+      promoteSucceed: Promote completed
     tabs:
       network: Network
       overview: Overview
@@ -322,10 +336,10 @@ harvester:
       storage: Storage
       labels: Labels
       ksmtuned: Ksmtuned
-      seeder: Out-of-Band Access
+      seeder: Out-of-band Access
     detail:
       kvm:
-        disableMessage: Hardware-based virtualization is disabled or not supported. Hardware-based virtualization must be enabled before creating any Virtual Machines.
+        disableMessage: Hardware-based virtualization is disabled or not supported. Hardware-based virtualization must be enabled before creating any virtual machines.
       title:
         network: Network Configuration
       hostIP: Host IP
@@ -349,9 +363,11 @@ harvester:
       serialNumber: Serial Number
       model: Model
       etcd: Witness Node
+      cpuManager: CPU Manager
     enableMaintenance:
       title: Enable Maintenance Mode
       protip: The operation will migrate all virtual machines on this node to other nodes.
+      shutDownVMs: Check <b>Force</b> option to shutdown virtual machines which cannot be migrated in live mode.
       force: Force
     cordon:
       title: Cordon
@@ -360,17 +376,17 @@ harvester:
       run: Run Strategy
       configure: Configure
       mode: Mode
-      modeLink: Mode <a href="https://docs.harvesterhci.io/v1.1/host/#ksmtuned-mode" target="_blank"><i class="icon icon-info" /></a>
+      modeLink: Mode <a href="{url}" target="_blank"><i class="icon icon-info" /></a>
       thresCoef: Threshold Coefficient
-      enableMergeNodes: Enable Merge Across Nodes
+      enableMergeNodes: Enable merging across nodes
       enable: Enable
       disable: Disable
       ksmStatus: KSM Status
       modeOption:
         standard: Standard
-        high: High-Perfomanace
+        high: High-performance
         customized: Customized
-      parameters: 
+      parameters:
         title: Ksmtuned Parameters
         boost: Boost
         decay: Decay
@@ -400,11 +416,12 @@ harvester:
         label: Storage Reserved
       allowScheduling:
         label: Scheduling
+        tooltip: Disk {name} ({path}) scheduling is disabled
       evictionRequested:
         label: Eviction Requested
       forceFormatted:
         label: Force Formatted
-        toolTip: Force formatted will cleanup disk data, make sure you backup all available data to prevent data loss.
+        toolTip: Force formatted will clean up disk data, make sure you backup all available data to prevent data loss.
         yes: Yes (Ext4 File System)
       description:
         label: Description
@@ -421,7 +438,7 @@ harvester:
         addLabel: Add Disk Tag
       conditions: Conditions
       storageAvailable:
-        label: Storage Available 
+        label: Storage Available
       storageScheduled:
         label: Storage Scheduled
       storageMaximum:
@@ -437,10 +454,8 @@ harvester:
       tips: You can configure multiple IPv4 addresses or host addresses.
       placeholder: e.g. IPv4
       ntpSyncStatus:
-        isDisabled: 'The NTP is disabled. Please check the NTP service is active.'
-        isUnsynced: 'The NTP is not synced with the NTP server <code>{current}</code>'
-      ntpConfigSyncStatus:
-        isUnsynced: 'The NTP config is not synced. Current: <code>{current}</code>, Wanted: <code>{wanted}</code> '
+        isDisabled: 'NTP is disabled. Please check the NTP service is active.'
+        isUnsynced: 'NTP is not synchronized with the NTP server {current}.'
 
   virtualMachine:
     label: Virtual Machines
@@ -453,7 +468,7 @@ harvester:
         nameLabel: Name
         host:
           label: Hostname
-          placeholder: default to the virtual machine name.
+          placeholder: Default to the virtual machine name.
       multiple:
         label: Multiple Instance
         nameNsDescription: Name prefix for each instance
@@ -462,20 +477,20 @@ harvester:
         nameLabel: Name Prefix
         host:
           label: Host Prefix Name
-          placeholder: default to the virtual machine name.
+          placeholder: Default to the virtual machine name.
     useTemplate:
-      label: "Use VM Template:"
+      label: "Use the virtual machine template:"
       template:
         label: Template
       version:
         label: Version
     console:
-      novnc: Open in Web VNC
+      novnc: Open in WebVNC
       serial: Open in Serial Console
     promptRemove:
       title: 'Select the volume you want to delete:'
       deleteAll: Delete All
-      tips: "Warn: The snapshots of vm will be deleted with VM and the snapshots of volume will be deleted with volume."
+      tips: "Warn: The snapshots of the virtual machine will be deleted with virtual machine and the snapshots of volume will be deleted with volume."
     unplug:
       title: 'Are you sure that you want to detach volume {name} ?'
       actionLabel: Detach
@@ -487,6 +502,17 @@ harvester:
         other {Start}
       } the virtual machine now to take effect of the configuration changes.
     runStrategy: Run Strategy
+    maintenanceStrategy:
+      label: Maintenance Strategy
+      options:
+        Migrate: Migrate
+        ShutdownAndRestartAfterEnable: Shutdown and Restart After Enable
+        ShutdownAndRestartAfterDisable: Shutdown and Restart After Disable
+        Shutdown: Shutdown
+    cpuPinning:
+      label: Enable CPU Pinning
+      tooltip: Enable CPU Pinning brings better performance and reduce latency for the virtual machine 
+      restartVMMessage: Changing the CPU Pinning setting requires a virtual machine reboot for the change to take effect
     restartNow: |-
       {restart, select,
         true {Restart}
@@ -497,6 +523,10 @@ harvester:
     enableUsb: Enable USB Tablet
     advancedOptions:
       tpm: Enable TPM
+      cpuManager:
+        prefix: You must enable CPU Manager for at least one node in
+        middle: 'host page' 
+        suffix: to enable CPU Pinning for VM
     usbTip: Provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC.
     sshTitle: Add Public SSH Key
     imageTip: An external URL to the .iso, .img, .qcow2 or .raw that the virtual machine should be created from.
@@ -504,7 +534,7 @@ harvester:
     secureBoot: Secure Boot
     volume:
       dragTip: Drag and drop volumes, or use the volume's arrows, to change the boot order.
-      volumeTip: The VM only contains a cd-rom volume. You may want to add additional disk volumes.
+      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."
       volumeUpdate: 'Set volume { name } successfully'
       type: Type
@@ -516,7 +546,7 @@ harvester:
       dockerImage: Docker Image
       addVolume: Add Volume
       addExistingVolume: Add Existing Volume
-      addVmImage: Add VM Image
+      addVmImage: Add a Virtual Machine Image
       addContainer: Add Container
       setFirst: Set as root volume
       saveVolume: Update Volume
@@ -546,23 +576,23 @@ harvester:
       network:
         label: Network Data Template
         title: "Network Data:"
-        tip: "The network-data configuration allows you to customize the instance’s networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, vlans) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
+        tip: "The network-data configuration allows you to customize the instance’s networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, VLANs) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
     scheduling:
       affinity:
-        anyNode: 'Run VM on any available node'
-        schedulingRules: 'Run VM on node(s) matching scheduling rules'
-        specificNode: Run VM on specific node - (Live migration is not supported)
+        anyNode: 'Run virtual machine on any available node'
+        schedulingRules: 'Run virtual machine on node(s) matching scheduling rules'
+        specificNode: Run virtual machine on specific node - (Live migration is not supported)
       networkNotSupport: Network not support schedule
     accessCredentials:
       resetPwd:
         label: Add Basic Auth
       injectSSH:
-        label: Add SSHKey
+        label: Add SSH Key
         users: Select Users
         addUser: Add User
-      tips: qemu-guest-agent must be installed to enable Access Credentials, the VM should be restarted after credentials added. Need to enter the VM to edit password or remove SSH-Key after deleting the credentials.
+      tips: qemu-guest-agent must be installed to enable the accessing of credentials. The virtual machine needs to be restarted after credentials added. You need to be in the virtual machine to edit your password or remove an SSH-Key after deleting the credentials.
       userTips: The user to be added must already exist; otherwise, the credentials will not take effect.
-      duplicatedUser: User already exist.
+      duplicatedUser: User already exists.
       invalidUser: Invalid Username.
     input:
       name: Name
@@ -594,7 +624,7 @@ harvester:
         monitor: Monitor Data
         keypairs: SSH Keys
         cloudConfig: Cloud Config
-        metrics: VM Metrics
+        metrics: Virtual Machine Metrics
       details:
         title:
           vmDetails: Virtual Machine Details
@@ -602,6 +632,7 @@ harvester:
           services: Services
           users: Logged in users
         name: Name
+        totalSnapshotQuota: Total Snapshot Quota
         namespace: Namespace
         created: Created
         hostname: Hostname
@@ -623,7 +654,7 @@ harvester:
         flavor: Flavor
         tolerations: Tolerations
         dedicatedResources: Dedicated Resources
-        down: VM not running
+        down: Virtual machine not running
         affinityRules: Affinity Rules
         sourceNode: Source Node
         targetNode: Target Node
@@ -636,7 +667,7 @@ harvester:
         from: Generated from
         down: No events in the past hour
       console:
-        down: This Virtual Machine is down. Please start it to access its console.
+        down: This virtual machine is down. Please start it to access its console.
         shortcutKeys: Shortcut Keys
         customShortcutKeys: Custom Shortcut Keys
         management: Management Shortcut Keys
@@ -644,13 +675,13 @@ harvester:
           start: Record
           recording: Recording
           stop: Stop Recording
-          tips: Pressing the record button will capture your keyboard inputs.
+          tips: Press the record button to capture your keyboard inputs.
           send: Send
           preferredKeys: Preferred Custom Shortcut Keys
     terminationGracePeriodSeconds:
       label: Termination Grace Period
     affinity:
-      thisPodNamespace: This VM's namespace
+      thisPodNamespace: This virtual machine's namespace
       matchExpressions:
         inNamespaces: "Workloads in these namespaces"
       namespaces:
@@ -668,7 +699,7 @@ harvester:
     kind: Kind
     sourceOptions:
       new: New
-      vmImage: VM Image
+      vmImage: Virtual Machine Image
     image: Image
     frontend: Frontend
     blockdev: Block Device
@@ -680,7 +711,7 @@ harvester:
     lastBackupAt: Last Backup At
     replicasNumber: Replicas Number
     promptRemove:
-      tips: "Warn: The snapshots of volume will be deleted with volume."
+      tips: "Warn: The volume's snapshots will be deleted with this volume."
     externalLink:
       tips: Check volume details
     rebuildingMessage: 'Rebuilding: {percentage}%'
@@ -691,7 +722,8 @@ harvester:
       basics: Basics
     url: URL
     size: Size
-    urlTip: 'supports the <code>raw</code> and <code>qcow2</code> image formats which are supported by <a href="https://www.qemu.org/docs/master/system/images.html#disk-image-file-formats" target="_blank">qemu</a>. Bootable ISO images can also be used and are treated like <code>raw</code> images.'
+    virtualSize: Virtual Size
+    urlTip: 'Supports the <code>raw</code> and <code>qcow2</code> image formats which are supported by <a href="https://www.qemu.org/docs/master/system/images.html#disk-image-file-formats" target="_blank">qemu</a>. Bootable ISO images can also be used and are treated like <code>raw</code> images.'
     fileName: File Name
     uploadFile: Upload File
     source: Source
@@ -716,10 +748,10 @@ harvester:
     tips:
       notExistImage:
         title: Image {name} does not exist!
-        message: Please select a new Image.
+        message: Please select a new image.
       notExistNode:
         title: Node {name} does not exist!
-        message: Please select a new Node.
+        message: Please select a new node.
 
   upgradePage:
     upgradeApp: Upgrade Software
@@ -736,8 +768,8 @@ harvester:
     selectExisting: Select Existing Image
     createRepository: Creating Upgrade Repository
     succeeded: Succeeded
-    releaseTip: Please read the upgrade documentation carefully. You can view details on the <a href="{url}" target="_blank">Harvester Release Note</a>.
-    checkReady: I have read and understood the upgrade content related to this Harvester version.
+    releaseTip: Please read the upgrade documentation carefully. You can view details on the <a href="{url}" target="_blank">Harvester Release Notes</a>.
+    checkReady: I have read and understood the upgrade instructions related to this Harvester version.
     pending: Pending
     repoInfo:
       upgradeStatus: Upgrade Status
@@ -747,29 +779,29 @@ harvester:
       harvesterChart: Harvester Chart
       success: Success
       fail:  Fail
-      ongoing: on-going
+      ongoing: On-going
       downloadLog: Download Log
       logStatus: Log Download Status
     dismissMessage: Dismiss it
     upgradeInfo:
       warning: WARNING
-      doc: Before you upgrade to the newer Harvester version, you must perform the required <a href="https://docs.harvesterhci.io/v1.0/upgrade/automatic/" target="_blank"> pre-upgrade checks </a>for your cluster. Complete only those tasks that apply to your environment.
-      tip: Failure to perform these checks may result in a failed upgrade or hitting known issues that require a manual workaround fix.
-      moreNotes: For more details about the release notes, please visit - 
+      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.
+      tip: Unmet system requirements and incorrectly performed procedures may cause complete upgrade failure and other issues that require manual workarounds.
+      moreNotes: For more details about the release notes, please visit -
 
   backup:
-    label: VM Backups
+    label: Virtual Machine Backups
     createText: Restore Backup
     title: Restore Virtual Machine
     backupTargetTip: The endpoint used to access the backupstore. NFS and S3 are supported.
     message:
       noSetting:
-        prefix: You must configure the backup target in
+        prefix: You must configure the backup target
         middle: 'setting'
         suffix: before creating a new backup.
       errorTip:
-        prefix: Backup Target value in
-        middle: Setting
+        prefix: Backup target value in
+        middle: setting
         suffix: "is invalid, error: "
       viewSetting:
         prefix: Click
@@ -788,7 +820,7 @@ harvester:
       virtualMachineName: Virtual Machine Name
       keepMacAddress: Keep MAC Address
     matchTarget: The current backup target does not match the existing one.
-    progress: 
+    progress:
       details: Volume details
       tooltip:
         starting: Backup initiating
@@ -804,21 +836,21 @@ harvester:
         complete: Restore completed
 
   network:
-    label: VM Networks
+    label: Virtual Machine Networks
     tabs:
       basics: Basics
       layer3Network: Route
     clusterNetwork:
       label: Cluster Network
-      create: Create a New Cluster Network
+      create: Create a new cluster network
       toolTip: Define your custom cluster scope network name
-      createPlaceholder: Input a new Cluster Network name
-      selectOrCreatePlaceholder: Select or Create a new Cluster Network
-      selectPlaceholder: Select a Cluster Network
+      createPlaceholder: Input a new cluster network name
+      selectOrCreatePlaceholder: Select or create a new cluster network
+      selectPlaceholder: Select a cluster network
     layer3Network:
       mode:
         label: Mode
-        auto: Auto(DHCP)
+        auto: Auto (DHCP)
         manual: Manual
       serverIPAddr:
         label: DHCP Server IP
@@ -842,9 +874,9 @@ harvester:
     validation:
       physicalNIC: DefaultPhysicalNIC
     placeholder:
-      accessKeyId: specify your access key id
-      secretAccessKey: specify your secret access key
-      cert: upload a self-signed SSL certificate
+      accessKeyId: Specify your access key ID
+      secretAccessKey: Specify your secret access key
+      cert: Upload a self-signed SSL certificate
     vlanChangeTip: The newly modified default network interface only applies to newly added nodes, not existing ones.
     defaultPhysicalNIC: Default Network Interface
     percentTip: The value in parentheses represents the distribution percentage of the network interface on all hosts. If an interface less than 100% is selected, the user needs to manually specify the network interface on the host where the vlan network configuration fails.
@@ -869,10 +901,11 @@ harvester:
         placeholder: e.g. 172.16.0.1/32
         invalid: '"Exclude list" is invalid.'
         addIp: Add Exclude IP
-      warning: 'WARNING: <br/> Any change to storage-network requires shutting down all VMs before applying this setting. <br/> Users have to ensure the Cluster Network is configured and VLAN Config will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
-      tip: 'IP Range should be in IPV4 format. <code>Number of IPs Required = Number of Nodes * 4 + Number of Disks * 2 + Number of Images to Download/Upload </code>. See <a href="https://docs.harvesterhci.io/v1.2/advanced/storagenetwork#configuration-example" target="_blank">doc</a> for more details.'
+      warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
+      tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 4 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
     vmForceDeletionPolicy:
       period: Period
+    ratio : Ratio
     autoRotateRKE2Certs:
       expiringInHours: Expiring in
     httpProxy:
@@ -907,7 +940,7 @@ harvester:
 
     upgrade:
       selectExitImage: Please select the OS image to upgrade.
-      imageUrl: Please input a valid image url.
+      imageUrl: Please input a valid image URL.
       chooseFile: Please select to upload an image.
       checksum: Checksum
     harvesterMonitoring:
@@ -923,16 +956,16 @@ harvester:
         retention: How long to retain metrics
         retentionSize: Maximum size of metrics
     clusterRegistrationUrl:
-      message: To completely unset the imported Harvester cluster, please also remove it on the Rancher dashboard UI via the <code> Virtualization Management </code> page.
+      message: To completely unset the imported Harvester cluster, please also remove it on the Rancher Dashboard UI via the <code> Virtualization Management </code> page.
     ntpServers:
       isNotIPV4: The address you entered is not IPv4 or host. Please enter a valid IPv4 address or a host address.
       isDuplicate: There are duplicate NTP server configurations.
   cloudTemplate:
-    label: Cloud Config Templates
+    label: Cloud Configuration Templates
     templateType: Template Type
     userData: User Data
     networkData: Network Data
- 
+
   support:
     title: Harvester Support
     kubeconfig:
@@ -941,7 +974,7 @@ harvester:
     internal:
       rancher:
         title: Access Embedded Rancher UI
-        titleDescription: We only support to use the embedded Rancher dashboard for debugging and validation purpose. For Rancher's multi-cluster and multi-tenant integration, please refer to the docs <a target="_blank" href="https://docs.harvesterhci.io/v1.2/rancher/index" rel="noopener noreferrer nofollow">here</a>.
+        titleDescription: You can only use the embedded Rancher UI for debugging and validation purposes. For more information about how Harvester integrates with Rancher, see the <a target="_blank" href="{url}" rel="noopener noreferrer nofollow">documentation</a>.
       longhorn:
         title: Access Embedded Longhorn UI
         titleDescription: We only support to use the embedded Longhorn UI for debugging and validation purpose.
@@ -961,7 +994,7 @@ harvester:
     cidr:
       label: CIDR/IP Range
       invalid: '"CIDR/IP Range" is invalid.'
-      toolTip: "We can apply multiple pools or ranges by seperating them with commas. i.e. 192.168.0.200/30,192.168.0.200/29 or 192.168.0.10-192.168.0.11"
+      toolTip: "We can apply multiple pools or ranges by separating them with commas. For example: 192.168.0.200/30,192.168.0.200/29 or 192.168.0.10-192.168.0.11"
     add:
       label: Add IP Pools
 
@@ -970,22 +1003,22 @@ harvester:
       label: Protocols
     ciphers:
       label: Ciphers
-  
+
   monitoring:
     configuration:
       label: Configuration
     alertmanagerConfig:
       label: Alertmanager Configs
       diabledMonitoringTips:
-        prefix: 'You must enable'
-        middle: 'Monitoring'
-        suffix: 'addon at first.'
+        prefix: 'Enable the'
+        middle: 'monitoring'
+        suffix: 'add-on first.'
       diabledAlertingTips:
-        prefix: 'You must enable'
+        prefix: 'Enable'
         middle: 'Alertmanager'
-        suffix: 'for configs to take effect.'
+        suffix: 'for configuration to take effect.'
       disabledAddon:
-        prefix: 'Monitoring Addon is disabled now, click'
+        prefix: 'The monitoring add-on is disabled, click'
         middle: 'here'
         suffix: 'to enable it.'
 
@@ -1003,18 +1036,19 @@ harvester:
     output:
       label: Output
     diabledTips:
-        prefix: 'You must enable'
-        middle: 'Logging'
-        suffix: 'for configs to take effect.'
+        prefix: 'Enable'
+        middle: 'logging'
+        suffix: 'for configuration to take effect.'
 
   snapshot:
+    totalSnapshotSize: Total Snapshot Size
     label: Volume Snapshots
     targetVolume: Original Volume
     size: Size
     image: Image
 
   vmSnapshot:
-    label: VM Snapshots
+    label: Virtual Machine Snapshots
     createText: Restore Snapshot
     snapshot: Snapshot
 
@@ -1036,7 +1070,7 @@ harvester:
     title: Storage Classes
     customize:
       volumeBindingMode:
-        later: Bind and provision a persistent volume once a VM using the PersistentVolumeClaim is created
+        later: Bind and provision a persistent volume once a virtual machine using the PersistentVolumeClaim is created
     parameters:
       numberOfReplicas:
         label: Number Of Replicas
@@ -1052,11 +1086,11 @@ harvester:
         label: Migratable
     allowedTopologies:
       title: Allowed Topologies
-      tooltip: Allowed Topologies helps scheduling VMs on hosts which match all of below expressions.
+      tooltip: Allowed Topologies helps scheduling virtual machines on hosts which match all of below expressions.
 
   vlanConfig:
-    title: Network Configs
-    createNetworkConfig: Create Network Config
+    title: Network Configuration
+    createNetworkConfig: Create Network Configuration
     action:
       migrate: Migrate
     titles:
@@ -1078,7 +1112,7 @@ harvester:
         validate:
           available: NIC "{nic}" is not available on the selected nodes
       linkAttributes:
-        mtu: 
+        mtu:
           label: MTU
       bondOptions:
         mode:
@@ -1097,39 +1131,39 @@ harvester:
 
   vlanStatus:
     vlanConfig:
-      label: Network Config
-  
+      label: Network Configuration
+
   clusterNetwork:
-    title: Cluster Networks/Configs
+    title: Cluster Network Configuration
     create:
       button:
-        label: Create Cluster Network
-    clusterNetwork: There are no network configs defined.
+        label: Create a Cluster Network
+    clusterNetwork: There are no network configurations defined.
     mgmt: mgmt is a built-in cluster management network and does not support any additional network configurations.
     notExist: 'Cluster Network "{ clusterNetwork }" does not exist'
     notReady: 'Cluster Network "{ clusterNetwork }" is not ready'
-  
+
   addons:
     descriptions:
-      'harvester-system/vm-import-controller': vm-import-controller is an addon to help migrate VM workloads from other source clusters to an existing Harvester cluster.
-      'harvester-system/pcidevices-controller': pcidevices-controller is an addon to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester VM and guest Clusters.
-      'cattle-logging-system/rancher-logging': rancher-logging is an addon to collect versatile logs, events and audits from the Harvester cluster and route them to many kinds of servers based on flows.
-      'harvester-system/rancher-vcluster': rancher-vcluster deploys a vcluster with rancher installed.
-      'cattle-monitoring-system/rancher-monitoring': rancher-monitoring is an addon to collect Harvester cluster and VM metrics, view them on the embedded dashboard, and send alert(s) to remote servers.
-      'vm-import-controller': vm-import-controller is an addon to help migrate VM workloads from other source clusters to an existing Harvester cluster.
-      'pcidevices-controller': pcidevices-controller is an addon to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester VM and guest Clusters.
-      'nvidia-driver-toolkit': 'nvidia-driver-toolkit is an addon to enable vGPU devices and assign them to Harvester VMs.'
-      'rancher-logging': rancher-logging is an addon to collect versatile logs, events and audits from the Harvester cluster and route them to many kinds of servers based on flows.
-      'rancher-monitoring': rancher-monitoring is an addon to collect Harvester cluster and VM metrics, view them on the embedded dashboard, and send alert(s) to remote servers.
-      'rancher-vcluster': rancher-vcluster deploys a vcluster with rancher installed.
-      'harvester-seeder': harvester-seeder is an addon that uses ipmi and redfish to discover hardware information and perform out-of-band operations.
-      'harvester-system/harvester-seeder': harvester-seeder is an addon that uses ipmi and redfish to discover hardware information and perform out-of-band operations.
+      'harvester-system/vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing Harvester cluster.
+      'harvester-system/pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester virtual machine and guest clusters.
+      'cattle-logging-system/rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
+      'harvester-system/rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
+      'cattle-monitoring-system/rancher-monitoring': rancher-monitoring is an add-on that collects Harvester cluster and virtual machine metrics and allows you to view the metrics on an embedded dashboard and send alert(s) to remote servers.
+      'vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing Harvester cluster.
+      'pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester virtual machines and guest clusters.
+      'nvidia-driver-toolkit': 'nvidia-driver-toolkit is an add-on to enable vGPU devices and assign them to Harvester virtual machines.'
+      'rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
+      'rancher-monitoring': rancher-monitoring is an add-on to collect Harvester cluster and virtual machine metrics, view them on the embedded dashboard, and send alert(s) to remote servers.
+      'rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
+      'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
+      'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
     vmImport:
       titles:
         basic: Basic
         pvc: Volume
     rancherVcluster:
-      accessRancher: Access Rancher Dashboard
+      accessRancher: Access the Rancher Dashboard
       hostname: Hostname
       rancherVersion: Rancher Version
       password: Bootstrap Password
@@ -1190,12 +1224,12 @@ harvester:
       label: Backend Servers
     healthCheck:
       warning:
-        portInUse: Warning, Backend Port {port} is in use in Health Check settings; in case of updating the port, update the Health Check settings accordingly.
+        portInUse: Warning, the Backend Port {port} is in use in Health Check settings. If you need to update the port, update the Health Check settings accordingly.
 
   ipPool:
     label: IP Pools
     network:
-      label: VM Network
+      label: Virtual Machine Network
     tabs:
       range: Range
       scope: Scope
@@ -1225,13 +1259,13 @@ harvester:
       addLabel: Add CIDR
     range:
       addLabel: Add Range
-      
+
   service:
     healthCheckPort:
       label: Health Check Port
     healthCheckSuccessThreshold:
       label: Health Check Success Threshold
-      description: If the number of times the prober continuously detects an address successfully reaches the success threshold, then the backend server can start to forward traffic.
+      description: If the number of times the probe continuously detects an address successfully reaches the success threshold, then the backend server can start to forward traffic.
     healthCheckFailureThreshold:
       label: Health Check Failure Threshold
       description: The backend server will stop forwarding traffic if the number of health check failures reaches the failure threshold.
@@ -1256,22 +1290,22 @@ harvester:
   sriovgpu:
     label: SR-IOV GPU Devices
     nodeName: Node
-    numVFs: Number Of Virtual Functions
+    numVFs: Number of Virtual Functions
     vfAddresses: Virtual Functions Addresses
     vGpuDevices: vGPU Devices
     showMore: Show More
     parentSriov: Filter By Parent SR-IOV GPU
-    noPermission: Please contact system admin to add Harvester addons first
+    noPermission: Please contact your system admiistrator to add Harvester add-ons first.
     goSetting:
-      prefix: The nvidia-driver-toolkit addon is not enabled, click
+      prefix: The nvidia-driver-toolkit add-on is not enabled, click
       middle: here
       suffix: to enable it to manage your SR-IOV GPU devices.
 
   vgpu:
     label: vGPU Devices
-    noPermission: Please contact system admin to add Harvester addons first
+    noPermission: Please contact system administrator to add Harvester add-ons first.
     goSetting:
-      prefix: The nvidia-driver-toolkit addon is not enabled, click
+      prefix: The nvidia-driver-toolkit add-on is not enabled, click
       middle: here
       suffix: to enable it to manage your vGPU devices.
     enableGroup: Enable Group
@@ -1282,22 +1316,22 @@ harvester:
     available: Available Devices
     compatibleNodes: Compatible Nodes
     impossibleSelection: 'There are no hosts with all of the selected devices.'
-    howToUseDevice: 'Use the table below to enable vGPU devices you want to use in this VM.'
+    howToUseDevice: 'Use the table below to enable vGPU devices you want to use in this virtual machine.'
     deviceInTheSameHost: 'You can only select devices on the same host.'
 
   harvesterVlanConfigMigrateDialog:
-    targetClusterNetwork: 
+    targetClusterNetwork:
       label: Target Cluster Network
       placeholder: Choose Target Cluster Network
 
   seeder:
     banner:
       enable:
-        prefix: Addon "harvester-seeder" is disabled now, 
-        middle: click here 
+        prefix: The "harvester-seeder" add-on is disabled.
+        middle: Click here
         suffix: to enable it.
-      noAccess: Please contact system admin to enable the Out-of-Band Access first.
-      noAddon: Addon "harvester-seeder" is not exist, please check if it is installed.
+      noAccess: Please contact your system administrator to enable the Out-of-Band Access first.
+      noAddon: The "harvester-seeder" add-on does not exist, please check if it is installed.
       noInventory: Waiting for "inventories.metal.harvesterhci.io" to be ready.
     inventory:
       host:
@@ -1318,10 +1352,10 @@ harvester:
         label: Polling Interval
 
   affinity:
-    thisPodNamespace: This VM's namespace
+    thisPodNamespace: This virtual machine's namespace
     matchExpressions:
       inNamespaces: "Workloads in these namespaces"
-    vmAffinityTitle: VM Scheduling
+    vmAffinityTitle: Virtual Machine Scheduling
     namespaces:
       placeholder: e.g. default,system,base
       label: Namespaces
@@ -1330,35 +1364,40 @@ harvester:
       placeholder: 'topology.kubernetes.io/zone'
 
 advancedSettings:
+  technicalPreview: 'Technical Previews allow users to test and evaluate early-access functionality prior to official supported releases'
   descriptions:
     'harv-vlan': Default Network Interface name of the VLAN network.
-    'harv-backup-target': Custom backup target to store VM backups.
-    'branding': Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos and color scheme.
-    'harv-csi-driver-config': Configure additional information for csi drivers.
+    'harv-backup-target': Custom backup target to store virtual machine backups.
+    'branding': Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos, and color scheme.
+    'harv-csi-driver-config': Configure additional information for CSI drivers.
     'harv-containerd-registry': Containerd Registry Configuration to connect private registries.
-    'harv-log-level': Configure Harvester server log level. Default to info.
+    'harv-log-level': Configure Harvester server log level. Defaults to Info.
     'harv-server-version': Harvester server version.
-    'harv-upgrade-checker-enabled': Specify whether to enable Harvester upgrade check or not. Default is true.
-    'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code>  is equal to true.
-    'harv-ui-source': Config how to load the UI source.
+    'harv-upgrade-checker-enabled': Specifies whether to enable Harvester upgrade check or not. Default is True.
+    'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True.
+    'harv-ui-source': Configure how to load the UI source.
     'harv-ui-index': 'HTML index location for the UI.'
-    'harv-ui-plugin-index': 'JS index location for the harvester plugin UI.'
-    'harv-cluster-registration-url': Registration URL for mutil-cluster management.
+    'harv-ui-plugin-index': 'JS index location for the Harvester plugin UI.'
+    'harv-cluster-registration-url': Registration URL for multi-cluster management.
     'harv-http-proxy': 'HTTP proxy for Harvester to access external services.'
     'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
     'harv-overcommit-config': 'Resource overcommit configuration.'
-    'harv-support-bundle-timeout': 'Support Bundle timeout config in minutes, use 0 to disable the timeout.'
-    'harv-support-bundle-expiration': 'Support Bundle expiration config in minutes.'
-    'harv-vm-force-reset-policy': Config the force-reset action when a VM is stuck on a node that is down.
+    'harv-support-bundle-timeout': 'Support bundle timeout configuration in minutes, use 0 to disable the timeout.'
+    'harv-support-bundle-expiration': 'Support bundle expiration configuration in minutes.'
+    'harv-support-bundle-node-collection-timeout': 'Support bundle node collection timeout configuration in minutes.'
+    'harv-vm-force-reset-policy': Configuration for the force-reset action when a virtual machine is stuck on a node that is down.
     'harv-ssl-parameters': Custom SSL Parameters for TLS validation.
     'harv-storage-network': 'Longhorn storage-network setting.'
     'harv-support-bundle-namespaces': Specify resources in other namespaces to be collected by the support package.
-    'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that Harvester will automatically add as VM storage.
+    'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that Harvester will automatically add as virtual machine storage.
     'harv-support-bundle-image': Support bundle image configuration. Find different versions in <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a>.
     'harv-release-download-url': This setting allows you to configure the <code>upgrade release download</code> URL address. Harvester will get the ISO URL and checksum value from the (<code>$URL</code>/<code>$VERSION</code>/version.yaml) file hosted by the configured URL.
-    'harv-default-vm-termination-grace-period-seconds': Config the VM termination grace period for VM stop.
+    'harv-default-vm-termination-grace-period-seconds': Configure the virtual machine termination grace period for virtual machine stop.
     'harv-ntp-servers': Configure NTP server. You can configure multiple IPv4 addresses or host addresses.
     'harv-auto-rotate-rke2-certs': The certificate rotation mechanism relies on Rancher. Harvester will automatically update certificates generation to trigger rotation.
+    'harv-kubeconfig-default-token-ttl-minutes': 'TTL (in minutes) applied on Harvester administration kubeconfig files. Default is 0, which means to never expire.'
+    'harv-longhorn-v2-data-engine-enabled': 'Enable the Longhorn V2 data engine. Default is false. <ul><li>Changing this setting will restart RKE2 on all nodes. This will not affect running VM workloads.</li><li>If you see "not enough hugepages-2Mi capacity" errors when enabling this setting, wait a minute for the error to clear. If the error remains, reboot the affected node.</li></ul>'
+    'harv-additional-guest-memory-overhead-ratio': 'The ratio for kubevirt to adjust the VM overhead memory. The value could be zero, empty value or floating number between 1.0 and 10.0, default to 1.5.'
 
 typeLabel:
   kubevirt.io.virtualmachine: |-
@@ -1383,8 +1422,8 @@ typeLabel:
     }
   harvesterhci.io.networkattachmentdefinition: |-
     {count, plural,
-      one { VM Network }
-      other { VM Networks }
+      one { Virtual Machines Network }
+      other { Virtual Machines Networks }
     }
   harvesterhci.io.volume: |-
     {count, plural,
@@ -1408,13 +1447,13 @@ typeLabel:
     }
   harvesterhci.io.virtualmachinebackup: |-
     {count, plural,
-      one { VM Backup }
-      other { VM Backups }
+      one { Virtual Machines Backup }
+      other { Virtual Machines Backups }
     }
   harvesterhci.io.cloudtemplate: |-
     {count, plural,
-      one { Cloud Config Template }
-      other { Cloud Config Templates }
+      one { Cloud Configuration Template }
+      other { Cloud Configuration Templates }
     }
   harvesterhci.io.volumesnapshot: |-
     {count, plural,
@@ -1423,18 +1462,18 @@ typeLabel:
     }
   harvesterhci.io.vmsnapshot: |-
     {count, plural,
-      one { VM Snapshot }
-      other { VM Snapshots }
+      one { Virtual Machines Snapshot }
+      other { Virtual Machines Snapshots }
     }
   network.harvesterhci.io.vlanconfig: |-
     {count, plural,
-      one { Network Config }
-      other { Network Configs }
+      one { Network Configuration }
+      other { Network Configurations }
     }
   harvesterhci.io.monitoring.alertmanagerconfig: |-
     {count, plural,
-      one { Alertmanager Config }
-      other { Alertmanager Configs }
+      one { Alertmanager Configuration }
+      other { Alertmanager Configurations }
     }
   harvesterhci.io.logging.clusterflow: |-
     {count, plural,
@@ -1514,30 +1553,3 @@ typeLabel:
       one { IP Pool }
       other { IP Pools }
     }
-
-harvesterManager:
-  manage: Manage
-  cluster:
-    label: Harvester Clusters
-    none: There are no Harvester Clusters
-    learnMore: Learn more about Harvester from the <a target="_blank" href="https://harvesterhci.io/" rel="noopener noreferrer nofollow">Harvester Web Site</a> or read the the <a target="_blank" href="https://docs.harvesterhci.io/" rel="noopener noreferrer nofollow">Harvester Docs</a>
-    description: Harvester is a modern Hyperconverged infrastructure (HCI) solution built for bare metal servers using enterprise-grade open source technologies including Kubernetes, Kubevirt and Longhorn.
-  plugins:
-    loadError: Error loading harvester plugin
-  rke:
-    templateError: Incorrect template format
-  affinity:
-    thisPodNamespace: This VM's namespace
-    matchExpressions:
-      inNamespaces: "Workloads in these namespaces"
-    vmAffinityTitle: VM Scheduling
-    namespaces:
-      placeholder: e.g. default,system,base
-      label: Namespaces
-    addLabel: Add Workload Selector
-    topologyKey:
-      placeholder: 'topology.kubernetes.io/zone'
-  vGpu:
-    title: VGPUs
-    label: VGPU type
-    placeholder: 'Please select a VGPU'
diff --git a/pkg/harvester/l10n/zh-hans.yaml b/pkg/harvester/l10n/zh-hans.yaml
deleted file mode 100644
index 4d9e3957..00000000
--- a/pkg/harvester/l10n/zh-hans.yaml
+++ /dev/null
@@ -1,1432 +0,0 @@
-generic:
-  tip: 提示
-  resourceExternalLinkTips: '外部链接'
-  namespace: 命名空间
-  notReady: 未就绪
-  labels: 标签
-  inProgress: 进行中
-  basic: 基本信息
-
-nav:
-  group:
-    networks: 网络
-    backupAndSnapshot: 备份 & 快照
-    Monitoring: 监控
-    Logging: 日志
-    'Monitoring & Logging': 监控 & 日志
-
-resourceTable:
-  groupBy:
-    device: 按设备分组
-
-validation:
-  arrayCountRequired: "至少需要 {count} 个 {key}，而且 {key} 不能为空。"
-
-members:
-  clusterMemebership: 集群成员
-  projectMembership: 项目成员
-
-asyncButton:
-  restart:
-    action: 保存并重启
-    success: 已重启
-    waiting: 正在重启&hellip;
-
-harvester:
-  productLabel: 'Harvester'
-  modal:
-    backup:
-      success: '已启动备份 { backUpName }。'
-      addBackup: 添加备份
-    restore:
-      success: '{ name } 还原创建成功。'
-      title: 备份还原
-      selectBackup: 选择备份
-      message:
-        backup: 请选择需要还原的备份。
-    createTemplate:
-      title: '生成模板'
-      name: '名称'
-      description: '描述'
-      message:
-        tip: 请输入模板名称。
-        success: '模板 { templateName } 创建成功。'
-        failed: '生成模板失败。'
-    cloneVM:
-      title: 克隆虚拟机
-      name: 新虚拟机名称
-      type: 克隆数据卷
-      action:
-        create: 创建
-        clone: 克隆
-      message:
-        tip: 请输入虚拟机名称。
-        success: '虚拟机 { name } 克隆成功。'
-        failed: '虚拟机克隆失败！'
-    exportImage:
-      title: 导出镜像
-      name: 名称
-      namespace: 命名空间
-      message:
-        success: '镜像 { name } 创建成功。'
-    migration:
-      failedMessage: 最新迁移失败。
-      title: 迁移
-      fields:
-        nodeName:
-          label: 目标节点
-          placeholder: 选择目标节点
-    ejectCDROM:
-      title: 弹出 CDROM
-      warnTip: 如果你弹出卷，虚拟机将重启。
-      operationTip: '选择要删除的卷：'
-      delete: 删除
-    bundle:
-      title: 生成 Support Bundle
-      url: Issue URL
-      description: 描述
-      requiredDesc: 描述是必填项。
-      titleDescription: 收集 Harvester 系统日志，用于定位问题和获取支持。
-    hotplug:
-      success: '卷 { diskName } 已挂载到 { vm }。'
-      title: 添加卷
-    hotunplug:
-      success: '卷 { name } 拔出成功。'
-    snapshot:
-      title: 生成快照
-      name: 名称
-      message:
-        success: '快照 { name } 生成成功。'
-    volumeClone:
-      title: 克隆卷
-      name: 名称
-      message:
-        success: '{ name } 克隆成功。'
-    restoreSnapshot:
-      title: 还原快照
-      name: '新卷名称'
-      success: '{ name } 已成功还原。'
-    vmSnapshot:
-      title: 生成 VM 快照
-      name: 名称
-      success: 'VM 快照 { name } 生成成功。'
-    restart:
-      title: 重启 VM
-      tip: 立即重启 VM 以使配置更改生效。
-      cancel: 保存
-  notification:
-    title:
-      succeed: 成功
-      info: 信息
-      warning: 警告
-      error: 错误
-  action:
-    createVM: 创建虚拟机
-    start: 启动
-    restart: 重启
-    softreboot: 安全重启
-    stop: 停止
-    pause: 暂停
-    deepClone: 克隆
-    shallowClone: 克隆模板
-    unpause: 取消暂停
-    ejectCDROM: 弹出 CDROM
-    launchFormTemplate: 从模板启动实例
-    modifyTemplate: 修改模板（创建新版本）
-    setDefaultVersion: 设置默认版本
-    addTemplateVersion: 添加模板版本
-    backup: 备份
-    restore: 还原
-    restoreNewVM: 还原新的虚拟机
-    restoreExistingVM: 替换现有虚拟机
-    migrate: 迁移
-    abortMigration: 中止迁移
-    createTemplate: 生成模板
-    enableMaintenance: 开启维护模式
-    disableMaintenance: 关闭维护模式
-    cordon: 封锁
-    uncordon: 解除封锁
-    addHotplug: 添加卷
-    exportImage: 导出镜像
-    viewlogs: 查看日志
-    cancelExpand: 取消展开
-    snapshot: 生成快照
-    pvcClone: 克隆卷
-    vmSnapshot: 生成 VM 快照
-    shutdown: 关机
-    powerOn: 开机
-    reboot: 重启
-    forceStop: 强制停止
-  tableHeaders:
-    size: 大小
-    progress: 进度
-    message: 消息
-    phase: 阶段
-    attachedVM: 挂载的虚拟机
-    fingerprint: 唯一标识
-    value: 值
-    actions: 操作
-    readyToUse: 可用
-    backupTarget: 备份路径
-    targetVm: 目标虚拟机
-    hostIp: 主机 IP
-    vm:
-      ipAddress: IP 地址
-      node: 节点
-      defaultVersion: 默认版本
-    network:
-      type: 类型
-      vlan: Vlan ID
-    snapshotTargetVolume: 原始卷
-    volumeSnapshotCounts: 快照数量
-    networkState: 网络状态
-    storageClass: 存储类
-  tab:
-    volume: 卷
-    network: 网络
-    advanced: 高级选项
-    accessCredentials: 凭证管理
-    pciDevices: PCI 设备
-    vmScheduling: 虚拟机调度
-    instanceLabel: 实例标签
-  fields:
-    version: 版本
-    name: 名称
-    type: 类型
-    image: 镜像
-    size: 大小
-    volume: 卷
-    network: 网络
-    model: 模式
-    macAddress: MAC 地址
-    port: 端口
-    protocol: 协议
-    remove: 删除
-    PhysicalNic: 物理网卡
-    cpu: CPU
-    memory: 内存
-    virtualName: 虚拟机名称
-    promiscuous: Promiscuous
-    ipv4Address: IPv4 地址
-    filterLabels: 标签过滤
-    storageClass: 存储类
-    dockerImage: Docker 镜像
-  pci:
-    available: 可用设备
-    compatibleNodes: 兼容节点
-    impossibleSelection: '没有具有所选设备的主机。'
-    howToUseDevice: '使用下表，在你想在这个 VM 中使用的每个设备上启用 PCI 透传'
-    deviceInTheSameHost: '你只能选择同一主机上的设备。'
-    oldFormatDevices:
-      help: |-
-        <p>
-          以下 PCI 设备使用旧的命名方式，需要在 YAML 文件中更新：
-        </p>
-        <ul>
-          {oldFormatDevicesHTML}
-        </ul>
-        <p>
-          请根据以下说明更新虚拟机：
-        </p>
-        <ol>
-          <li>停止虚拟机，编辑虚拟机 YAML 文件，删除 <Code>hostDevices</Code> 部分，并将更改保存到 YAML 文件中。</li>
-          <li>编辑虚拟机，从可用的 PCI Device 列表中添加已启用的 PCI Device，然后保存并启动虚拟机。</li>
-        </ol>
-    showCompatibility: 显示设备兼容性矩阵
-    hideCompatibility: 隐藏设备兼容性矩阵
-    claimError: 在 {name} 上启用透传时出错
-    unclaimError: 在 {name} 上禁用透传时出错
-    cantUnclaim: 不能在其他用户声明的设备上禁用透传。
-    enableGroup: 启用组
-    disableGroup: 禁用组
-    labelRequired: "不要手动更改此规则：此规则确保为该虚拟机选择的 PCI 设备在 VM 的主机上可用。"
-    goSetting:
-      prefix: pcidevices-controller 插件未启用，单击
-      middle: 此处
-      suffix: 使它能够管理你的 PCI 设备。
-    noPCIPermission: 请联系系统管理员启用 PCI 设备。
-    enablePassthroughWarning: 请不要使用宿主机专用的 PCI 设备（例如，管理网络和 VLAN 网络的网卡）。错误的设备分配可能会损坏你的集群（包括节点故障）。
-    matrixHostName: 主机名
-    matrixDeviceClaimName: 设备声明名称
-  generic:
-    close: 关闭
-    open: 打开
-    showMore: 显示更多
-    hideMore: 隐藏更多
-    memory: 内存
-    cpu: CPU
-    storage: 存储
-    noFileChosen: 没有选择任何文件
-    noSchema: "找不到自定义资源定义：{schema}。"
-
-  validation:
-    custom:
-      tooLongName: '"Name" 的长度不能超过 {max} 个字符。'
-    generic:
-      hasDelete: '{type} "{name}" 已删除。'
-      maxLength: '"{key}" 的长度不能超过 {max} 个字符'
-      tabError:  '{prefix}: {message}'
-      maximumSize: "超过最大大小 {max}！"
-      regex: '无效的 {lowerType} "{name}"：{upperType} 必须匹配正则表达式 "{regex}"'
-    vm:
-      name: '"名称"是必填项。'
-      memory: '"内存"是必填项。'
-      duplicatedName: '{type} 名称重复："{name}"'
-      network:
-        macFormat: 'MAC 地址格式不正确。'
-        upperType: 网络名称
-        lowerType: 网络名称
-      volume:
-        upperType: 卷名称
-        lowerType: 卷名称
-        needImageOrExisting: '至少需要一个镜像卷或已存在的根磁盘卷。'
-    image:
-      ruleTip: 'URL 后缀不支持。仅支持后缀为 .img，.iso，.qcow，.qcow2或.raw的镜像文件。'
-      ruleFileTip: '文件后缀不支持。仅支持后缀为 .img，.iso，.qcow，.qcow2或.raw的镜像文件。'
-
-  dashboard:
-    label: 仪表板
-    header: "Harvester 集群：{cluster}"
-    hardwareResourceGauge:
-      cpu: CPU
-      memory: 内存
-      storage: 存储
-    sections:
-      events:
-        label: 事件
-      vmMetrics:
-        label: 虚拟机指标
-
-    version: 版本
-  host:
-    console: 控制台
-    label: 主机
-    inconsistentIP: "主机 IP 不一致，当前 IP：{currentIP}，初始 IP：{initIP}"
-    promote:
-      none: ' '
-      running: 角色升级中
-      failed: 角色升级失败
-      unknown: 角色升级中断
-      promoteRestart: 角色升级重启中
-      promoteSucceed: 角色升级完成
-    tabs:
-      network: 网络
-      overview: 概述
-      basics: 基本信息
-      instance: 虚拟机
-      monitor: 监控数据
-      storage: 存储
-      labels: 标签
-      ksmtuned: Ksmtuned
-      seeder: 外部访问
-    detail:
-      kvm:
-        disableMessage: 基于硬件的虚拟化已禁用或不受支持。在创建虚拟机之前必须先启用基于硬件的虚拟化。
-      title:
-        network: 网络配置
-      hostIP: 主机 IP
-      role: 角色
-      os: 操作系统
-      create: 创建时间
-      update: 上次更新时间
-      customName: 自定义名称
-      consoleUrl: 控制台地址
-      more: 更多信息
-      uuid: UUID
-      containerRuntime: 容器运行时
-      kernel: 内核
-      management: 管理节点
-      compute: 计算节点
-      storage: 存储
-      nic: 物理网卡
-      notRecommended: '不推荐'
-      networkType: 类型
-      manufacturer: 制造商
-      serialNumber: 序列号
-      model: 模式
-    enableMaintenance:
-      title: 开启维护模式
-      protip: 该操作会将此节点上的所有虚拟机迁移到其他节点。
-      force: 强制
-    cordon:
-      title: 封锁
-      protip: 此操作会将节点 { node } 标记为不可调度。
-    ksmtuned:
-      run: 运行策略
-      configure: 配置
-      mode: 模式
-      modeLink: 模式 <a href="https://docs.harvesterhci.io/v1.1/host/#ksmtuned-mode" target="_blank"><i class="icon icon-info" /></a>
-      thresCoef: 阈值系数
-      enableMergeNodes: 启用跨节点合并
-      enable: 启用
-      disable: 禁用
-      ksmStatus: KSM 状态
-      modeOption:
-        standard: 标准
-        high: 高性能
-        customized: 自定义
-      parameters: 
-        title: Ksmtuned 参数
-        boost: Boost
-        decay: Decay
-        sleepMsec: 睡眠时间（毫秒）
-        minPages: 最小页数
-        maxPages: 最大页数
-        description:
-          boost: 如果可用内存小于阈值系数，那么每次扫描的页数会递增。
-          decay: 如果可用内存大于阈值系数，那么每次扫描的页数会递减。
-          sleepMsec: 两次扫描之间的间隔（最小值为 10ms），由公式（睡眠毫秒 * 16 * 1024 * 1024/总内存）计算得出。
-          minPages: 每次扫描的最小页数，也是第一次运行的配置。
-          maxPages: 每次扫描的最大页数。
-      statistics:
-        title: 统计 <a href="https://www.kernel.org/doc/html/latest/admin-guide/mm/ksm.html#ksm-daemon-sysfs-interface" target="_blank"><i class="icon icon-info" /></a>
-        sharing: 共享
-        shared: 共享
-        unshared: 未共享
-        volatile: 易失
-        fullScans: 全量扫描
-        stableNodeChains: 稳定的节点链
-        stableNodeDups: 稳定节点重复
-    disk:
-      add: 添加磁盘
-      path:
-        label: 路径
-      storageReserved:
-        label: 预留存储空间
-      allowScheduling:
-        label: 调度
-      evictionRequested:
-        label: 驱逐请求
-      forceFormatted:
-        label: 强制格式化
-        toolTip: 强制格式化将会清空磁盘数据。请确保你已对对数据进行备份，以免丢失。
-        yes: 是（Ext4 文件系统）
-      description:
-        label: 描述
-      lastFormattedAt:
-        info: 此磁盘已被强制格式化。
-      notification:
-        success: '已更新主机 {name} 存储配置。'
-      error: 主机有未就绪或不可调度的磁盘。
-      fileSystem:
-        info: 当前文件系统为 {system}，你可以手动格式化。
-        formatting: 正在格式化磁盘，请稍候。
-      tags:
-        label: 磁盘标签
-        addLabel: 添加磁盘标签
-      conditions: 状态
-      storageAvailable:
-        label: 可用存储
-      storageScheduled:
-        label: 已调度存储
-      storageMaximum:
-        label: 最大存储
-    tags:
-      label: 主机标签
-      addLabel: 添加主机标签
-    powerAction:
-      message:
-        success: '主机 { name } { operation } 成功。'
-    ntp:
-      label: Ntp 服务器地址
-      tips: 你可以配置多个 IPv4 地址或主机地址。
-      placeholder: 例如：IPv4
-      ntpSyncStatus:
-        isDisabled: 'NTP 已禁用。请检查 NTP 服务是否处于活动状态。'
-        isUnsynced: 'NTP 未同步 NTP 服务器 <code>{current}</code>'
-      ntpConfigSyncStatus:
-        isUnsynced: 'NTP 配置未同步。当前：<code>{current}</code>，需求：<code>{wanted}</code> '
-
-  virtualMachine:
-    label: 虚拟机
-    osType: 操作系统类型
-    instance:
-      singleInstance:
-      multipleInstance:
-      single:
-        label: 单个实例
-        nameLabel: 名称
-        host:
-          label: 主机名
-          placeholder: 默认为虚拟机名称。
-      multiple:
-        label: 多个实例
-        nameNsDescription: 每个实例的名称前缀
-        count: 数量
-        countTip: 范围：1-10
-        nameLabel: 名称前缀
-        host:
-          label: 主机名前缀
-          placeholder: 默认为虚拟机名称。
-    useTemplate:
-      label: "使用虚拟机模板："
-      template:
-        label: 模板
-      version:
-        label: 版本
-    console:
-      novnc: 在 Web VNC 中打开
-      serial: 在串行控制台中打开
-    promptRemove:
-      title: '选择要删除的卷：'
-      deleteAll: 删除全部
-      tips: "警告：删除 VM 将同时删除 VM 快照，而删除卷则会同时删除卷快照。"
-    unplug:
-      title: '是否确认要拔出卷 {name} ？'
-      actionLabel: 拔出
-      detachVolume:
-        拔出卷
-    restartTip: |-
-      {restart, select,
-        true {重启}
-        other {启动}
-      }虚拟机以使配置更改生效。
-    runStrategy: 运行策略
-    restartNow: |-
-      {restart, select,
-        true {现在重启}
-        other {现在启动}
-      }
-    createSSHKey: 创建 SSH 密钥
-    installAgent: 安装访客代理
-    enableUsb: 启用 USB Tablet
-    advancedOptions:
-      tpm: 启用 TPM
-    usbTip: 提供绝对指针设备，有助于在 VNC 中获得一致的鼠标光标位置。
-    sshTitle: 添加 SSH 公钥
-    imageTip: 创建虚拟机所需的.iso，.img，.qcow2或.raw外部镜像地址
-    efiEnabled: EFI 模式下启动
-    secureBoot: 安全启动
-    volume:
-      dragTip: 拖放卷或使用卷的箭头来更改引导顺序。
-      volumeTip: 虚拟机仅包含一个 cd-rom 卷。你可能想要添加额外的磁盘卷。
-      macTip: "访客系统内显示的 MAC 地址"
-      volumeUpdate: '卷 { name } 设置成功。'
-      type: 类型
-      size: 大小
-      edit: 编辑
-      bus:  Bus
-      bootOrder: 引导顺序
-      volume: 卷
-      dockerImage: Docker 镜像
-      addVolume: 添加卷
-      addExistingVolume: 添加现有卷
-      addVmImage: 添加虚拟机镜像
-      addContainer: 添加容器
-      setFirst: 设置为根卷
-      saveVolume: 更新卷
-      title:
-        vmImage: 镜像卷
-        existingVolume: 现有卷
-        volume: 卷
-        container: 容器
-      unmount:
-        title: 是否确认？
-        message: 是否确认卸载此卷？
-    network:
-      title: 网络
-      addNetwork: 添加网络
-      addPort:  添加端口
-    cloudConfig:
-      title: Cloud Config
-      createTemplateTitle: '创建 { name }。'
-      createNew: 创建...
-      cloudInit:
-        label: Cloud Init
-        placeholder: 选择模板
-      user:
-        label: 用户数据模板
-        title: "用户数据："
-        tip: "你可以指定用户数据，以在启动时配置实例或运行配置脚本。如果一次启动多个实例，所有预留实均能使用用户数据。<a href='https://cloudinit.readthedocs.io/en/latest/topics/examples.html' target='_blank'>了解更多</a>"
-      network:
-        label: 网络数据模板
-        title: "网络数据："
-        tip: "通过分配子网配置，创建虚拟设备（bonds，bridges，Vlan）路由和 DNS 配置，来自定义实例的网络接口。<a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>了解更多</a>"
-    scheduling:
-      affinity:
-        anyNode: '在任何可用节点上运行虚拟机'
-        schedulingRules: '在匹配调度规则的节点上运行虚拟机'
-        specificNode: 在指定节点上运行虚拟机 -（不支持热迁移）
-      networkNotSupport: 网络不支持调度
-    accessCredentials:
-      resetPwd:
-        label: 添加密码凭证
-      injectSSH:
-        label: 添加 SSH 密钥凭证
-        users: 选择用户
-        addUser: 添加用户
-      tips: 要启用访问凭证，你需要安装 qemu-guest-agent。更新凭证内容后无需重启，而添加凭证后需要重启虚拟机。删除凭证后，需要进入虚拟机手动修改密码/删除 SSH 密钥。
-      userTips: 添加的用户需要存在，否则凭证不会生效。
-      duplicatedUser: 用户已存在。
-      invalidUser: 无效的用户名
-    input:
-      name: 名称
-      memory: 内存
-      image: 镜像
-      sshKey: SSH 密钥
-      sshKeyValue: SSH 密钥
-      MachineType: 主机类型
-      username: 用户名
-      password: 密码
-      reservedMemory: 预留内存
-    machineTypeTip: '指定要模拟的处理器架构。要查看支持的体系结构列表，请运行：qemu-system-x86_64 -cpu ?'
-    detail:
-      tabs:
-        overview: 概述
-        details: 详情
-        environment: 环境
-        events: 事件
-        migration: 迁移
-        console: 控制台
-        networkInterfaces: 网络接口
-        disks: 磁盘
-        networks: 网络
-        basics: 基本信息
-        configurations: 配置
-        inventory: 清单
-        hostBasic: 基本属性
-        instance: 虚拟机
-        monitor: 监控数据
-        keypairs: SSH 密钥
-        cloudConfig: Cloud Config
-        metrics: 虚拟机指标
-      details:
-        title:
-          vmDetails: 虚拟机详情
-          requirements: 调度和资源要求
-          services: 服务
-          users: 已登录用户
-        name: 名称
-        namespace: 命名空间
-        created: 创建时间
-        hostname: 主机名
-        node: 节点
-        ipAddress: IP 地址
-        status: 状态
-        pod: Pod
-        labels: 标签
-        bootOrder: 引导顺序
-        annotations: 注释
-        CDROMs: CD-ROM
-        description: 描述
-        operatingSystem: 操作系统
-        template: 模板
-        kernelRelease: 内核版本
-        owner: 所有者
-        workloadProfile: 工作负载配置文件
-        nodeSelector: 节点选择器
-        flavor: 规格
-        tolerations: 容忍
-        dedicatedResources: 专用资源
-        down: 虚拟机未启动
-        affinityRules: 亲和性规则
-        sourceNode: 源节点
-        targetNode: 目标节点
-        started: 开始时间
-        ended: 结束时间
-      notAvailable: 不可用
-      GuestAgentNotInstalled: 未安装 GuestAgent
-      noOwner: 没有所有者
-      events:
-        from: 生成自
-        down: 过去一小时没有事件
-      console:
-        down: 此虚拟机已关闭。请启动虚拟机以访问其控制台。
-        shortcutKeys: 快捷键
-        customShortcutKeys: 自定义快捷键
-        management: 管理快捷键
-        record:
-          start: 记录
-          recording: 记录中
-          stop: 停止记录
-          tips: 按下记录按钮后将捕获你的键盘输入。
-          send: 发送
-          preferredKeys: 首选自定义快捷键
-    terminationGracePeriodSeconds:
-      label: 终止宽限期
-    affinity:
-      thisPodNamespace: 此虚拟机的命名空间
-      matchExpressions:
-        inNamespaces: "命名空间中的工作负载"
-      namespaces:
-        label: 命名空间
-
-  volume:
-    label: 卷
-    tabs:
-      basics: 基本信息
-      snapshots: 快照
-      datasource: 数据源
-      details: 详情
-    size: 大小
-    source: 源
-    kind: 类型
-    sourceOptions:
-      new: 创建
-      vmImage: 虚拟机镜像
-    image: 镜像
-    frontend: 前端
-    blockdev: 块设备
-    attachedNode: 连接的节点
-    endpoint: 端点
-    diskTags: 磁盘标签
-    nodeTags: 节点标签
-    lastBackup: 上次备份
-    lastBackupAt: 上次备份时间
-    replicasNumber: 副本数
-    promptRemove:
-      tips: "警告：卷的快照将随卷一起删除。"
-    externalLink:
-      tips: 查看卷详细信息
-    rebuildingMessage: '重建进度：{percentage}%'
-
-  image:
-    label: 镜像
-    tabs:
-      basics: 基本信息
-    url: URL
-    size: 大小
-    urlTip: '支持被 <a href="https://www.qemu.org/docs/master/system/images.html#disk-image-file-formats" target="_blank">qemu</a> 支持的 <code>raw</code> 和 <code>qcow2</code> 镜像格式。可引导的 ISO 镜像也是类似 <code>raw</code> 格式的镜像。'
-    fileName: 文件名称
-    uploadFile: 上传文件
-    source: 源
-    sourceType:
-      download: URL
-      upload: 文件
-    warning:
-      uploading: |-
-        {count, plural,
-        =1 {正在上传一个镜像。请不要刷新或关闭前页面。}
-        other {正在上传{count}个镜像。请不要刷新或关闭前页面。}
-        }
-
-  vmTemplate:
-    label: 模板
-    tabs:
-      basics: 基本信息
-    nameNsDescription:
-      name: 模板名称
-    tips:
-      notExistImage:
-        title: 镜像 {name} 不存在。
-        message: 请选择一个新的镜像。
-      notExistNode:
-        title: 节点 {name} 不存在。
-        message: 请选择一个新的节点。
-
-  upgradePage:
-    upgradeApp: 升级软件
-    upgrade: 升级
-    upgradeTip: 请选择目标升级版本
-    currentVersion: 当前版本
-    versionLabel: 可用的兼容版本
-    enableLogging: 启用 Logging
-    upgradeNode: 升级节点
-    upgradeSysService: 升级系统服务
-    upgradeImage: 下载升级镜像
-    osUpgrade: 操作系统升级
-    uploadNew: 上传新镜像
-    selectExisting: 选择现有镜像
-    createRepository: 创建升级仓库
-    succeeded: 成功
-    releaseTip: 请仔细阅读升级文档。你可以在 <a href="{url}" target="_blank">Harvester Release Note</a> 上查看详细信息。
-    checkReady: 我已阅读并理解与此 Harvester 版本相关的升级内容。
-    pending: 等待
-    repoInfo:
-      upgradeStatus: 升级状态
-      os: 操作系统
-      kubernetes: Kubernetes
-      monitoringChart: Monitoring Chart
-      harvesterChart: Harvester Chart
-      success: 成功
-      fail:  失败
-      ongoing: 进行中
-      downloadLog: 下载日志
-      logStatus: 日志下载状态
-    dismissMessage: 忽略
-    upgradeInfo:
-      warning: 警告
-      doc: 在升级到新 Harvester 版本之前，你必须为集群执行所需的<a href="https://docs.harvesterhci.io/v1.0/upgrade/automatic/" target="_blank">升级前检查</a>。仅完成适用于环境的任务即可。
-      tip: 如果没有执行这些检查，升级可能会失败，而且你可能会遇到需要手动修复的已知问题。
-      moreNotes: 有关发行说明的详情，请访问 -
-
-  backup:
-    label: 虚拟机备份
-    createText: 还原备份
-    title: 还原虚拟机
-    backupTargetTip: 用于访问备份存储的端点。支持 NFS 和 S3。
-    message:
-      noSetting:
-        prefix: 在创建新备份之前, 必须在
-        middle: '设置'
-        suffix: 中配置备份目标。
-      errorTip:
-        prefix: 非法的备份目标
-        middle: 设置
-        suffix: "。错误信息： "
-      viewSetting:
-        prefix: 点击
-        middle: 此处
-        suffix: 查看备份配置。
-      testConnect:
-        actionLabel: 测试连接
-        waitingLabel: 正在测试连接...
-        successLabel: 连接已测试
-        successMessage: 'Harvester 可以成功连接到端点 {endpoint}'
-    restore:
-      backup: 备份
-      deletePreviousVolumes: 删除先前的卷
-      createNew: 创建
-      replaceExisting: 替换现有
-      virtualMachineName: 虚拟机名称
-    matchTarget: 当前备份目标与现有目标不匹配。
-
-  network:
-    label: 虚拟机网络
-    tabs:
-      basics: 基本信息
-      layer3Network: 路由
-    clusterNetwork:
-      label: 集群网络
-      create: 创建新的集群网络
-      toolTip: 定义你的自定义集群网络名称
-      createPlaceholder: 输入新的集群网络名称
-      selectOrCreatePlaceholder: 选择或创建新的集群网络
-      selectPlaceholder: 选择集群网络
-    layer3Network:
-      mode:
-        label: 模式
-        auto: 自动（DHCP）
-        manual: 手动
-      serverIPAddr:
-        label: DHCP 服务器 IP
-      gateway:
-        label: 网关
-        placeholder: 例如：172.16.0.1
-      cidr:
-        label: CIDR
-        placeholder: 例如：172.16.0.1/24
-  sshKey:
-    label: SSH 密钥
-    keypair: SSH 密钥
-    tabs:
-      basics: 基本信息
-
-  setting:
-    label: 设置
-    tabs:
-      advanced: 高级选项
-      ui: UI
-    validation:
-      physicalNIC: 默认物理网卡
-    placeholder:
-      accessKeyId: 指定你的访问密钥 ID
-      secretAccessKey: 指定你的密文访问密钥
-      cert: 上传自签名 SSL 证书
-    vlanChangeTip: 新修改的默认网络接口仅在新增节点生效，不在现有节点生效。
-    defaultPhysicalNIC: 默认网络接口
-    percentTip: 括号内的数值代表所有主机上的网络接口的分布比例。如果选择了一个小于100%的接口，用户需要手动指定 VLAN 网络配置失败的主机上的网络接口。
-    message:
-      ca:
-        prefix: '点击'
-        middle: '此处'
-        suffix: '添加自定义证书。'
-    sslCertificates:
-      publicCertificate: 公共证书
-      privateKey: 私钥
-      ca: CA
-    storageNetwork:
-      range:
-        placeholder: 例如：172.16.0.0/24
-        label: IP 范围
-        invalid: '范围无效。'
-      clusterNetwork: 集群网络
-      vlan: VLAN ID
-      exclude:
-        label: 排除
-        placeholder: 例如：172.16.0.1/32
-        invalid: '"排除列表"无效。'
-        addIp: 添加排除 IP
-      warning: '警告：<br/>如果要更改存储网络，你需要在应用此设置之前关闭所有虚拟机。<br/>用户必须确保配置了集群网络，VLAN 配置能覆盖所有节点，而且所有节点的网络正常。'
-      tip: IP 范围应为 IPV4 格式。<code>所需 IP 数量 = 节点数量 * 4 + 磁盘数量 * 2 + 要下载/上传的镜像数量</code>。详见<a href="https://docs.harvesterhci.io/v1.2/advanced/storagenetwork#configuration-example" target="_blank">此文档</a>。
-    vmForceDeletionPolicy:
-      period: 周期
-    httpProxy:
-      warning: '警告：<br/> 如果你配置了 "http-proxy" 和 "https-proxy"，那么你必须同时将 Harvester 节点的 CIDR 填入 "no-proxy"，否则 Harvester 集群将会崩溃。'
-    supportBundleImage:
-      imagePullPolicy: 镜像拉取策略
-      repo: 仓库
-      tag: 标签
-    csiDriverConfig:
-      provisioner: 提供商
-      volumeSnapshotClassName: 卷快照类名
-      backupVolumeSnapshotClassName: 备份卷快照类名
-    containerdRegistry:
-      mirrors:
-        mirrors: Mirror
-        registryName: 镜像仓库名称
-        endpoints: 端点
-        rewrite:
-          rewrite: 重写
-          addRewrite: 添加重写
-        addMirror: 添加 Mirror
-      configs:
-        configs: Configs
-        registryEDQNorIP: 镜像仓库 FDQN 或 IP
-        registryPlaceholder: myregistry.local:5000
-        username: 用户名
-        password: 密码
-        auth: 认证
-        identityToken: 身份令牌
-        insecureSkipVerify: InsecureSkipVerify
-        addConfig: 添加配置
-
-    upgrade:
-      selectExitImage: 请选择要升级的操作系统镜像。
-      imageUrl: 请输入有效的图片网址。
-      chooseFile: 请选择上传图片。
-      checksum: 校验和
-    harvesterMonitoring:
-      label: Harvester Monitoring
-      section:
-        prometheus: Prometheus
-        prometheusNodeExporter: Prometheus Node Exporter
-        grafana: Grafana
-        alertmanager: Alertmanager
-      tips:
-        scrape: 每次采集数据的间隔时间
-        evaluation: 每次评估规则的间隔时间
-        retention: 监控数据保留时间
-        retentionSize: 监控数据最大占用存储
-    clusterRegistrationUrl:
-      message: 要完全取消导入的 Harvester 集群，也请通过<code>虚拟化管理</code>页面在 Rancher 仪表板 UI 上删除它。
-    ntpServers:
-      isNotIPV4: 你输入的不是 IPv4 或主机地址。请输入有效的 IPv4 地址或主机地址。
-      isDuplicate: 存在重复的 NTP 服务器配置。
-  cloudTemplate:
-    label: Cloud Config 模板
-    templateType: 模板类型
-    userData: 用户数据
-    networkData: 网络数据
- 
-  support:
-    title: Harvester 支持
-    kubeconfig:
-      title: 下载 KubeConfig
-      titleDescription: 下载 Kubeconfig 用于调试。
-    internal:
-      rancher:
-        title: 访问内嵌的 Rancher UI
-        titleDescription: 仅支持使用内嵌的 Rancher 仪表板来进行调试和验证。有关 Rancher 的多集群和多租户集成，请参阅<a target="_blank" href="https://docs.harvesterhci.io/v1.2/rancher/index" rel="noopener noreferrer nofollow">此文档</a>。
-      longhorn:
-        title: 访问内嵌的 Longhorn UI
-        titleDescription: 仅支持使用内嵌的 Longhorn UI 来进行调试和验证。
-    community:
-      learnMore: 进一步了解 SUSE Harvester 支持
-      pricing: 联系我们获取价格。
-
-  namespace:
-    label: 命名空间
-
-  projectNamespace:
-    label: 项目/命名空间
-
-  vip:
-    namespace:
-      label: 命名空间
-    cidr:
-      label: CIDR/IP 范围
-      invalid: '"CIDR/IP 范围" 无效。'
-      toolTip: "可以使用逗号分隔来应用多个池或范围。即 192.168.0.200/30,192.168.0.200/29 或 192.168.0.10-192.168.0.11"
-    add:
-      label: 添加 IP 池
-
-  sslParameters:
-    protocols:
-      label: 协议
-    ciphers:
-      label: 密码
-  
-  monitoring:
-    configuration:
-      label: 配置
-    alertmanagerConfig:
-      label: Alertmanager 配置
-      diabledMonitoringTips:
-        prefix: '你必须先启用'
-        middle: 'Monitoring'
-        suffix: 'Addon。'
-      diabledAlertingTips:
-        prefix: '你必须先启用'
-        middle: 'Alertmanager'
-        suffix: '然后配置才能生效'
-      disabledAddon:
-        prefix: 'Monitoring Addon 已禁用。单击'
-        middle: '此处'
-        suffix: '启用它。'
-
-  logging:
-    configuration:
-      section:
-        fluentbit: Fluentbit
-        fluentd: Fluentd
-    clusterFlow:
-      label: Cluster Flow
-    clusterOutput:
-      label: Cluster Output
-    flow:
-      label: Flow
-    output:
-      label: Output
-    diabledTips:
-        prefix: '你必须先启用'
-        middle: 'Logging'
-        suffix: '然后配置才能生效'
-
-  snapshot:
-    label: 卷快照
-    targetVolume: 原始卷
-    size: 大小
-    image: 镜像
-
-  vmSnapshot:
-    label: VM 快照
-    createText: 还原快照
-    snapshot: 快照
-
-  storage:
-    label: 存储
-    useDefault: 使用默认存储
-    migratable:
-      label: 可迁移
-    numberOfReplicas:
-      label: 副本数量
-    staleReplicaTimeout:
-      label: 过时副本超时
-    nodeSelector:
-      label: 主机选择器
-    diskSelector:
-      label: 磁盘选择器
-    storageClass:
-      label: 存储类
-    title: 存储类
-    customize:
-      volumeBindingMode:
-        later: 创建了使用 PVC 的 VM 之后，再绑定并配置一个持久卷
-    parameters:
-      numberOfReplicas:
-        label: 副本数量
-      staleReplicaTimeout:
-        label: 过时副本超时
-      diskSelector:
-        label: 磁盘选择器
-        no-options: 没有可用的标签，请前往 `主机 > 存储` 页面进行添加。
-      nodeSelector:
-        label: 节点选择器
-        no-options: 没有可用的标签，请前往 `主机 > 存储` 页面进行添加。
-      migratable:
-        label: 可迁移
-    allowedTopologies:
-      title: 允许的拓扑
-      tooltip: 用于在匹配以下所有表达式的主机上调度虚拟机。
-
-  vlanConfig:
-    title: 网络配置
-    createNetworkConfig: 创建网络配置
-    action:
-      migrate: 迁移
-    titles:
-      nodeSelector: 节点选择器
-      uplink: Uplink
-      bondOptions: Bond 选项
-      attributes: 属性
-      host: 选定的主机
-    scheduling:
-      affinity:
-        allNodes: 选择所有节点
-        specificNode: 选择特定节点
-        schedulingRules: 选择节点匹配规则
-    uplink:
-      nics:
-        label: NIC
-        addLabel: 添加 NIC
-        placeholder: 选择在所有选定节点上都可用的 NIC
-        validate:
-          available: NIC "{nic}" 在所选节点上不可用
-      linkAttributes:
-        mtu: 
-          label: MTU
-      bondOptions:
-        mode:
-          label: 模式
-        miimon:
-          label: Miimon
-          tooltip: <Code>-1</Code> 指保持原有值。
-    nodeSelector:
-      matchingNodes:
-        matchesSome: |-
-          {matched, plural,
-            =0 {匹配 {total, number} 个节点中的 0 个}
-            =1 {匹配 {total, number} 个节点中的 1 个："{sample}"}
-            other {匹配 {total, number} 个节点中的 {matched, number} 个，包括 "{sample}"}
-          }
-
-  vlanStatus:
-    vlanConfig:
-      label: 网络配置
-  
-  clusterNetwork:
-    title: 集群网络/配置
-    create:
-      button:
-        label: 创建集群网络
-    clusterNetwork: 没有定义的网络配置。
-    mgmt: mgmt 是一个内置的集群管理网络，它不支持其它网络配置。
-    notExist: '集群网络 "{ clusterNetwork }" 不存在'
-    notReady: '集群网络 "{ clusterNetwork }" 未就绪'
-  
-  addons:
-    descriptions:
-      'harvester-system/vm-import-controller': vm-import-controller 是一个插件，用于将其他集群的 VM 工作负载迁移到现有的 Harvester 集群。
-      'harvester-system/pcidevices-controller': pcidevices-controller 是一个插件，用于发现集群中节点的 PCI 设备，能让用户为 PCI 透传准备设备，以便与 Harvester VM 和 Guest 集群一起使用。
-      'cattle-logging-system/rancher-logging': rancher-logging 是一个插件，用于从 Harvester 集群收集多功能日志、事件和审计，并根据流将它们路由到多种服务器。
-      'harvester-system/rancher-vcluster': rancher-vcluster 用于部署安装了 Rancher 的 vcluster。
-      'cattle-monitoring-system/rancher-monitoring': rancher-monitoring 是一个插件，用于收集 Harvester 集群和 VM 的指标。你可以在嵌入式仪表板上查看指标，并向远程服务器发送告警。
-      'vm-import-controller': vm-import-controller 是一个插件，用于将其他集群的 VM 工作负载迁移到现有的 Harvester 集群。
-      'pcidevices-controller': pcidevices-controller 是一个插件，用于发现集群中节点的 PCI 设备，能让用户为 PCI 透传准备设备，以便与 Harvester VM 和 Guest 集群一起使用。
-      'rancher-logging': rancher-logging 是一个插件，用于从 Harvester 集群收集多功能日志、事件和审计，并根据流将它们路由到多种服务器。
-      'rancher-monitoring': rancher-monitoring 是一个插件，用于收集 Harvester 集群和 VM 的指标。你可以在嵌入式仪表板上查看指标，并向远程服务器发送告警。
-      'rancher-vcluster': rancher-vcluster 用于部署安装了 Rancher 的 vcluster。
-      'harvester-seeder': Harvester-seeder 是一个插件，使用 ipmi 和 redfish 来发现硬件信息并执行外部操作。
-      'harvester-system/harvester-seeder': Harvester-seeder 是一个插件，使用 ipmi 和 redfish 来发现硬件信息并执行外部操作。
-    vmImport:
-      titles:
-        basic: 基本信息
-        pvc: 卷
-    rancherVcluster:
-      accessRancher: 访问 Rancher 仪表板
-      hostname: 主机名
-      rancherVersion: Rancher 版本
-      password: Bootstrap 密码
-    switchFailed: "{action} {name} 失败"
-      
-
-
-  loadBalancer:
-    label: 负载均衡器
-    tabs:
-      basic: 基本信息
-      listeners: 监听器
-      healthCheck: 健康检查
-      backendServer: 后端服务器选择器
-    workloadType:
-      label: 工作负载类型
-      options:
-        cluster: 来宾 Kubernetes 集群
-        vm: 虚拟机
-    ipam:
-      label: IPAM
-      options:
-        dhcp: DHCP
-        pool: 池
-    ipPool:
-      label: IP 池
-      options:
-        none: 自动（自动选择 IP 池）
-    listeners:
-      name:
-        label: 名称
-      protocol:
-        label: 协议
-      port:
-        label: 端口
-      backendPort:
-        label: 后端端口
-        placeholder: 例如：80
-    backendServerSelector:
-      matchingVMs:
-        matchesSome: |-
-          {matched, plural,
-            =0 { 在负载均衡器所在的命名空间中匹配 0 个虚拟机，共 {total, number} 个。}
-            =1 {在负载均衡器所在的命名空间中匹配 1 个虚拟机 "{sample}"，共 {total, number} 个。 }
-            other { 在负载均衡器所在的命名空间中匹配的 {matched, number} 个现有虚拟机（共 {total, number} 个），包括 "{sample}"}
-          }
-    backendServers:
-      label: 后端服务器
-
-  ipPool:
-    label: IP 池
-    network:
-      label: 虚拟机网络
-    tabs:
-      range: 范围
-      scope: 范围
-      selector: 选择器
-    subnet:
-      label: 子网
-    startIP:
-      label: 起始 IP
-    endIP:
-      label: 终止 IP
-    gateway:
-      label: 网关
-    namespace:
-      label: 命名空间
-    project:
-      label: 项目
-    guestCluster:
-      label: 来宾 Kubernetes 集群
-    availableIP:
-      label: 可用 IP 数
-    scope:
-      label: 范围
-      addLabel: 添加范围
-    priority:
-      label: 优先级
-    cidr:
-      addLabel: 添加 CIDR
-    range:
-      addLabel: 添加范围
-      
-  service:
-    healthCheckPort:
-      label: 健康检查端口
-    healthCheckSuccessThreshold:
-      label: 健康检查成功阙值
-      description: 如果探针连续检测到某个地址的成功次数达到成功阈值，后端服务器就可以开始转发流量。
-    healthCheckFailureThreshold:
-      label: 健康检查失败阈值
-      description: 如果健康检查失败的数量达到失败阈值，后端服务器将停止转发流量。
-    healthCheckPeriod:
-      label: 健康检查周期
-    healthCheckTimeout:
-      label: 健康检查超时
-    healthCheckEnabled:
-      label: 健康检查
-
-  secret:
-    label: 密文
-
-  sriov:
-    label: SR-IOV 网络设备
-    nodeName: 节点
-    numVFs: 虚拟数量
-    vfAddresses: 虚拟地址
-    showMore: 显示更多
-    parentSriov: 按父级 SR-IOV 过滤
-
-  harvesterVlanConfigMigrateDialog:
-    targetClusterNetwork: 
-      label: 目标集群网络
-      placeholder: 选择目标集群网络
-
-  seeder:
-    banner:
-      enable:
-        prefix: harvester-seeder 插件已被禁用，
-        middle: 单击此处
-        suffix: 启用它。
-      noAccess: 请联系管理员启用外部访问。
-      noAddon: harvester-seeder 插件不存在，请检查是否已安装。
-      noInventory: 正在等待 "inventories.metal.harvesterhci.io" 就绪。
-    inventory:
-      host:
-        label: 主机
-        placeholder: 例如：172.16.1.1
-      port:
-        label: 端口
-        placeholder: 例如：623
-      insecureTLS:
-        label: 不安全的 TLS
-      secret:
-        label: 密文
-        create:
-          title: 添加密文
-      event:
-        label: 事件
-      pollingInterval:
-        label: 轮询间隔
-
-  affinity:
-    thisPodNamespace: 此虚拟机的命名空间
-    matchExpressions:
-      inNamespaces: "命名空间中的工作负载"
-    vmAffinityTitle: 虚拟机调度
-    namespaces:
-      placeholder: 例如：default,system,base
-      label: 命名空间
-    addLabel: 添加工作负载选择器
-    topologyKey:
-      placeholder: 'topology.kubernetes.io/zone'
-
-advancedSettings:
-  descriptions:
-    'harv-vlan': VLAN 网络的默认网络接口名称。
-    'harv-backup-target': 用于存储虚拟机备份的自定义备份目标。
-    'branding': 管理员可以修改 Harvester 产品名称、Logo 和配色方案来全局自定义 UI 界面。
-    'harv-csi-driver-config': 为 CSI 设备配置其他信息。
-    'harv-containerd-registry': 连接到私有镜像仓库的 Containerd 仓库配置。
-    'harv-log-level': 配置 Harvester server 日志级别。默认级别为 info。
-    'harv-server-version': Harvester server 版本。
-    'harv-upgrade-checker-enabled': 是否启用 Harvester 升级检查。默认值为 true。
-    'harv-upgrade-checker-url': 默认 Harvester 升级检查 URL。只有当 <code>upgrade-checker-enabled</code>  设置为 true 时可使用。
-    'harv-ui-source': 配置加载 UI 资源方式。
-    'harv-ui-index': 'UI 的 HTML 索引位置。'
-    'harv-ui-plugin-index': 'Harvester 插件的 JS 文件索引位置'
-    'harv-cluster-registration-url': 用于多集群管理的注册 URL。
-    'harv-http-proxy': '用于 Harvester 访问外部服务的 HTTP 代理。'
-    'harv-additional-ca': '用于 TLS 验证的自定义 CA 根证书。'
-    'harv-overcommit-config': '资源超额配置。'
-    'harv-support-bundle-timeout': 'Support Bundle 超时配置（单位：分钟），你可以使用 0 来禁用超时。'
-    'harv-support-bundle-expiration': 'Support Bundle 过期配置（单位：分钟）。'
-    'harv-vm-force-reset-policy': 配置当虚拟机卡在停机的节点上时的强制重置动作。
-    'harv-ssl-parameters': 用于 TLS 验证的自定义 SSL 参数。
-    'harv-storage-network': 'Longhorn 存储网络设置。'
-    'harv-support-bundle-namespaces': 指定支持包要收集的其他命名空间中的资源。
-    'harv-auto-disk-provision-paths': 指定 Harvester 将自动添加为虚拟机存储的磁盘（使用 glob 模式）。
-    'harv-support-bundle-image': Support Bundle 镜像配置。前往 <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a> 查看更多版本。
-    'harv-release-download-url': 此设置用于配置<code>升级版本下载</code>的 URL 地址。Harvester 将从该 URL 托管的 (<code>$URL</code>/<code>$VERSION</code>/version.yaml) 文件中获取 ISO URL 和校验和值。
-    'harv-default-vm-termination-grace-period-seconds': 配置停止虚拟机的终止宽限期。
-    'harv-ntp-servers': 配置 NTP 服务器。你可以配置多个 IPv4 地址或主机地址。
-
-typeLabel:
-  kubevirt.io.virtualmachine: |-
-    {count, plural,
-      one { 虚拟机 }
-      other { 虚拟机 }
-    }
-  harvesterhci.io.virtualmachineimage: |-
-    {count, plural,
-      one { 镜像 }
-      other { 镜像 }
-    }
-  harvesterhci.io.keypair: |-
-    {count, plural,
-      one { SSH 密钥 }
-      other { SSH 密钥 }
-    }
-  harvesterhci.io.host: |-
-    {count, plural,
-      one { 主机 }
-      other { 主机 }
-    }
-  harvesterhci.io.networkattachmentdefinition: |-
-    {count, plural,
-      one { 虚拟机网络 }
-      other { 虚拟机网络 }
-    }
-  harvesterhci.io.volume: |-
-    {count, plural,
-      one { 卷 }
-      other { 卷 }
-    }
-  harvesterhci.io.user:  |-
-    {count, plural,
-      one { 用户 }
-      other { 用户 }
-    }
-  harvesterhci.io.setting:  |-
-    {count, plural,
-      one { 设置 }
-      other { 设置 }
-    }
-  harvesterhci.io.virtualmachinetemplateversion: |-
-    {count, plural,
-      one { 模板 }
-      other { 模板 }
-    }
-  harvesterhci.io.virtualmachinebackup: |-
-    {count, plural,
-      one { 虚拟机备份 }
-      other { 虚拟机备份 }
-    }
-  harvesterhci.io.cloudtemplate: |-
-    {count, plural,
-      one { Cloud Config 模板 }
-      other { Cloud Config 模板 }
-    }
-  harvesterhci.io.volumesnapshot: |-
-    {count, plural,
-      one { 卷快照 }
-      other { 卷快照 }
-    }
-  harvesterhci.io.vmsnapshot: |-
-    {count, plural,
-      one { VM 快照 }
-      other { VM 快照 }
-    }
-  network.harvesterhci.io.vlanconfig: |-
-    {count, plural,
-      one { 网络配置 }
-      other { 网络配置 }
-    }
-  harvesterhci.io.monitoring.alertmanagerconfig: |-
-    {count, plural,
-      one { Alertmanager 配置 }
-      other { Alertmanager 配置 }
-    }
-  harvesterhci.io.logging.clusterflow: |-
-    {count, plural,
-      one { Cluster Flow }
-      other { Cluster Flow }
-    }
-  harvesterhci.io.logging.clusteroutput: |-
-    {count, plural,
-      one { Cluster Output }
-      other { Cluster Output }
-    }
-  harvesterhci.io.logging.flow: |-
-    {count, plural,
-      one { Flow }
-      other { Flow }
-    }
-  harvesterhci.io.logging.output: |-
-    {count, plural,
-      one { Output }
-      other { Output }
-    }
-  harvesterhci.io.storage: |-
-    {count, plural,
-      one { 存储类 }
-      other { 存储类 }
-    }
-  devices.harvesterhci.io.pcidevice: |-
-    {count, plural,
-      one { PCI 设备 }
-      other { PCI 设备 }
-    }
-  persistentvolumeclaim: |-
-    {count, plural,
-      one { 卷 }
-      other { 卷 }
-    }
-  network.harvesterhci.io.clusternetwork: |-
-    {count, plural,
-      one { 集群网络 }
-      other { 集群网络 }
-    }
-  devices.harvesterhci.io.sriovnetworkdevice: |-
-    {count, plural,
-      one { SR-IOV 网络设备 }
-      other { SR-IOV 网络设备 }
-    }
-  harvesterhci.io.secret: |-
-    {count, plural,
-      one { 密文 }
-      other { 密文 }
-    }
-  harvesterhci.io.blockdevice: |-
-    {count, plural,
-      one { 磁盘 }
-      other { 磁盘 }
-    }
-  loadbalancer.harvesterhci.io.loadbalancer: |-
-    {count, plural,
-      one { 负载均衡器 }
-      other { 负载均衡器 }
-    }
-  loadbalancer.harvesterhci.io.ippool: |-
-    {count, plural,
-      one { IP 池 }
-      other { IP 池 }
-    }
diff --git a/pkg/harvester/list/harvesterhci.io.dashboard.vue b/pkg/harvester/list/harvesterhci.io.dashboard.vue
index 09824743..28f8ed0f 100644
--- a/pkg/harvester/list/harvesterhci.io.dashboard.vue
+++ b/pkg/harvester/list/harvesterhci.io.dashboard.vue
@@ -134,15 +134,16 @@ export default {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
     const hash = {
-      vms:          this.fetchClusterResources(HCI.VM),
-      nodes:        this.fetchClusterResources(NODE),
-      events:       this.fetchClusterResources(EVENT),
-      metricNodes:  this.fetchClusterResources(METRIC.NODE),
-      settings:     this.fetchClusterResources(HCI.SETTING),
-      services:     this.fetchClusterResources(SERVICE),
-      metric:       this.fetchClusterResources(METRIC.NODE),
-      longhornNode: this.fetchClusterResources(LONGHORN.NODES) || [],
-      _pods:        this.$store.dispatch('harvester/findAll', { type: POD }),
+      vms:              this.fetchClusterResources(HCI.VM),
+      nodes:            this.fetchClusterResources(NODE),
+      events:           this.fetchClusterResources(EVENT),
+      metricNodes:      this.fetchClusterResources(METRIC.NODE),
+      settings:         this.fetchClusterResources(HCI.SETTING),
+      services:         this.fetchClusterResources(SERVICE),
+      metric:           this.fetchClusterResources(METRIC.NODE),
+      longhornNodes:    this.fetchClusterResources(LONGHORN.NODES),
+      longhornSettings: this.fetchClusterResources(LONGHORN.SETTINGS),
+      _pods:            this.$store.dispatch('harvester/findAll', { type: POD }),
     };
 
     (this.accessibleResources || []).map((a) => {
@@ -155,6 +156,10 @@ export default {
       hash.addons = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS });
     }
 
+    if (this.$store.getters[`${ inStore }/schemaFor`](LONGHORN.NODES)) {
+      this.hasLonghornSchema = true;
+    }
+
     const res = await allHash(hash);
 
     for ( const k in res ) {
@@ -226,6 +231,7 @@ export default {
       showClusterMetrics:     false,
       showVmMetrics:          false,
       enabledMonitoringAddon: false,
+      hasLonghornSchema:      false,
     };
   },
 
@@ -305,8 +311,7 @@ export default {
 
     currentVersion() {
       const inStore = this.$store.getters['currentProduct'].inStore;
-      const settings = this.$store.getters[`${ inStore }/all`](HCI.SETTING);
-      const setting = settings.find( S => S.id === 'server-version');
+      const setting = this.$store.getters[`${ inStore }/byId`](HCI.SETTING, 'server-version');
 
       return setting?.value || setting?.default;
     },
@@ -364,53 +369,46 @@ export default {
       return out;
     },
 
-    storageUsage() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const longhornNodes = this.$store.getters[`${ inStore }/all`](LONGHORN.NODES) || [];
-
-      return longhornNodes.filter(node => node.spec?.allowScheduling).reduce((total, node) => {
-        return total + node.used;
-      }, 0);
-    },
-
-    storageReservedTotal() {
-      let out = 0;
-
-      (this.longhornNode || []).filter(node => node.spec?.allowScheduling).forEach((node) => {
+    storageStats() {
+      const storageOverProvisioningPercentageSetting = this.longhornSettings.find(s => s.id === 'longhorn-system/storage-over-provisioning-percentage');
+      const stats = this.longhornNodes.reduce((total, node) => {
         const disks = node?.spec?.disks || {};
-
-        Object.values(disks).map((disk) => {
-          if (disk.allowScheduling) {
-            out += disk.storageReserved;
-          }
-        });
-      });
-
-      return out;
-    },
-
-    storageTotal() {
-      let out = 0;
-
-      (this.longhornNode || []).forEach((node) => {
         const diskStatus = node?.status?.diskStatus || {};
 
-        Object.values(diskStatus).map((disk) => {
-          if (disk?.storageMaximum) {
-            out += disk.storageMaximum;
-          }
+        total.used += node?.spec?.allowScheduling ? node.used : 0;
+
+        Object.keys(disks).map((key) => {
+          total.scheduled += node?.spec?.allowScheduling ? (diskStatus[key]?.storageScheduled || 0) : 0;
+          total.reserved += disks[key]?.storageReserved || 0;
         });
+        Object.values(diskStatus).map((diskStat) => {
+          total.maximum += diskStat?.storageMaximum || 0;
+        });
+
+        return total;
+      }, {
+        used:      0,
+        scheduled: 0,
+        maximum:   0,
+        reserved:  0,
+        total:     0
       });
 
-      return out;
+      stats.total = ((stats.maximum - stats.reserved) * Number(storageOverProvisioningPercentageSetting?.value ?? 0)) / 100;
+
+      return stats;
     },
 
     storageUsed() {
-      return this.createMemoryValues(this.storageTotal, this.storageUsage);
+      const stats = this.storageStats;
+
+      return this.createMemoryValues(stats.maximum, stats.used);
     },
 
-    storageReserved() {
-      return this.createMemoryValues(this.storageTotal, this.storageReservedTotal);
+    storageAllocated() {
+      const stats = this.storageStats;
+
+      return this.createMemoryValues(stats.total, stats.scheduled);
     },
 
     vmEvents() {
@@ -644,7 +642,7 @@ export default {
       <div
         class="hardware-resource-gauges"
         :class="{
-          live: !storageTotal,
+          live: !hasLonghornSchema,
         }"
       >
         <HardwareResourceGauge
@@ -658,10 +656,11 @@ export default {
           :used="ramUsed"
         />
         <HardwareResourceGauge
-          v-if="storageTotal"
+          v-if="hasLonghornSchema"
           :name="t('harvester.dashboard.hardwareResourceGauge.storage')"
           :used="storageUsed"
-          :reserved="storageReserved"
+          :reserved="storageAllocated"
+          :reserved-title="t('clusterIndexPage.hardwareResourceGauge.allocated')"
         />
       </div>
     </template>
diff --git a/pkg/harvester/list/harvesterhci.io.host.vue b/pkg/harvester/list/harvesterhci.io.host.vue
index c2bbe270..573ebd53 100644
--- a/pkg/harvester/list/harvesterhci.io.host.vue
+++ b/pkg/harvester/list/harvesterhci.io.host.vue
@@ -8,6 +8,7 @@ import {
 import { allHash } from '@shell/utils/promise';
 import metricPoller from '@shell/mixins/metric-poller';
 import { HCI } from '../types';
+import { DOC_LINKS } from '../config/doc-links';
 
 const schema = {
   id:         HCI.HOST,
@@ -91,6 +92,7 @@ export default {
           value:     'internalIp',
           formatter: 'CopyToClipboard',
           sort:      ['internalIp'],
+          align:     'center',
         },
       ];
 
@@ -98,7 +100,7 @@ export default {
         const metricCol = [
           {
             name:          'cpu',
-            labelKey:      'tableHeaders.cpu',
+            labelKey:      'node.detail.glance.consumptionGauge.cpu',
             value:         'id',
             formatter:     'HarvesterCPUUsed',
             formatterOpts: { showUsed: true },
@@ -121,12 +123,23 @@ export default {
           labelKey:      'tableHeaders.storage',
           value:         'id',
           formatter:     'HarvesterStorageUsed',
-          formatterOpts: { showReserved: true },
+          formatterOpts: { showAllocated: true },
         };
 
         out.splice(-1, 0, storageHeader);
       }
 
+      out.push({
+        name:          'cpuManager',
+        labelKey:      'harvester.tableHeaders.cpuManager',
+        value:         'id',
+        formatter:     'HarvesterCPUPinning',
+        formatterOpts: { rows: this.rows },
+        width:         150,
+        align:         'center',
+
+      });
+
       if (this.hasLonghornSchema) {
         out.push({
           name:      'diskState',
@@ -143,7 +156,7 @@ export default {
         name:  'console',
         label: ' ',
         align: 'right',
-        width: 65,
+        width: 80,
       });
 
       return out;
@@ -151,6 +164,10 @@ export default {
 
     schema() {
       return schema;
+    },
+
+    consoleDocLink() {
+      return DOC_LINKS.CONSOLE_URL;
     }
   },
   methods: {
@@ -169,7 +186,15 @@ export default {
 
     goto(row) {
       window.open(row.consoleUrl, '_blank');
-    }
+    },
+
+    consoleTooltip(row) {
+      if (!row.consoleUrl) {
+        return this.t('harvester.host.noConsoleUrl');
+      }
+
+      return '';
+    },
   },
 
   typeDisplay() {
@@ -199,10 +224,19 @@ export default {
       
     >
       <template #cell:console="{row}">
-        <button type="button" class="btn btn-sm role-primary" :disabled="!row.consoleUrl" @click="goto(row)">
-          {{ t('harvester.host.console') }}
-        </button>
+        <div class="console-button">
+          <button v-clean-tooltip="consoleTooltip(row)" type="button" class="mr-5 btn btn-sm role-primary" :disabled="!row.consoleUrl" @click="goto(row)">
+            {{ t('harvester.host.console') }}
+          </button>
+          <a v-if="!row.consoleUrl" :href="consoleDocLink" target="_blank"><i class="icon icon-info" /></a>
+        </div>
       </template>
     </ResourceTable>
   </div>
 </template>
+
+<style lang="scss" scoped>
+  .console-button {
+    display: flex;
+  }
+</style>
diff --git a/pkg/harvester/list/harvesterhci.io.monitoring.alertmanagerconfig.vue b/pkg/harvester/list/harvesterhci.io.monitoring.alertmanagerconfig.vue
index 0b177db4..30c87256 100644
--- a/pkg/harvester/list/harvesterhci.io.monitoring.alertmanagerconfig.vue
+++ b/pkg/harvester/list/harvesterhci.io.monitoring.alertmanagerconfig.vue
@@ -103,7 +103,6 @@ export default {
       :schema="schema"
       :rows="rows"
       key-field="_key"
-      
     />
   </div>
 </template>
diff --git a/pkg/harvester/list/harvesterhci.io.volume.vue b/pkg/harvester/list/harvesterhci.io.volume.vue
index 044b031c..26f0df57 100644
--- a/pkg/harvester/list/harvesterhci.io.volume.vue
+++ b/pkg/harvester/list/harvesterhci.io.volume.vue
@@ -56,8 +56,6 @@ export default {
       this.$store.dispatch('type-map/configureType', { match: HCI.VOLUME, isCreatable: false });
     }
 
-    console.log('ppppppppppp', hash);
-
     this.rows = hash.pvcs;
   },
 
@@ -151,23 +149,23 @@ export default {
     
   >
     <template
-      cell:state="scope"
-    >
+cell:state="scope"
+>
       <div class="state">
         <HarvesterVolumeState
-          class="vmstate"
-          :row="scope.row"
-        />
+class="vmstate"
+:row="scope.row"
+/>
       </div>
     </template>
     <template
-      cell:AttachedVM="scope"
-    >
+cell:AttachedVM="scope"
+>
       <div>
         <router-link
-          v-if="getVMName(scope.row)"
-          :to="goTo(scope.row)"
-        >
+v-if="getVMName(scope.row)"
+:to="goTo(scope.row)"
+>
           {{ getVMName(scope.row) }}
         </router-link>
       </div>
diff --git a/pkg/harvester/list/kubevirt.io.virtualmachine.vue b/pkg/harvester/list/kubevirt.io.virtualmachine.vue
index d67142c2..73d44691 100644
--- a/pkg/harvester/list/kubevirt.io.virtualmachine.vue
+++ b/pkg/harvester/list/kubevirt.io.virtualmachine.vue
@@ -81,6 +81,10 @@ export default {
       backups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
     };
 
+    if (this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA)) {
+      _hash.resourceQuotas = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA });
+    }
+
     if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
       _hash.nodes = this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
       this.hasNode = true;
@@ -116,7 +120,7 @@ export default {
     headers() {
       const restoreCol = {
         name:      'restoreProgress',
-        labelKey:  'tableHeaders.restore',
+        labelKey:  'harvester.tableHeaders.restore',
         value:     'restoreProgress',
         align:     'left',
         formatter: 'HarvesterBackupProgressBar',
@@ -128,7 +132,7 @@ export default {
         value:     'nodeName',
         sort:      ['realAttachNodeName'],
         formatter: 'HarvesterHost',
-        labelKey:  'tableHeaders.node'
+        labelKey:  'harvester.tableHeaders.vm.node'
       };
 
       const cols = clone(VM_HEADERS);
@@ -137,7 +141,7 @@ export default {
         cols.splice(-1, 0, nodeCol);
       }
 
-      if (this.hasRestoredVMs) {
+      if (this.hasBackUpRestoreInProgress) {
         cols.splice(-1, 0, restoreCol);
       }
 
@@ -150,8 +154,11 @@ export default {
       return [...this.allVMs, ...matchVMIs];
     },
 
-    hasRestoredVMs() {
-      return !!this.rows.find(r => !!r.restoreResource);
+    /**
+     * We want to show the progress bar only for Backup's restore; snapshot's restore is immediate.
+     */
+    hasBackUpRestoreInProgress() {
+      return !!this.rows.find(r => r.restoreResource && !r.restoreResource.fromSnapshot && !r.restoreResource.isComplete);
     }
   },
 
@@ -179,7 +186,7 @@ export default {
       key-field="_key"
       
     >
-      <template cell:state="scope">
+      <template cell:state="scope" class="state-col">
         <div class="state">
           <HarvesterVmState class="vmstate" :row="scope.row" :all-node-network="allNodeNetworks" :all-cluster-network="allClusterNetworks" />
         </div>
diff --git a/pkg/harvester/mixins/harvester-vm/impl.js b/pkg/harvester/mixins/harvester-vm/impl.js
index 128bb6cf..ed6ae1d2 100644
--- a/pkg/harvester/mixins/harvester-vm/impl.js
+++ b/pkg/harvester/mixins/harvester-vm/impl.js
@@ -144,6 +144,10 @@ export default {
       return !!spec?.template?.spec?.domain?.firmware?.bootloader?.efi?.secureBoot;
     },
 
+    isCpuPinning(spec) {
+      return !!spec?.template?.spec?.domain?.cpu?.dedicatedCpuPlacement;
+    },
+
     getCloudInitNoCloud(spec) {
       const secret = this.getSecret(spec);
       let userData = secret?.decodedData?.userdata;
diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
index 7ac38f8b..76b1d923 100644
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@@ -18,7 +18,7 @@ import {
 import { HOSTNAME } from '@shell/config/labels-annotations';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { uniq } from '@shell/utils/array';
-import { ADD_ONS, SOURCE_TYPE, ACCESS_CREDENTIALS } from '../../config/harvester-map';
+import { ADD_ONS, SOURCE_TYPE, ACCESS_CREDENTIALS, maintenanceStrategies, runStrategies } from '../../config/harvester-map';
 import { HCI_SETTING } from '../../config/settings';
 import { HCI } from '../../types';
 import { parseVolumeClaimTemplates } from '../../utils/vm';
@@ -136,6 +136,9 @@ export default {
       spec:                          null,
       osType:                        'linux',
       sshKey:                        [],
+      maintenanceStrategies,
+      maintenanceStrategy:           'Migrate',
+      runStrategies,
       runStrategy:                   'RerunOnFailure',
       installAgent:                  true,
       hasCreateVolumes:              [],
@@ -164,6 +167,7 @@ export default {
       enabledSriovgpu:               false,
       immutableMode:                 this.realMode === _CREATE ? _CREATE : _VIEW,
       terminationGracePeriodSeconds: '',
+      cpuPinning:                    false,
     };
   },
 
@@ -316,6 +320,11 @@ export default {
         };
       }
 
+      if (!vm.metadata.labels) {
+        vm.metadata.labels = {};
+      }
+      const maintenanceStrategy = vm.metadata.labels?.[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY] || 'Migrate';
+
       const runStrategy = spec.runStrategy || 'RerunOnFailure';
       const machineType = value.machineType;
       const cpu = spec.template.spec.domain?.cpu?.cores;
@@ -352,6 +361,7 @@ export default {
       const efiEnabled = this.isEfiEnabled(spec);
       const tpmEnabled = this.isTpmEnabled(spec);
       const secureBoot = this.isSecureBoot(spec);
+      const cpuPinning = this.isCpuPinning(spec);
 
       const secretRef = this.getSecret(spec);
       const accessCredentials = this.getAccessCredentials(spec);
@@ -362,6 +372,7 @@ export default {
       }
 
       this['spec'] = spec;
+      this['maintenanceStrategy'] = maintenanceStrategy;
       this['runStrategy'] = runStrategy;
       this['secretRef'] = secretRef;
       this['accessCredentials'] = accessCredentials;
@@ -382,6 +393,7 @@ export default {
       this['efiEnabled'] = efiEnabled;
       this['tpmEnabled'] = tpmEnabled;
       this['secureBoot'] = secureBoot;
+      this['cpuPinning'] = cpuPinning;
 
       this['hasCreateVolumes'] = hasCreateVolumes;
       this['networkRows'] = networkRows;
@@ -401,15 +413,37 @@ export default {
       let out = [];
 
       if (_disks.length === 0) {
+        let bus = 'virtio';
+        let type = HARD_DISK;
+        let size = '10Gi';
+
+        const imageResource = this.images.find( I => this.imageId === I.id);
+        const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
+        const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
+
+        if (isIsoImage) {
+          bus = 'sata';
+          type = CD_ROM;
+        }
+
+        if (imageSize) {
+          let imageSizeGiB = Math.ceil(imageSize / 1024 / 1024 / 1024);
+
+          if (!isIsoImage) {
+            imageSizeGiB = Math.max(imageSizeGiB, 10);
+          }
+          size = `${ imageSizeGiB }Gi`;
+        }
+
         out.push({
           id:               randomStr(5),
           source:           SOURCE_TYPE.IMAGE,
           name:             'disk-0',
           accessMode:       'ReadWriteMany',
-          bus:              'virtio',
+          bus,
           volumeName:       '',
-          size:             '10Gi',
-          type:             HARD_DISK,
+          size,
+          type,
           storageClassName: '',
           image:            this.imageId,
           volumeMode:       'Block',
@@ -574,6 +608,12 @@ export default {
       } else {
         vm.metadata.annotations[HCI_ANNOTATIONS.VM_RESERVED_MEMORY] = this.reservedMemory;
       }
+
+      if (this.maintenanceStrategy === 'Migrate') {
+        delete vm.metadata.labels[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY];
+      } else {
+        vm.metadata.labels[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY] = this.maintenanceStrategy;
+      }
     },
 
     parseDiskRows(disk) {
@@ -681,27 +721,24 @@ export default {
           spec = this.multiVMScheduler(spec);
         }
 
-        this.value.metadata['annotations'] = {
-          ...this.value.metadata.annotations,
+        this.value.metadata['annotations'] = {...this.value.metadata.annotations,
           [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: JSON.stringify(volumeClaimTemplates),
-          [HCI_ANNOTATIONS.NETWORK_IPS]:           JSON.stringify(this.value.networkIps)
-        };
+          [HCI_ANNOTATIONS.NETWORK_IPS]:           JSON.stringify(this.value.networkIps)};
 
-        this.value.metadata['labels'] = {
-          ...this.value.metadata.labels,
+        this.value.metadata['labels'] = {...this.value.metadata.labels,
           [HCI_ANNOTATIONS.CREATOR]: 'harvester',
-          [HCI_ANNOTATIONS.OS]:      this.osType
-        };
+          [HCI_ANNOTATIONS.OS]:      this.osType};
 
         this.value['spec'] = spec;
         this['spec'] = spec;
       } else if (this.resource === HCI.VM_VERSION) {
         this.value.spec.vm['spec'] = spec;
-        this.value.spec.vm.metadata['annotations'] = { ...this.value.spec.vm.metadata.annotations, [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: JSON.stringify(volumeClaimTemplates) };
-        this.value.spec.vm.metadata['labels'] = {
-          ...this.value.spec.vm.metadata.labels,
-          [HCI_ANNOTATIONS.OS]: this.osType
+        this.value.spec.vm.metadata['annotations'] = {
+          ...this.value.spec.vm.metadata.annotations,
+          [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: JSON.stringify(volumeClaimTemplates),
         };
+        this.value.spec.vm.metadata['labels'] = {...this.value.spec.vm.metadata.labels,
+          [HCI_ANNOTATIONS.OS]: this.osType,};
         this['spec'] = spec;
       }
     },
@@ -819,6 +856,10 @@ export default {
       }
     },
 
+    getMaintenanceStrategyOptionLabel(opt) {
+      return this.t(`harvester.virtualMachine.maintenanceStrategy.options.${ opt.label || opt }`);
+    },
+
     getInitUserData(config) {
       const _QGA_JSON = this.getMatchQGA(config.osType);
 
@@ -1339,6 +1380,14 @@ export default {
       }
     },
 
+    setCpuPinning(value) {
+      if (value) {
+        set(this.spec.template.spec.domain.cpu, 'dedicatedCpuPlacement', true);
+      } else {
+        delete this.spec.template.spec.domain.cpu['dedicatedCpuPlacement'];
+      }
+    },
+
     setTPM(tpmEnabled) {
       if (tpmEnabled) {
         set(this.spec.template.spec.domain.devices, 'tpm', {});
@@ -1462,6 +1511,10 @@ export default {
       this.setBootMethod({ efi: this.efiEnabled, secureBoot: val });
     },
 
+    cpuPinning(value) {
+      this.setCpuPinning(value);
+    },
+
     tpmEnabled(val) {
       this.setTPM(val);
     },
diff --git a/pkg/harvester/models/harvester/namespace.js b/pkg/harvester/models/harvester/namespace.js
index 4d392df9..41d79448 100644
--- a/pkg/harvester/models/harvester/namespace.js
+++ b/pkg/harvester/models/harvester/namespace.js
@@ -5,6 +5,7 @@ import SYSTEM_NAMESPACES from '@shell/config/system-namespaces';
 import { get } from '@shell/utils/object';
 import { NAMESPACE } from '@shell/config/types';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '@pkg/harvester/config/harvester';
+import { HCI } from '../../types';
 
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
@@ -37,15 +38,32 @@ export default class HciNamespace extends namespace {
       weight:     -10,
     };
 
+    const editQuotaAction = {
+      action:  'editNSQuota',
+      label:   this.t('harvester.modal.quota.editQuota'),
+      icon:    'icon icon-storage',
+      enabled: !!this?.actions?.updateResourceQuota && !!this?.actions?.deleteResourceQuota,
+      weight:  -11,
+    };
+
     if (remove > -1) {
       out.splice(remove, 1);
     }
 
     insertAt(out, out.length - 1, promptRemove);
+    insertAt(out, out.length - 5, editQuotaAction);
 
     return out;
   }
 
+  editNSQuota(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      snapshotSizeQuota: this.snapshotSizeQuota,
+      component:         'HarvesterQuotaDialog'
+    });
+  }
+
   promptRemove(resources = this) {
     this.$dispatch('promptModal', {
       resources,
@@ -54,6 +72,17 @@ export default class HciNamespace extends namespace {
     });
   }
 
+  get nsResourceQuota() {
+    const inStore = this.$rootGetters['currentProduct'].inStore;
+    const allResQuotas = this.$rootGetters[`${ inStore }/all`](HCI.RESOURCE_QUOTA);
+
+    return allResQuotas.find( RQ => RQ.metadata.namespace === this.id);
+  }
+
+  get snapshotSizeQuota() {
+    return this.nsResourceQuota?.spec?.snapshotLimit?.namespaceTotalSnapshotSizeQuota;
+  }
+
   get isSystem() {
     const systemNamespaces = ['fleet-default'];
 
diff --git a/pkg/harvester/models/harvester/node.js b/pkg/harvester/models/harvester/node.js
index b59a8805..0ad445b7 100644
--- a/pkg/harvester/models/harvester/node.js
+++ b/pkg/harvester/models/harvester/node.js
@@ -59,6 +59,22 @@ export default class HciNode extends HarvesterResource {
       total:   1
     };
 
+    const enableCPUManager = {
+      action:  'enableCPUManager',
+      enabled: this.hasAction('enableCPUManager') && !this.isCPUManagerEnableInProgress && !this.isCPUManagerEnabled && !this.isEtcd, // witness node doesn't have CPU manager
+      icon:    'icon icon-fw icon-os-management',
+      label:   this.t('harvester.action.enableCPUManager'),
+      total:   1
+    };
+
+    const disableCPUManager = {
+      action:  'disableCPUManager',
+      enabled: this.hasAction('disableCPUManager') && !this.isCPUManagerEnableInProgress && this.isCPUManagerEnabled && !this.isEtcd,
+      icon:    'icon icon-fw icon-os-management',
+      label:   this.t('harvester.action.disableCPUManager'),
+      total:   1
+    };
+
     const shutDown = {
       action:  'shutDown',
       enabled: this.hasAction('powerActionPossible') && this.hasAction('powerAction') && !this.isStopped && !!this.inventory,
@@ -88,6 +104,8 @@ export default class HciNode extends HarvesterResource {
       uncordon,
       enableMaintenance,
       disableMaintenance,
+      enableCPUManager,
+      disableCPUManager,
       shutDown,
       powerOn,
       reboot,
@@ -134,15 +152,12 @@ export default class HciNode extends HarvesterResource {
 
   get consoleUrl() {
     const url = this.metadata?.annotations?.[HCI_ANNOTATIONS.HOST_CONSOLE_URL];
+    const validator = /^[a-z]+:\/\//;
 
-    if (!url) {
+    if (!url?.match(validator)) {
       return false;
     }
 
-    if (!url.startsWith('http://') && !url.startsWith('https://')) {
-      return `http://${ url }`;
-    }
-
     return url;
   }
 
@@ -308,6 +323,14 @@ export default class HciNode extends HarvesterResource {
     this.doAction('disableMaintenanceMode', {});
   }
 
+  enableCPUManager() {
+    this.doActionGrowl('enableCPUManager', {});
+  }
+
+  disableCPUManager() {
+    this.doActionGrowl('disableCPUManager', {});
+  }
+
   get isUnSchedulable() {
     return (
       this.metadata?.labels?.[HCI_ANNOTATIONS.NODE_SCHEDULABLE] === 'false' ||
@@ -347,6 +370,28 @@ export default class HciNode extends HarvesterResource {
     );
   }
 
+  get isCPUManagerEnabled() {
+    return this.metadata?.labels?.[HCI_ANNOTATIONS.CPU_MANAGER] === 'true';
+  }
+
+  get isCPUManagerEnableInProgress() {
+    return this.cpuManagerUpdateStatus === 'requested' || this.cpuManagerUpdateStatus === 'running';
+  }
+
+  get isCPUManagerEnableFailed() {
+    return this.cpuManagerUpdateStatus === 'failed';
+  }
+
+  get cpuManagerUpdateStatus() {
+    try {
+      const cpuManagerUpdate = JSON.parse(this.metadata.annotations[HCI_ANNOTATIONS.NODE_CPU_MANAGER_UPDATE_STATUS] || '{}');
+
+      return cpuManagerUpdate.status || '';
+    } catch {
+      return '';
+    }
+  }
+
   get longhornDisks() {
     const inStore = this.$rootGetters['currentProduct'].inStore;
     const longhornNode = this.$rootGetters[`${ inStore }/byId`](
diff --git a/pkg/harvester/models/harvester/persistentvolumeclaim.js b/pkg/harvester/models/harvester/persistentvolumeclaim.js
index 1d985cdc..5c2323ac 100644
--- a/pkg/harvester/models/harvester/persistentvolumeclaim.js
+++ b/pkg/harvester/models/harvester/persistentvolumeclaim.js
@@ -20,12 +20,10 @@ export default class HciPv extends HarvesterResource {
     const storageClassName =
       realMode === _CLONE ? this.spec.storageClassName : '';
 
-    this['spec'] = {
-      accessModes,
+    this['spec'] = {accessModes,
       storageClassName,
       volumeName: '',
-      resources:  { requests: { storage } }
-    };
+      resources:  { requests: { storage } }};
   }
 
   get availableActions() {
@@ -98,7 +96,6 @@ export default class HciPv extends HarvesterResource {
   }
 
   get stateDisplay() {
-    const ownedBy = this?.metadata?.annotations?.[HCI_ANNOTATIONS.OWNED_BY];
     const volumeError = this.relatedPV?.metadata?.annotations?.[HCI_ANNOTATIONS.VOLUME_ERROR];
     const degradedVolume = volumeError === DEGRADED_ERROR;
     const status = this?.status?.phase === 'Bound' && !volumeError && this.isLonghornVolumeReady ? 'Ready' : 'Not Ready';
@@ -107,7 +104,7 @@ export default class HciPv extends HarvesterResource {
 
     if (findBy(conditions, 'type', 'Resizing')?.status === 'True') {
       return 'Resizing';
-    } else if (ownedBy && !volumeError) {
+    } else if (!!this.attachVM && !volumeError) {
       return 'In-use';
     } else if (degradedVolume) {
       return 'Degraded';
@@ -179,17 +176,19 @@ export default class HciPv extends HarvesterResource {
   }
 
   get attachVM() {
-    const allVMs = this.$rootGetters['harvester/all'](HCI.VM);
-    const ownedBy =
-      get(this, `metadata.annotations."${ HCI_ANNOTATIONS.OWNED_BY }"`) || '';
+    const allVMs = this.$rootGetters['harvester/all'](HCI.VM) || [];
+
+    const findAttachVM = (vm) => {
+      const attachVolumes = vm.spec.template?.spec?.volumes || [];
+
+      if (vm.namespace === this.namespace && attachVolumes.length > 0) {
+        return attachVolumes.find(vol => vol.persistentVolumeClaim?.claimName === this.name);
+      }
 
-    if (!ownedBy) {
       return null;
-    }
+    };
 
-    const ownedId = JSON.parse(ownedBy)[0]?.refs?.[0];
-
-    return allVMs.find(D => D.id === ownedId);
+    return allVMs.find(findAttachVM);
   }
 
   get isAvailable() {
diff --git a/pkg/harvester/models/harvesterhci.io.upgrade.js b/pkg/harvester/models/harvesterhci.io.upgrade.js
index 8c323c01..62235e0b 100644
--- a/pkg/harvester/models/harvesterhci.io.upgrade.js
+++ b/pkg/harvester/models/harvesterhci.io.upgrade.js
@@ -9,6 +9,10 @@ export default class HciUpgrade extends HarvesterResource {
     return this?.metadata?.labels?.[HCI.LATEST_UPGRADE] === 'true';
   }
 
+  get isUpgradeFailed() {
+    return this?.metadata?.labels?.[HCI.UPGRADE_STATE] === 'Failed';
+  }
+
   get isUpgradeSucceeded() {
     return this?.metadata?.labels?.[HCI.UPGRADE_STATE] === 'Succeeded';
   }
@@ -117,10 +121,10 @@ export default class HciUpgrade extends HarvesterResource {
   get upgradeImageMessage() {
     const conditions = this?.status?.conditions || [];
     const imageReady = conditions.find( cond => cond.type === 'ImageReady');
-    const hasError = imageReady?.status === 'False';
+    const success = imageReady?.status === 'True';
     const message = imageReady?.message || imageReady?.reason;
 
-    return hasError ? message : '';
+    return success ? '' : message;
   }
 
   get nodeUpgradeMessage() {
diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js b/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
index 0dbe9bb3..72e83e8f 100644
--- a/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
+++ b/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
@@ -47,7 +47,7 @@ export default class HciVmImage extends HarvesterResource {
       {
         action:   'createFromImage',
         enabled:  canCreateVM,
-        icon:     'icon icon-fw icon-spinner',
+        icon:     'icon icon-circle-plus',
         label:    this.t('harvester.action.createVM'),
         disabled: !this.isReady,
       },
@@ -74,7 +74,7 @@ export default class HciVmImage extends HarvesterResource {
     router.push({
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
       params: { resource: HCI.VM },
-      query:  { image: this.id }
+      query:  { image: this.id, fromPage: HCI.IMAGE }
     });
   }
 
@@ -101,6 +101,10 @@ export default class HciVmImage extends HarvesterResource {
     const imported = this.getStatusConditionOfType('Imported');
 
     if (imported?.status === 'Unknown') {
+      if (this.spec.sourceType === 'restore') {
+        return 'Restoring';
+      }
+
       if (this.spec.sourceType === 'download') {
         return 'Downloading';
       }
@@ -131,7 +135,8 @@ export default class HciVmImage extends HarvesterResource {
     const conditions = this?.status?.conditions || [];
     const initialized = conditions.find( cond => cond.type === 'Initialized');
     const imported = conditions.find( cond => cond.type === 'Imported');
-    const message = initialized?.message || imported?.message;
+    const retryLimitExceeded = conditions.find( cond => cond.type === 'RetryLimitExceeded');
+    const message = initialized?.message || imported?.message || retryLimitExceeded?.message;
 
     return ucFirst(message);
   }
@@ -167,6 +172,21 @@ export default class HciVmImage extends HarvesterResource {
     });
   }
 
+  get virtualSize() {
+    const virtualSize = this.status?.virtualSize;
+
+    if (!virtualSize) {
+      return '-';
+    }
+
+    return formatSi(virtualSize, {
+      increment:    1024,
+      maxPrecision: 2,
+      suffix:       'B',
+      firstSuffix:  'B',
+    });
+  }
+
   getStatusConditionOfType(type, defaultValue = []) {
     const conditions = Array.isArray(get(this, 'status.conditions')) ? this.status.conditions : defaultValue;
 
diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js
index 8848e1b2..312a83a5 100644
--- a/pkg/harvester/models/kubevirt.io.virtualmachine.js
+++ b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@@ -133,7 +133,7 @@ export default class VirtVm extends HarvesterResource {
       {
         action:  'softrebootVM',
         enabled: !!this.actions?.softreboot,
-        icon:    'icon icon-refresh',
+        icon:    'icon icon-pipeline',
         label:   this.t('harvester.action.softreboot')
       },
       {
@@ -152,9 +152,15 @@ export default class VirtVm extends HarvesterResource {
       {
         action:  'takeVMSnapshot',
         enabled: !!this.actions?.backup,
-        icon:    'icon icon-backup',
+        icon:    'icon icon-snapshot',
         label:   this.t('harvester.action.vmSnapshot')
       },
+      {
+        action:  'editVMQuota',
+        enabled: !!this.actions?.updateResourceQuota && !!this.actions.deleteResourceQuota,
+        icon:    'icon icon-storage',
+        label:   this.t('harvester.action.editVMQuota')
+      },
       {
         action:  'restoreVM',
         enabled: !!this.actions?.restore,
@@ -331,6 +337,14 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
+  editVMQuota(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      snapshotSizeQuota: this.snapshotSizeQuota,
+      component:         'HarvesterQuotaDialog'
+    });
+  }
+
   unplugVolume(diskName) {
     const resources = this;
 
@@ -541,6 +555,17 @@ export default class VirtVm extends HarvesterResource {
     return null;
   }
 
+  get nsResourceQuota() {
+    const inStore = this.productInStore;
+    const allResQuotas = this.$rootGetters[`${ inStore }/all`](HCI.RESOURCE_QUOTA);
+
+    return allResQuotas.find( RQ => RQ.namespace === this.metadata.namespace);
+  }
+
+  get snapshotSizeQuota() {
+    return this.nsResourceQuota?.spec?.snapshotLimit?.vmTotalSnapshotSizeQuota?.[this.metadata.name];
+  }
+
   get vmi() {
     const inStore = this.productInStore;
 
@@ -646,6 +671,10 @@ export default class VirtVm extends HarvesterResource {
     return null;
   }
 
+  get isTerminating() {
+    return !!this?.metadata?.deletionTimestamp;
+  }
+
   get otherState() {
     const state = (this.vmi &&
       [VMIPhase.Scheduling, VMIPhase.Scheduled].includes(
@@ -685,18 +714,21 @@ export default class VirtVm extends HarvesterResource {
 
     const allRestore = this.$rootGetters[`${ inStore }/all`](HCI.RESTORE);
 
-    return allRestore.find(O => O.id === id);
+    const res = allRestore.find(O => O.id === id);
+
+    if (res) {
+      const allBackups = this.$rootGetters[`${ inStore }/all`](HCI.BACKUP);
+
+      res.fromSnapshot = !!allBackups
+        .filter(b => b.spec?.type !== BACKUP_TYPE.BACKUP)
+        .find(s => s.id === `${ res.spec?.virtualMachineBackupNamespace }/${ res.spec?.virtualMachineBackupName }`);
+    }
+
+    return res;
   }
 
   get restoreProgress() {
-    const inStore = this.productInStore;
-    const allBackups = this.$rootGetters[`${ inStore }/all`](HCI.BACKUP);
-
-    const isSnapshotRestore = !!allBackups
-      .filter(b => b.spec?.type !== BACKUP_TYPE.BACKUP)
-      .find(s => s.id === `${ this.restoreResource?.spec?.virtualMachineBackupNamespace }/${ this.restoreResource?.spec?.virtualMachineBackupName }`);
-
-    if (isSnapshotRestore) {
+    if (this.isVMError || this.isTerminating) {
       return {};
     }
 
@@ -726,7 +758,7 @@ export default class VirtVm extends HarvesterResource {
       return 'Restoring';
     }
 
-    if (this?.metadata?.deletionTimestamp) {
+    if (this.isTerminating) {
       return 'Terminating';
     }
 
diff --git a/pkg/harvester/pages/c/_cluster/support/index.vue b/pkg/harvester/pages/c/_cluster/support/index.vue
index ff8c30ea..3dd79da8 100644
--- a/pkg/harvester/pages/c/_cluster/support/index.vue
+++ b/pkg/harvester/pages/c/_cluster/support/index.vue
@@ -7,6 +7,7 @@ import CommunityLinks from '@shell/components/CommunityLinks';
 import { SCHEMA } from '@shell/config/types';
 import HarvesterSupportBundle from '../../../../dialog/HarvesterSupportBundle';
 import { HCI } from '../../../../types';
+import { DOC_LINKS } from '../../../../config/doc-links';
 
 export default {
   components: {
@@ -71,13 +72,18 @@ export default {
       const { host, params } = this.internalPrefix;
 
       return `https://${ host }/k8s/clusters/${ params.cluster }/api/v1/namespaces/longhorn-system/services/http:longhorn-frontend:80/proxy/#/dashboard`;
-    }
+    },
+
+    rancherIntegrationLink() {
+      return DOC_LINKS.RANCHER_INTEGRATION_URL;
+    },
   },
 
   methods: {
     open() {
       this.$store.commit('harvester-common/toggleBundleModal', true);
-    }
+    },
+
   }
 };
 </script>
@@ -89,10 +95,7 @@ export default {
     <IndentedPanel>
       <div class="content mt-20">
         <div class="promo">
-          <div
-            v-if="showSupportBundle"
-            class="box mb-20 box-primary"
-          >
+          <div v-if="showSupportBundle" class="box mb-20 box-primary">
             <h2>
               {{ t('harvester.modal.bundle.title') }}
             </h2>
@@ -109,10 +112,7 @@ export default {
               </button>
             </div>
           </div>
-          <div
-            class="box box-primary"
-            :class="{'mb-20': dev }"
-          >
+          <div class="box box-primary" :class="{'mb-20': dev }">
             <h2>
               {{ t('harvester.support.kubeconfig.title') }}
             </h2>
@@ -129,41 +129,24 @@ export default {
               </button>
             </div>
           </div>
-          <div
-            v-if="dev"
-            class="row"
-          >
+          <div v-if="dev" class="row">
             <div class="col span-6 box box-primary">
               <h2>
-                <a
-                  rel="nofollow noopener noreferrer"
-                  target="_blank"
-                  :href="rancherLink"
-                >{{ t('harvester.support.internal.rancher.title') }} <i class="icon icon-external-link" /></a>
+                <a rel="nofollow noopener noreferrer" target="_blank" :href="rancherLink">{{ t('harvester.support.internal.rancher.title') }} <i class="icon icon-external-link" /></a>
               </h2>
               <div>
                 <p class="warning">
-                  <t
-                    k="harvester.support.internal.rancher.titleDescription"
-                    :raw="true"
-                  />
+                  <t k="harvester.support.internal.rancher.titleDescription" :raw="true" :url="rancherIntegrationLink" />
                 </p>
               </div>
             </div>
             <div class="col span-6 box box-primary">
               <h2>
-                <a
-                  rel="nofollow noopener noreferrer"
-                  target="_blank"
-                  :href="longhornLink"
-                >{{ t('harvester.support.internal.longhorn.title') }} <i class="icon icon-external-link" /></a>
+                <a rel="nofollow noopener noreferrer" target="_blank" :href="longhornLink">{{ t('harvester.support.internal.longhorn.title') }} <i class="icon icon-external-link" /></a>
               </h2>
               <div>
                 <p class="warning">
-                  <t
-                    k="harvester.support.internal.longhorn.titleDescription"
-                    :raw="true"
-                  />
+                  <t k="harvester.support.internal.longhorn.titleDescription" :raw="true" />
                 </p>
               </div>
             </div>
@@ -173,17 +156,9 @@ export default {
           <CommunityLinks :link-options="options" />
         </div>
         <div class="external">
-          <a
-            href="https://www.suse.com/suse-harvester/support-matrix/all-supported-versions"
-            target="_blank"
-            rel="noopener noreferrer nofollow"
-          >{{ t('harvester.support.community.learnMore') }} <i class="icon icon-external-link" /></a>
+          <a href="https://www.suse.com/suse-harvester/support-matrix/all-supported-versions" target="_blank" rel="noopener noreferrer nofollow">{{ t('harvester.support.community.learnMore') }} <i class="icon icon-external-link" /></a>
           or
-          <a
-            href="https://www.suse.com/products/harvester/"
-            target="_blank"
-            rel="noopener noreferrer nofollow"
-          >{{ t('harvester.support.community.pricing') }} <i class="icon icon-external-link" /></a>
+          <a href="https://www.suse.com/products/harvester/" target="_blank" rel="noopener noreferrer nofollow">{{ t('harvester.support.community.pricing') }} <i class="icon icon-external-link" /></a>
         </div>
       </div>
     </IndentedPanel>
diff --git a/pkg/harvester/store/harvester-store/actions.ts b/pkg/harvester/store/harvester-store/actions.ts
index ec89ae3f..c97b1163 100644
--- a/pkg/harvester/store/harvester-store/actions.ts
+++ b/pkg/harvester/store/harvester-store/actions.ts
@@ -18,16 +18,16 @@ export default {
     const cluster = await dispatch('management/find', {
       type: MANAGEMENT.CLUSTER,
       id,
-      opt: { url: `${MANAGEMENT.CLUSTER}s/${escape(id)}` }
+      opt:  { url: `${ MANAGEMENT.CLUSTER }s/${ escape(id) }` }
     }, { root: true });
 
-    let virtualBase = `/k8s/clusters/${escape(id)}/v1/harvester`;
+    let virtualBase = `/k8s/clusters/${ escape(id) }/v1/harvester`;
 
     if (id === 'local') {
       virtualBase = `/v1/harvester`;
     }
 
-    if (!cluster) {
+    if ( !cluster ) {
       commit('clusterId', null, { root: true });
       commit('applyConfig', { baseUrl: null });
       throw new ClusterNotFoundError(id);
@@ -44,22 +44,22 @@ export default {
 
     const projectArgs = {
       type: MANAGEMENT.PROJECT,
-      opt: {
-        url: `${MANAGEMENT.PROJECT}/${escape(id)}`,
+      opt:  {
+        url:            `${ MANAGEMENT.PROJECT }/${ escape(id) }`,
         watchNamespace: id
       }
     };
 
-    const fetchProjects = async () => {
+    const fetchProjects = async() => {
       let limit = 30000;
       const sleep = 100;
 
-      while (limit > 0 && !rootState.managementReady) {
-        await setTimeout(() => { }, sleep);
+      while ( limit > 0 && !rootState.managementReady ) {
+        await setTimeout(() => {}, sleep);
         limit -= sleep;
       }
 
-      if (rootGetters['management/schemaFor'](MANAGEMENT.PROJECT)) {
+      if ( rootGetters['management/schemaFor'](MANAGEMENT.PROJECT) ) {
         return dispatch('management/findAll', projectArgs, { root: true });
       }
     };
@@ -67,8 +67,8 @@ export default {
     if (id !== 'local' && getters['schemaFor'](MANAGEMENT.SETTING)) { // multi-cluster
       const settings = await dispatch('findAll', {
         type: MANAGEMENT.SETTING,
-        id: SETTING.SYSTEM_NAMESPACES,
-        opt: { url: `${virtualBase}/${MANAGEMENT.SETTING}s/`, force: true }
+        id:   SETTING.SYSTEM_NAMESPACES,
+        opt:  { url: `${ virtualBase }/${ MANAGEMENT.SETTING }s/`, force: true }
       });
 
       const systemNamespaces = settings?.find((x: any) => x.id === SETTING.SYSTEM_NAMESPACES);
@@ -80,17 +80,21 @@ export default {
       }
     }
 
-    const hash: { [key: string]: Promise<any> } = {
-      projects: fetchProjects(),
-      virtualCount: dispatch('findAll', { type: COUNT }),
+    const hash: { [key: string]: Promise<any>} = {
+      projects:          fetchProjects(),
+      virtualCount:      dispatch('findAll', { type: COUNT }),
       virtualNamespaces: dispatch('findAll', { type: NAMESPACE }),
-      settings: dispatch('findAll', { type: HCI.SETTING }),
-      clusters: dispatch('management/findAll', {
+      settings:          dispatch('findAll', { type: HCI.SETTING }),
+      clusters:          dispatch('management/findAll', {
         type: MANAGEMENT.CLUSTER,
-        opt: { force: true }
+        opt:  { force: true }
       }, { root: true }),
     };
 
+    if (getters['schemaFor'](HCI.RESOURCE_QUOTA)) {
+      hash.resourceQuota = dispatch('findAll', { type: HCI.RESOURCE_QUOTA });
+    }
+
     if (getters['schemaFor'](HCI.UPGRADE)) {
       hash.upgrades = dispatch('findAll', { type: HCI.UPGRADE });
     }
@@ -101,15 +105,15 @@ export default {
 
     commit('updateNamespaces', {
       filters: [],
-      all: getters.filterNamespace(),
+      all:     getters.filterNamespace(),
       getters
     }, { root: true });
 
     // Solve compatibility with Rancher v2.6.x, fell remove these codes after not support v2.6.x
     const definition = {
-      def: false,
-      parseJSON: true,
-      inheritFrom: DEV,
+      def:              false,
+      parseJSON:        true,
+      inheritFrom:      DEV,
       asUserPreference: true,
     };
 
@@ -134,9 +138,9 @@ export default {
 
     if (isMultiCluster) {
       commit('managementChanged', {
-        ready: true,
+        ready:          true,
         isMultiCluster: true,
-        isRancher: true,
+        isRancher:      true,
       }, { root: true });
     }
   },
diff --git a/pkg/harvester/store/harvester-store/getters.ts b/pkg/harvester/store/harvester-store/getters.ts
index c9e7a1d2..2655cc0e 100644
--- a/pkg/harvester/store/harvester-store/getters.ts
+++ b/pkg/harvester/store/harvester-store/getters.ts
@@ -14,9 +14,9 @@ export default {
     divider,
     notFilterNamespaces
   }: any) => {
-    const out: { id: string, kind: string, label: string }[] = [{
-      id: ALL,
-      kind: NAMESPACE_FILTER_KINDS.SPECIAL,
+    const out = [{
+      id:    ALL,
+      kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
       label: rootGetters['i18n/t']('nav.ns.all'),
     }];
 
@@ -30,11 +30,9 @@ export default {
         MANAGEMENT.PROJECT
       );
 
-      projects = sortBy(
-        filterBy(projects, 'spec.clusterName', cluster.id),
-        ['nameDisplay'],
-        null
-      ).filter((project: any) => project.nameDisplay !== 'System');
+      projects = sortBy(filterBy(projects, 'spec.clusterName', cluster.id), [
+        'nameDisplay',
+      ]).filter((project: any) => project.nameDisplay !== 'System');
 
       const projectsById: any = {};
       const namespacesByProject: any = {};
@@ -72,8 +70,8 @@ export default {
         }
 
         out.push({
-          id: `project://${id}`,
-          kind: 'project',
+          id:    `project://${ id }`,
+          kind:  'project',
           label: project.nameDisplay,
         });
 
@@ -90,8 +88,8 @@ export default {
         }
 
         out.push({
-          id: ALL_ORPHANS,
-          kind: 'project',
+          id:    ALL_ORPHANS,
+          kind:  'project',
           label: rootGetters['i18n/t']('nav.ns.orphan'),
         });
 
diff --git a/pkg/harvester/store/harvester-store/index.ts b/pkg/harvester/store/harvester-store/index.ts
index c1ef33ef..631c593a 100644
--- a/pkg/harvester/store/harvester-store/index.ts
+++ b/pkg/harvester/store/harvester-store/index.ts
@@ -28,12 +28,12 @@ const harvesterFactory = (): CoreStoreSpecifics => {
   return steveFactory;
 };
 const config: CoreStoreConfig = {
-  namespace: PRODUCT_NAME,
+  namespace:      PRODUCT_NAME,
   isClusterStore: true
 };
 
 export default {
   specifics: harvesterFactory(),
   config,
-  init: steveStoreInit
+  init:      steveStoreInit
 };
diff --git a/pkg/harvester/types.ts b/pkg/harvester/types.ts
index 6638cacc..df278670 100644
--- a/pkg/harvester/types.ts
+++ b/pkg/harvester/types.ts
@@ -31,6 +31,7 @@ export const HCI = {
   FLOW:               'harvesterhci.io.logging.flow',
   OUTPUT:             'harvesterhci.io.logging.output',
   STORAGE:            'harvesterhci.io.storage',
+  RESOURCE_QUOTA:     'harvesterhci.io.resourcequota',
   KSTUNED:            'node.harvesterhci.io.ksmtuned',
   PCI_DEVICE:         'devices.harvesterhci.io.pcidevice',
   PCI_CLAIM:          'devices.harvesterhci.io.pcideviceclaim',