feat: add default value (#548)

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>

.eslintignore

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

.github/mergify.yml

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

.github/release.yml

@@ -0,0 +1,40 @@
+# .github/release.yml
+changelog:
+  categories:
+    - title: Features
+      labels:
+        - feat
+    - title: Bug Fixes
+      labels:
+        - fix
+    - title: Dependencies
+      labels:
+        - deps
+    - title: Performance
+      labels:
+        - perf
+    - title: Documentation
+      labels:
+        - docs
+    - title: Style
+      labels:
+        - style
+    - title: Build & Continuous Integration
+      labels:
+        - build
+        - ci
+    - title: Security
+      labels:
+        - security
+    - title: Tests
+      labels:
+        - test
+    - title: Refactoring
+      labels:
+        - refactor
+    - title: Chores
+      labels:
+        - chore
+    - title: Others
+      labels:
+        - other

.github/renovate.json

@@ -1,15 +1,17 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:recommended"],
+    "extends": [
+    "config:recommended",
+    ":semanticCommitTypeAll(deps)",
+    ":semanticCommitScopeDisabled"
+  ],
   "baseBranches": [
-    "master",
     "main",
     "/^release-harvester-v\\d+\\.\\d+$/"
   ],
   "automergeMajor": false,
   "semanticCommits": "enabled",
-  "semanticCommitType": "chore",
-  "semanticCommitScope": "deps",
+  "semanticCommitType": "deps",
   "prHourlyLimit": 12,
   "timezone": "Asia/Taipei",
   "schedule": ["after 10am on sunday"],

.github/workflows/backport-request.yaml

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

.github/workflows/build-extension-on-merge.yml

@@ -132,7 +132,7 @@ jobs:
           git push origin ${{ needs.setup-target-branch.outputs.target_branch }}
 
       - name: Run Helm chart releaser
-        uses: helm/chart-releaser-action@v1.4.1
+        uses: helm/chart-releaser-action@v1.7.0
         with:
           charts_dir: ./charts
         env:

.github/workflows/release-label.yaml

@@ -0,0 +1,30 @@
+name: "[PR Management] Add PR Label"
+
+on:
+  pull_request_target:
+    types: [opened, reopened, edited]
+    branches:
+      - main
+      - 'release-harvester-v*'
+
+permissions:
+  pull-requests: write
+
+jobs:
+  auto-assign-pr-label:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.base_ref }}
+      - name: Setup Nodejs and yarn install
+        uses: ./.github/actions/setup
+      - name: Set PR label
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_LABEL=$(node ./scripts/extract-release-label.mjs "${{ github.event.pull_request.title }}")
+          echo "PR_LABEL = $PR_LABEL"
+          gh pr edit ${{ github.event.pull_request.number }} --repo ${{ github.repository }}  --add-label "$PR_LABEL"

.github/workflows/run-lint.yaml

@@ -7,6 +7,7 @@ on:
       - main
       - 'release-*'
   pull_request:
+    types: [opened, reopened, edited, synchronize]
     branches:
       - main
       - 'release-*'
@@ -22,6 +23,11 @@ jobs:
       - name: Run tests
         uses: ./.github/actions/lint
 
+      - name: Validate PR title lint
+        if: github.event_name == 'pull_request'
+        shell: bash
+        run: echo "${{ github.event.pull_request.title }}" | npx commitlint
+
       - name: Validate commit messages
         shell: bash
         run: |
@@ -44,6 +50,7 @@ jobs:
 
           echo "FROM=$FROM"
           echo "TO=$TO"
+
           npx commitlint --from "$FROM" --to "$TO" --verbose
         env:
           GITHUB_EVENT_NAME: ${{ github.event_name }}

README.md

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

package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.6.0",
+  "version": "1.7.0-dev",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@babel/plugin-transform-class-static-block": "7.26.0",
-    "@rancher/shell": "3.0.5-rc.7",
+    "@babel/plugin-transform-class-static-block": "7.28.3",
+    "@rancher/shell": "3.0.5-rc.8",
     "cache-loader": "^4.1.0",
     "color": "4.2.3",
     "ip": "2.0.1",
@@ -16,21 +16,21 @@
     "yaml": "^2.5.1"
   },
   "resolutions": {
-    "@types/node": "~20.10.0",
-    "cronstrue": "2.50.0",
+    "@types/node": "~20.19.0",
+    "cronstrue": "2.59.0",
     "d3-color": "3.1.0",
     "ejs": "3.1.10",
-    "follow-redirects": "1.15.6",
+    "follow-redirects": "1.15.11",
     "glob": "7.2.3",
     "glob-parent": "6.0.2",
     "json5": "2.2.3",
-    "@types/lodash": "4.17.5",
+    "@types/lodash": "4.17.20",
     "merge": "2.1.1",
     "node-forge": "1.3.1",
     "nth-check": "2.1.1",
-    "qs": "6.11.1",
-    "roarr": "7.0.4",
-    "semver": "7.5.4",
+    "qs": "6.14.0",
+    "roarr": "7.21.1",
+    "semver": "7.7.2",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "scripts": {
@@ -46,6 +46,7 @@
     "prepare": "husky"
   },
   "devDependencies": {
+    "@commitlint/load": "^19.8.1",
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "eslint-plugin-node": "^11.1.0",

pkg/harvester/components/SettingList.vue

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

pkg/harvester/components/novnc/NovncConsoleWrapper.vue

@@ -257,8 +257,12 @@ export default {
       });
     },
 
+    reconnect() {
+      this.$refs.novncConsole.reconnect();
+    },
+
     softReboot() {
-      this.vmResource.softrebootVM();
+      this.vmResource.doSoftReboot();
     },
 
     showKeysModal() {
@@ -306,6 +310,13 @@ export default {
           {{ t("harvester.action.softreboot") }}
         </button>
 
+        <button
+          class="btn btn-sm bg-primary"
+          @click="reconnect"
+        >
+          {{ t("harvester.action.reconnect") }}
+        </button>
+
         <v-dropdown
           v-if="!hideCustomKeysBar"
           ref="customKeyPopover"
@@ -372,3 +383,12 @@ export default {
     background: rgb(40, 40, 40);
   }
 </style>
+
+<style lang="scss">
+  .vm-console .v-popper__arrow-container {
+    display: none;
+  }
+  .vm-console .v-popper__popper{
+    margin-top: 8px;
+  }
+</style>

pkg/harvester/config/doc-links.js

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

pkg/harvester/config/feature-flags.js

@@ -39,7 +39,6 @@ const FEATURE_FLAGS = {
   ],
   'v1.5.1': [],
   'v1.6.0': [
-    'vmMachineTypes',
     'customSupportBundle',
     'csiOnlineExpandValidation',
     'vmNetworkMigration',
@@ -48,6 +47,10 @@ const FEATURE_FLAGS = {
     'cpuMemoryHotplug',
     'cdiSettings',
     'vmCloneRunStrategy',
+  ],
+  'v1.6.1': [],
+  'v1.7.0': [
+    'vmMachineTypeAuto'
   ]
 };
 

pkg/harvester/config/harvester-cluster.js

@@ -10,6 +10,7 @@ import {
   LOGGING,
   STORAGE_CLASS,
   SECRET,
+  NETWORK_POLICY
 } from '@shell/config/types';
 import { HCI, VOLUME_SNAPSHOT } from '../types';
 import {
@@ -425,6 +426,7 @@ export function init($plugin, store) {
       HCI.CLUSTER_NETWORK,
       HCI.NETWORK_ATTACHMENT,
       HCI.VPC,
+      NETWORK_POLICY,
       HCI.LB,
       HCI.IP_POOL,
     ],
@@ -566,6 +568,21 @@ export function init($plugin, store) {
     ifHaveType: HCI.VPC,
   });
 
+  configureType(NETWORK_POLICY, { hiddenNamespaceGroupButton: true, canYaml: false });
+
+  virtualType({
+    labelKey:   'harvester.networkPolicy.label',
+    name:       NETWORK_POLICY,
+    namespaced: true,
+    weight:     186,
+    route:      {
+      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
+      params: { resource: NETWORK_POLICY }
+    },
+    exact:      false,
+    ifHaveType: NETWORK_POLICY,
+  });
+
   configureType(HCI.SNAPSHOT, {
     isCreatable: false,
     location:    {

pkg/harvester/config/settings.ts

@@ -4,7 +4,6 @@ export const HCI_SETTING = {
   LOG_LEVEL:                              'log-level',
   SERVER_VERSION:                         'server-version',
   UI_INDEX:                               'ui-index',
-  UI_PLUGIN_INDEX:                        'ui-plugin-index',
   UPGRADE_CHECKER_ENABLED:                'upgrade-checker-enabled',
   UPGRADE_CHECKER_URL:                    'upgrade-checker-url',
   VLAN:                                   'vlan',
@@ -84,7 +83,6 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.SUPPORT_BUNDLE_NAMESPACES]: { from: 'import', canReset: true },
   [HCI_SETTING.AUTO_DISK_PROVISION_PATHS]: { canReset: true },
   [HCI_SETTING.RELEASE_DOWNLOAD_URL]:      { kind: 'url' },
-  [HCI_SETTING.UI_PLUGIN_INDEX]:           { kind: 'url' },
   [HCI_SETTING.CONTAINERD_REGISTRY]:       {
     kind: 'json', from: 'import', canReset: true
   },

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -338,6 +338,15 @@ export default {
     saveVM(buttonCb) {
       clear(this.errors);
 
+      this.validateCPUMemory();
+
+      // block create VM flow if has validation errors
+      if (this.errors.length) {
+        buttonCb(false);
+
+        return;
+      }
+
       if (this.isSingle) {
         this.saveSingle(buttonCb);
       } else {
@@ -345,6 +354,18 @@ export default {
       }
     },
 
+    validateCPUMemory() {
+      const { cpu, memory } = this;
+
+      if ((!cpu)) {
+        this.errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.cpu') }, true));
+      }
+
+      if ((!memory)) {
+        this.errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.memory') }, true));
+      }
+    },
+
     async saveSingle(buttonCb) {
       this.parseVM();
       this.value.spec.template.spec.hostname = this.hostname ? this.hostname : this.value.metadata.name;
@@ -466,9 +487,7 @@ export default {
         }
       }
 
-      const cpuMemoryErrors = this.getCPUMemoryValidation();
-      const accessCredentialsErrors = this.getAccessCredentialsValidation();
-      const errors = [...cpuMemoryErrors, ...accessCredentialsErrors];
+      const errors = this.getAccessCredentialsValidation();
 
       if (errors.length > 0) {
         return Promise.reject(errors);
@@ -873,7 +892,10 @@ export default {
               />
             </div>
 
-            <div class="col span-6">
+            <div
+              v-if="!value.vmMachineTypeAutoFeatureEnabled"
+              class="col span-6"
+            >
               <LabeledSelect
                 v-model:value="machineType"
                 label-key="harvester.virtualMachine.input.MachineType"

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

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

pkg/harvester/l10n/en-us.yaml

@@ -236,6 +236,7 @@ harvester:
     shutdown: Shut Down
     powerOn: Power On
     reboot: Reboot
+    reconnect: Reconnect
     forceStop: Force Stop
   formatters:
     hardwareResourceGauge:
@@ -403,7 +404,7 @@ harvester:
       sha512: 'Invalid SHA512 checksum.'
     subnet:
       excludeIps: 'Exclude IPs cannot be empty. Please remove or fill in the exclude IPs.'
-
+      aclEmptyError: The fields in subnet access control list rule can not be empty.
   dashboard:
     label: Dashboard
     header: "Harvester Cluster: {cluster}"
@@ -1044,6 +1045,13 @@ harvester:
     gateway:
       label: Gateway IP
       placeholder: e.g. 172.20.0.1
+    dhcp:
+      label: Dynamic Host Configuration Protocol (DHCP)
+      v4Options: DHCPV4Options
+      v6Options: DHCPV6Options
+      placeholder: key1=value1, key2=value2
+      dhcpOptionBanner: DHCP options is a key/value string concatenate with comma. For more detail, please refer to <a href="https://kubeovn.github.io/docs/v1.13.x/en/kubevirt/dhcp/" target="_blank">KubOVN document</a>
+      tooltip: Enable DHCP server for this subnet. When enabled, VMs can automatically obtain IP addresses from this subnet.
     private:
       label: Private Subnet
       tooltip: Enable network isolation for this Subnet. When enabled, VMs can only communicate within this subnet, even if other subnets exist under the same VPC.
@@ -1054,7 +1062,24 @@ harvester:
       placeholder: e.g. 172.16.0.0/16
     excludeIPs:
       tooltip: The IP address list to reserve from automatic assignment. The gateway IP address is always excluded and will be automatically added to the list.
-
+    acl:
+      label: Access Control List
+      tooltip: The ACL to apply to this Subnet. Must be one of the ACLs in the same namespace.
+      action: 
+        label: Action
+        placeholder: Please select an action
+      direction: 
+        label: Direction
+        placeholder: Please select a direction
+      addRule: Add Rule
+      priority: 
+        label: Priority
+        placeholder: Please select a priority
+      match: 
+        label: Match
+        placeholder: e.g. ip4.dst == 10.10.0.2
+      banner: The supported field in ACL match can refer to <a href="https://kubeovn.github.io/docs/v1.14.x/en/guide/subnet/#subnet-acl" target="_blank">KubeOvn Subnet ACL document</a>
+      
   vpc:
     noAddonEnabled:
       prefix: The kubeovn-operator add-on is not enabled, click
@@ -1080,6 +1105,10 @@ harvester:
         placeholder: e.g. 169.254.0.1/16
       remoteVpc:
         label: Remote VPC
+      infoBanner: The static route destination CIDR must cover all subnets CIDR from remote VPC Peer. Read <a href="{url}" target="_blank">VPC Peering Configuration Examples</a> for more information.
+  networkPolicy:
+    label: Network Policies
+    banner: The network policies must be used for VMs attached to overlay networks. Please read the <a href="{url}" target="_blank">harvester document</a> how the network policy works.
   network:
     label: Virtual Machine Networks
     tabs:
@@ -1718,9 +1747,8 @@ advancedSettings:
     'harv-server-version': Harvester server version.
     'harv-upgrade-checker-enabled': Specifies whether to enable Harvester upgrade check or not. Default is True.
     'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True.
-    'harv-ui-source': Configure how to load the UI source.
+    'harv-ui-source': Configure how to load the UI source. The `External` option is used to load the UI from a ui-index URL, while the `Bundled` option loads the UI from the local Harvester server.
     'harv-ui-index': 'HTML index location for the UI.'
-    'harv-ui-plugin-index': 'JS index location for the Harvester plugin UI.'
     'harv-cluster-registration-url': Registration URL for multi-cluster management.
     'harv-http-proxy': 'HTTP proxy for Harvester to access external services.'
     'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
@@ -1807,6 +1835,11 @@ typeLabel:
       one { Virtual Private Cloud }
       other { Virtual Private Clouds }
     }
+  networking.k8s.io.networkpolicy: |-
+    {count, plural,
+      one { Network Policy }
+      other { Network Policies }
+    }
   harvesterhci.io.cloudtemplate: |-
     {count, plural,
       one { Cloud Configuration Template }

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

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

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

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

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

@@ -273,7 +273,7 @@ export default {
 
     needNewSecret() {
       // When creating a template it is always necessary to create a new secret.
-      return this.showYaml ? false : this.resourceType === HCI.VM_VERSION || this.isCreate;
+      return this.isCreate ? true : this.showYaml ? false : this.resourceType === HCI.VM_VERSION;
     },
 
     defaultTerminationSetting() {
@@ -299,9 +299,11 @@ export default {
   async created() {
     await this.$store.dispatch(`${ this.inStore }/findAll`, { type: SECRET });
 
-    if (this.value.vmMachineTypesFeatureEnabled) {
+    if (!this.value.vmMachineTypeAutoFeatureEnabled) {
       try {
-        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl']('v1/harvester/clusters/local?link=machineTypes');
+        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl'](
+          'v1/harvester/clusters/local?link=machineTypes'
+        );
         const machineTypes = await this.$store.dispatch('harvester/request', { url });
 
         this.machineTypes = machineTypes;
@@ -687,14 +689,12 @@ export default {
         set(this.spec.template.spec, 'domain.memory.maxGuest', this.maxMemory);
         set(this.spec.template.spec, 'domain.resources.limits.memory', this.maxMemory);
       } else {
+        this.spec.template.spec.domain.cpu.maxSockets = 1;
         this.spec.template.spec.domain.cpu.sockets = 1;
         this.spec.template.spec.domain.cpu.cores = this.cpu;
         this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString();
         this.spec.template.spec.domain.resources.limits.memory = this.memory;
         // clean below fields as we don't need them if not enable CPU and memory hotplug
-        if (this.spec?.template?.spec?.domain?.cpu?.maxSockets) {
-          delete this.spec.template.spec.domain.cpu.maxSockets;
-        }
         if (this.spec?.template?.spec?.domain?.memory?.maxGuest) {
           delete this.spec.template.spec.domain.memory.maxGuest;
         }
@@ -704,7 +704,7 @@ export default {
     parseDiskRows(disk) {
       const disks = [];
       const volumes = [];
-      const diskNameLables = [];
+      const diskNameLabels = [];
       const volumeClaimTemplates = [];
 
       disk.forEach( (R, index) => {
@@ -726,7 +726,7 @@ export default {
 
         disks.push(_disk);
         volumes.push(_volume);
-        diskNameLables.push(dataVolumeName);
+        diskNameLabels.push(dataVolumeName);
 
         if (R.source !== SOURCE_TYPE.CONTAINER) {
           volumeClaimTemplates.push(_dataVolumeTemplate);
@@ -767,6 +767,9 @@ export default {
         }
       }
 
+      const specDisks = this.spec?.template?.spec?.domain?.devices?.disks;
+      const mergedDisks = this.mergeDeviceList(specDisks, disks);
+
       let spec = {
         ...this.spec,
         runStrategy: this.runStrategy,
@@ -789,7 +792,7 @@ export default {
               ...this.spec.template?.spec?.domain,
               devices: {
                 ...this.spec.template?.spec?.domain?.devices,
-                disks,
+                disks: mergedDisks,
               },
             },
             volumes,
@@ -888,13 +891,16 @@ export default {
         interfaces.push(_interface);
       });
 
+      const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
+      const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
+
       const spec = {
         ...this.spec.template.spec,
         domain: {
           ...this.spec.template.spec.domain,
           devices: {
             ...this.spec.template.spec.domain.devices,
-            interfaces,
+            interfaces: mergedInterfaces,
           },
         },
         networks
@@ -1037,7 +1043,9 @@ export default {
     },
 
     parseVolumeClaimTemplate(R, dataVolumeName) {
-      if (!String(R.size).includes('Gi') && R.size) {
+      const sizeString = String(R.size);
+
+      if (!(sizeString.includes('Gi') || sizeString.includes('Ti')) && R.size) {
         R.size = `${ R.size }${ GIBIBYTE }`;
       }
 
@@ -1361,21 +1369,6 @@ export default {
       }
     },
 
-    getCPUMemoryValidation() {
-      const errors = [];
-      const { cpu, memory } = this;
-
-      if ((!cpu)) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.cpu') }, true));
-      }
-
-      if ((!memory)) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.memory') }, true));
-      }
-
-      return errors;
-    },
-
     getAccessCredentialsValidation() {
       const errors = [];
 
@@ -1543,6 +1536,49 @@ export default {
       this.refreshYamlEditor();
     },
 
+    mergeInterfaceList(specInterfaceList, interfaceList) {
+      if (!specInterfaceList || specInterfaceList.length === 0) {
+        return interfaceList;
+      }
+      const specInterfaceMap = new Map(specInterfaceList.map((iface) => [iface.name, iface]));
+
+      return interfaceList.map((iface) => {
+        const specInterface = specInterfaceMap.get(iface.name);
+
+        if (specInterface) {
+          const merged = { ...specInterface, ...iface };
+
+          // currently we only have bridge and masquerade network type, they are mutually exclusive
+          if (iface['bridge']) {
+            delete merged['masquerade'];
+          } else {
+            delete merged['bridge'];
+          }
+
+          return merged;
+        }
+
+        return iface;
+      });
+    },
+
+    mergeDeviceList(specDeviceList, deviceList) {
+      if (!specDeviceList || specDeviceList.length === 0) {
+        return deviceList;
+      }
+      const specDeviceMap = new Map(specDeviceList.map((device) => [device.name, device]));
+
+      return deviceList.map((device) => {
+        const specDevice = specDeviceMap.get(device.name);
+
+        if (specDevice) {
+          return { ...specDevice, ...device };
+        }
+
+        return device;
+      });
+    },
+
     refreshYamlEditor() {
       this.$nextTick(() => {
         this.$refs.yamlEditor?.updateValue();

pkg/harvester/models/harvester/secret.js

@@ -5,6 +5,12 @@ import Secret from '@shell/models/secret';
 import { NAMESPACE } from '@shell/config/types';
 
 export default class HciSecret extends Secret {
+  // prevent harvester secret detail page be overridden.
+  // See isFullPageOverride in https://github.com/rancher/dashboard/blob/master/shell/components/ResourceDetail/index.vue
+  get fullDetailPageOverride() {
+    return false;
+  }
+
   get listLocation() {
     const listLocation = clone(super.listLocation);
 

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

@@ -156,4 +156,8 @@ export default class HciSetting extends HarvesterResource {
 
     return out;
   }
+
+  get disableResourceDetailDrawer() {
+    return true;
+  }
 }

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

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

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

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

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

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

pkg/harvester/package.json

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

pkg/harvester/utils/cpuMemory.js

@@ -3,17 +3,19 @@ import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations
 export function getVmCPUMemoryValues(vm) {
   if (!vm) {
     return {
-      cpu:              0,
+      cpu:              null,
       memory:           null,
       isHotplugEnabled: false
     };
   }
 
   const isHotplugEnabled = isCPUMemoryHotPlugEnabled(vm);
+  const { sockets = 1, threads = 1, cores = null } = vm.spec.template.spec.domain.cpu || {};
+  const cpu = cores === null ? null : sockets * threads * cores;
 
   if (isHotplugEnabled) {
     return {
-      cpu:       vm.spec.template.spec.domain.cpu.sockets,
+      cpu,
       memory:    vm.spec.template.spec.domain?.memory?.guest || null,
       maxCpu:    vm.spec.template.spec.domain.cpu?.maxSockets || 0,
       maxMemory: vm.spec.template.spec.domain?.memory?.maxGuest || null,
@@ -21,7 +23,7 @@ export function getVmCPUMemoryValues(vm) {
     };
   } else {
     return {
-      cpu:    vm.spec.template.spec.domain.cpu.cores,
+      cpu,
       memory: vm.spec.template.spec.domain.resources?.limits?.memory || null,
       isHotplugEnabled
     };
@@ -29,8 +31,5 @@ export function getVmCPUMemoryValues(vm) {
 }
 
 export function isCPUMemoryHotPlugEnabled(vm) {
-  return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' ||
-    !!vm?.spec?.template?.spec?.domain.cpu?.maxSockets ||
-    !!vm?.spec?.template?.spec?.domain?.memory?.maxGuest ||
-    false;
+  return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' || !!vm?.spec?.template?.spec?.domain?.memory?.maxGuest || false;
 }

pkg/harvester/utils/setting.js

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

scripts/check-version.sh

@@ -15,7 +15,7 @@ if [[ "$VERSION" != "$EXTENSION_VERSION" ]]; then
   exit 1
 fi
 
-if [[ "${TAG_VERSION}" != "$PKG_VERSION" ]]; then
+if [[ "${TAG_VERSION}" != "${PKG_VERSION}"* ]]; then
   echo "Package version $PKG_VERSION in pkg/harvester/package.json does not match tag version ${TAG_VERSION}"
   exit 1
 fi

scripts/extract-release-label.mjs

@@ -0,0 +1,16 @@
+/* eslint-disable no-console */
+import load from "@commitlint/load";
+
+if (process.argv.length < 3) {
+  console.error('No PR title as first argument');
+  process.exit(1);
+}
+
+const prTitle = process.argv[2];
+const prLabel = prTitle.split(':')[0].trim();
+
+const config = await load({ extends: ["./commitlint.config.js"] });
+const commitPrefix = config?.rules?.['type-enum']?.[2] || [];
+const label = commitPrefix.includes(prLabel) ? prLabel : 'other';
+
+console.log(label);