chore: bump version to 1.8.0-rc6 (#812 )

Signed-off-by: Harvester Bot <94133267+harvesterhci-io-github-bot@users.noreply.github.com>
Revert "deps: update patch digest dependencies (#796 )" (#809 )
2026-05-14 23:11:45 +00:00 · 2026-04-16 13:43:38 +08:00 · 2026-04-13 16:34:30 +08:00 · 2026-04-07 16:24:18 +08:00 · 2026-04-07 15:30:12 +08:00 · 2026-04-05 08:34:47 +00:00
41 changed files with 1378 additions and 118 deletions
--- a/.github/actions/setup/action.yaml
+++ b/.github/actions/setup/action.yaml
@ -4,7 +4,7 @@ description: Setup node and install dependencies
 runs:
  using: 'composite'
  steps:
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
      with:
        node-version-file: '.nvmrc'
        cache: 'yarn'
--- a/.github/renovate.json
+++ b/.github/renovate.json
@ -34,12 +34,14 @@
    {
      "matchUpdateTypes": ["minor"],
      "groupName": "minor dependencies",
+      "minimumReleaseAge": "7 days",
      "labels": ["minor-update"],
      "reviewers": ["a110605", "houhoucoop"]
    },
    {
      "matchUpdateTypes": ["patch", "digest"],
      "automerge": true,
+      "minimumReleaseAge": "7 days",
      "groupName": "patch digest dependencies",
      "labels": ["patch-update", "automerge"]
    }
--- a/.github/workflows/auto-assign-reviewer.yaml
+++ b/.github/workflows/auto-assign-reviewer.yaml
@ -12,6 +12,6 @@ jobs:
    if: github.event.pull_request.draft == false
    runs-on: ubuntu-latest
    steps:
-      - uses: rancher/gh-issue-mgr/auto-assign-action@main
+      - uses: rancher/gh-issue-mgr/auto-assign-action@b70f0bdf12a03e5e3f33e4f92ccb6c89deb3ebd9 # main
        with:
-          configuration-path: .github/auto-assign-config.yaml
+          configuration-path: .github/auto-assign-config.yaml
--- a/.github/workflows/backport-label.yaml
+++ b/.github/workflows/backport-label.yaml
@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
          ref: ${{ github.base_ref }}

--- a/.github/workflows/backport-request.yaml
+++ b/.github/workflows/backport-request.yaml
@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
          ref: ${{ github.base_ref }}

--- a/.github/workflows/build-and-publish-catalog-on-release.yaml
+++ b/.github/workflows/build-and-publish-catalog-on-release.yaml
@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

      - name: Check package version
        env:
--- a/.github/workflows/build-and-publish-standalone.yaml
+++ b/.github/workflows/build-and-publish-standalone.yaml
@ -25,12 +25,12 @@ jobs:
    name: Build & Upload Hosted
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
        with:
          fetch-depth: 1

        # Note - Cannot use the setup action here as it uses a different yarn install arg
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
@ -45,19 +45,20 @@ jobs:
        run: ./scripts/build-upload-gate

      - name: Get gcs auth
-        uses: rancher-eio/read-vault-secrets@main
+        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
        with:
          secrets: |
            secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;

      - name: Apply gcs auth
        # https://github.com/google-github-actions/auth
-        uses: 'google-github-actions/auth@v2'
+        uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
+        
        with:
          credentials_json: "${{ env.GOOGLE_AUTH }}"

      - name: Upload build
-        uses: 'google-github-actions/upload-cloud-storage@v2'
+        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
        # https://github.com/google-github-actions/upload-cloud-storage
        with:
          path: ${{steps.build-hosted.outputs.BUILD_HOSTED_DIR}}
@ -71,12 +72,12 @@ jobs:
    name: Build & Upload Embedded
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
        with:
          fetch-depth: 1

        # Note - Cannot use the setup action here as it uses a different yarn install arg
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
@ -89,19 +90,19 @@ jobs:
          DISABLED_EMBED_PKG: https://releases.rancher.com/harvester-ui/plugin/harvester-1.0.3.tar.gz

      - name: Get gcs auth
-        uses: rancher-eio/read-vault-secrets@main
+        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
        with:
          secrets: |
            secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;

      - name: Apply gcs auth
        # https://github.com/google-github-actions/auth
-        uses: 'google-github-actions/auth@v2'
+        uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
        with:
          credentials_json: "${{ env.GOOGLE_AUTH }}"

      - name: Upload tar
-        uses: 'google-github-actions/upload-cloud-storage@v2'
+        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
        with:
          path: ${{steps.build-embedded.outputs.BUILD_EMBEDED_TGZ}}
          destination: releases.rancher.com/harvester-ui/dashboard
@ -114,12 +115,12 @@ jobs:
    name: Build & Upload Plugin
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
        with:
          fetch-depth: 1

        # Note - Cannot use the setup action here as it uses a different yarn install arg
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
@ -133,19 +134,19 @@ jobs:
        run: ./scripts/build-upload-gate

      - name: Get gcs auth
-        uses: rancher-eio/read-vault-secrets@main
+        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
        with:
          secrets: |
            secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;

      - name: Apply gcs auth
        # https://github.com/google-github-actions/auth
-        uses: 'google-github-actions/auth@v2'
+        uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
        with:
          credentials_json: "${{ env.GOOGLE_AUTH }}"

      - name: Upload plugin tar
-        uses: 'google-github-actions/upload-cloud-storage@v2'
+        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
        with:
          path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_TARBALL}}
          destination: releases.rancher.com/harvester-ui/plugin
@ -155,7 +156,7 @@ jobs:
          process_gcloudignore: false

      - name: Upload plugin directory
-        uses: 'google-github-actions/upload-cloud-storage@v2'
+        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
        with:
          path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_NAME}}
          destination: releases.rancher.com/harvester-ui/plugin/${{steps.ci-build-pkg.outputs.PKG_NAME}}
--- a/.github/workflows/build-extension-catalog.yml
+++ b/.github/workflows/build-extension-catalog.yml
@ -27,14 +27,14 @@ jobs:
      build-status: ${{ job.status }}
    steps:
      - name: Read Secrets
-        uses: rancher-eio/read-vault-secrets@main
+        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
        with:
          secrets: |
            secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials username | DOCKER_USERNAME ;
            secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD ;
      
      - name: Checkout repository (normal flow)
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

      - name: Enable Corepack
        run: corepack enable
@ -45,18 +45,18 @@ jobs:
          git config user.email 'github-actions[bot]@users.noreply.github.com'

      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
        with:
          username: ${{ env.DOCKER_USERNAME }}
          password: ${{ env.DOCKER_PASSWORD }}

      - name: Setup Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
        with:
          version: v3.8.0

      - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
          node-version: '20'
          cache: yarn
@ -67,4 +67,4 @@ jobs:
      - name: Build and push UI image
        run: |
          publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}"
-          $publish
+          $publish
--- a/.github/workflows/build-extension-on-merge.yml
+++ b/.github/workflows/build-extension-on-merge.yml
@ -13,7 +13,7 @@ jobs:
      target_branch: ${{ steps.get-version.outputs.target_branch }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

      - name: Determine target branch
        id: get-version
@ -44,7 +44,7 @@ jobs:
      version: ${{ steps.get_version.outputs.version }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

      - name: Extract version from package.json
        id: get_version
@ -62,7 +62,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

      - name: Setup environment
        run: |
@ -70,7 +70,7 @@ jobs:
          yarn install --frozen-lockfile

      - name: Setup Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
        with:
          version: v3.8.0

@ -79,7 +79,7 @@ jobs:
          yarn publish-pkgs -s ${{ github.repository }} -b ${{ needs.setup-target-branch.outputs.target_branch }} -t harvester-${{ needs.extract-version.outputs.version }}

      - name: Upload charts artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
        with:
          name: charts
          path: tmp
@ -94,7 +94,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout release branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
          ref: '${{ github.ref_name }}'

@ -105,7 +105,7 @@ jobs:
          echo "LAST_COMMIT=${LAST_COMMIT}" >> $GITHUB_ENV

      - name: Checkout target branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
          ref: '${{ needs.setup-target-branch.outputs.target_branch }}'

@ -121,7 +121,7 @@ jobs:
          git config user.email 'github-actions[bot]@users.noreply.github.com'

      - name: Download build artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
        with:
          name: charts

@ -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.7.0
+        uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0
        with:
          charts_dir: ./charts
        env:
--- a/.github/workflows/build-extension-on-release.yml
+++ b/.github/workflows/build-extension-on-release.yml
@ -17,7 +17,7 @@ jobs:
      release_tag: ${{ steps.determine_tag.outputs.release_tag }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

      - name: Determine release tag
        id: determine_tag
@ -33,7 +33,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
      - name: Check package version
        env:
          TAG_VERSION: ${{ github.event.release.tag_name }}
@ -43,7 +43,7 @@ jobs:
    needs:
      - setup-release-tag
      - check-version
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@9eb70a732e9be146722e1dbab431338366c2afc6 # creators-pkg-v3.0.10
    permissions:
      actions: write
      contents: write
--- a/.github/workflows/build-standalone-on-release.yaml
+++ b/.github/workflows/build-standalone-on-release.yaml
@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
      - name: Check package version
        env:
          TAG_VERSION: ${{github.ref_name}}
--- a/.github/workflows/fossa.yml
+++ b/.github/workflows/fossa.yml
@ -20,13 +20,13 @@ jobs:
    # The FOSSA token is shared between all repos in Harvester's GH org. It can
    # be used directly and there is no need to request specific access to EIO.
    - name: Read FOSSA token
-      uses: rancher-eio/read-vault-secrets@main
+      uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
      with:
        secrets: |
          secret/data/github/org/harvester/fossa/credentials token | FOSSA_API_KEY_PUSH_ONLY

    - name: FOSSA scan
-      uses: fossas/fossa-action@main
+      uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
      with:
        api-key: ${{ env.FOSSA_API_KEY_PUSH_ONLY }}
        # Only runs the scan and do not provide/returns any results back to the
--- a/.github/workflows/release-label.yaml
+++ b/.github/workflows/release-label.yaml
@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
          ref: ${{ github.base_ref }}
      - name: Setup Nodejs and yarn install
--- a/.github/workflows/run-lint.yaml
+++ b/.github/workflows/run-lint.yaml
@ -16,7 +16,7 @@ jobs:
  lint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
        with:
          fetch-depth: 0  # Need full history for commit-lint

--- a/2
+++ b/2
@ -0,0 +1,2 @@
+@a110605
+@houhoucoop
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@ The Harvester UI Extension is a Rancher extension that provides the user interfa

 ## Installation

-For detailed installation instructions, please refer to the [official Harvester documentation](https://docs.harvesterhci.io/v1.5/rancher/harvester-ui-extension#installation-on-rancher-210).
+For Harvester UI extension installation instructions, please refer to the page **Rancher Integration** -> **Harvester UI Extension** in [official Harvester documentation](https://docs.harvesterhci.io).


 ## Development Setup
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "harvester-ui-extension",
-  "version": "1.8.0-dev",
+  "version": "1.8.0-rc6",
  "private": false,
  "engines": {
    "node": ">=20.0.0"
--- a/pkg/harvester/README.md
+++ b/pkg/harvester/README.md
@ -7,8 +7,7 @@ The Harvester UI Extension is a Rancher extension that provides the user interfa

 ## Installation

-For detailed installation instructions, please refer to the [official Harvester documentation](https://docs.harvesterhci.io/v1.5/rancher/harvester-ui-extension#installation-on-rancher-210).
-
+For Harvester UI extension installation instructions, please refer to the page **Rancher Integration** -> **Harvester UI Extension** in [official Harvester documentation](https://docs.harvesterhci.io).

 ## Development Setup

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

--- a/pkg/harvester/config/labels-annotations.js
+++ b/pkg/harvester/config/labels-annotations.js
@ -28,6 +28,7 @@ export const HCI = {
  NODE_ROLE_CONTROL_PLANE:          'node-role.kubernetes.io/control-plane',
  NODE_ROLE_ETCD:                   'node-role.harvesterhci.io/witness',
  PROMOTE_STATUS:                   'harvesterhci.io/promote-status',
+  CLONE_BACKEND_STORAGE_STATUS:     'harvesterhci.io/clone-backend-storage-status',
  MIGRATION_STATE:                  'harvesterhci.io/migrationState',
  VOLUME_CLAIM_TEMPLATE:            'harvesterhci.io/volumeClaimTemplates',
  IMAGE_NAME:                       'harvesterhci.io/image-name',
@ -79,4 +80,5 @@ export const HCI = {
  VOLUME_SNAPSHOT_CLASS:            'cdi.harvesterhci.io/storageProfileVolumeSnapshotClass',
  MAC_ADDRESS:                      'harvesterhci.io/mac-address',
  NODE_UPGRADE_PAUSE_MAP:           'harvesterhci.io/node-upgrade-pause-map',
+  CDI_POPULATOR_KIND:               'cdi.kubevirt.io/storage.populator.kind',
 };
--- a/pkg/harvester/config/settings.ts
+++ b/pkg/harvester/config/settings.ts
@ -20,6 +20,7 @@ export const HCI_SETTING = {
  SUPPORT_BUNDLE_IMAGE:                   'support-bundle-image',
  SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT: 'support-bundle-node-collection-timeout',
  STORAGE_NETWORK:                        'storage-network',
+  RWX_NETWORK:                            'rwx-network',
  VM_FORCE_RESET_POLICY:                  'vm-force-reset-policy',
  SSL_CERTIFICATES:                       'ssl-certificates',
  SSL_PARAMETERS:                         'ssl-parameters',
@ -39,7 +40,8 @@ export const HCI_SETTING = {
  VM_MIGRATION_NETWORK:                   'vm-migration-network',
  RANCHER_CLUSTER:                        'rancher-cluster',
  MAX_HOTPLUG_RATIO:                      'max-hotplug-ratio',
-  KUBEVIRT_MIGRATION:                     'kubevirt-migration'
+  KUBEVIRT_MIGRATION:                     'kubevirt-migration',
+  INSTANCE_MANAGER_RESOURCES:             'instance-manager-resources'
 };

 export const HCI_ALLOWED_SETTINGS = {
@ -80,6 +82,9 @@ export const HCI_ALLOWED_SETTINGS = {
  [HCI_SETTING.STORAGE_NETWORK]:                        {
    kind: 'custom', from: 'import', canReset: true
  },
+  [HCI_SETTING.RWX_NETWORK]:                            {
+    kind: 'json', from: 'import', canReset: true, featureFlag: 'rwxNetworkSetting'
+  },
  [HCI_SETTING.VM_FORCE_RESET_POLICY]:                  { kind: 'json', from: 'import' },
  [HCI_SETTING.SSL_CERTIFICATES]:                       { kind: 'json', from: 'import' },
  [HCI_SETTING.SSL_PARAMETERS]:                         {
@ -122,6 +127,9 @@ export const HCI_ALLOWED_SETTINGS = {
  },
  [HCI_SETTING.KUBEVIRT_MIGRATION]: {
    kind: 'json', from: 'import', canReset: true, featureFlag: 'kubevirtMigration',
+  },
+  [HCI_SETTING.INSTANCE_MANAGER_RESOURCES]: {
+    kind: 'json', from: 'import', featureFlag: 'instanceManagerResourcesSetting'
  }
 };

--- a/pkg/harvester/config/types.js
+++ b/pkg/harvester/config/types.js
@ -41,3 +41,8 @@ export const VMIMPORT_SOURCE_KINDS = {
  OPENSTACK: 'OpenstackSource',
  OVA:       'OvaSource',
 };
+
+export const CDI_POPULATOR_KIND = {
+  VOLUME_IMPORT_SOURCE: 'VolumeImportSource',
+  VOLUME_CLONE_SOURCE:  'VolumeCloneSource',
+};
--- a/pkg/harvester/dialog/HarvesterDataMigrationDialog.vue
+++ b/pkg/harvester/dialog/HarvesterDataMigrationDialog.vue
@ -0,0 +1,183 @@
+<script>
+import { mapGetters } from 'vuex';
+
+import { STORAGE_CLASS } from '@shell/config/types';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { sortBy } from '@shell/utils/sort';
+import { isInternalStorageClass } from '../utils/storage-class';
+
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import AsyncButton from '@shell/components/AsyncButton';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+
+export default {
+  name: 'HarvesterDataMigrationDialog',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton, Banner, Card, LabeledInput, LabeledSelect
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  async fetch() {
+    this.storageClasses = await this.$store.dispatch('harvester/findAll', { type: STORAGE_CLASS });
+  },
+
+  data() {
+    return {
+      targetVolumeName:       '',
+      targetStorageClassName: '',
+      errors:                 [],
+      storageClasses:         [],
+    };
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources[0];
+    },
+
+    storageClassOptions() {
+      return sortBy(
+        this.storageClasses
+          .filter((sc) => !isInternalStorageClass(sc.metadata?.name))
+          .map((sc) => ({
+            label: sc.metadata?.name,
+            value: sc.metadata?.name
+          })),
+        'label'
+      );
+    },
+
+    disableSave() {
+      return !this.targetVolumeName || !this.targetStorageClassName;
+    },
+  },
+
+  methods: {
+    close() {
+      this.targetVolumeName = '';
+      this.targetStorageClassName = '';
+      this.errors = [];
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      if (!this.actionResource) {
+        buttonDone(false);
+
+        return;
+      }
+
+      if (!this.targetVolumeName) {
+        const name = this.t('harvester.modal.dataMigration.fields.targetVolumeName.label');
+
+        this['errors'] = [this.t('validation.required', { key: name })];
+        buttonDone(false);
+
+        return;
+      }
+
+      if (!this.targetStorageClassName) {
+        const name = this.t('harvester.modal.dataMigration.fields.targetStorageClassName.label');
+
+        this['errors'] = [this.t('validation.required', { key: name })];
+        buttonDone(false);
+
+        return;
+      }
+
+      try {
+        await this.actionResource.doAction('dataMigration', {
+          targetVolumeName:       this.targetVolumeName,
+          targetStorageClassName: this.targetStorageClassName
+        }, {}, false);
+
+        buttonDone(true);
+        this.close();
+      } catch (err) {
+        const error = err?.data || err;
+
+        this['errors'] = exceptionToErrorsArray(error);
+        buttonDone(false);
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <template #title>
+      {{ t('harvester.modal.dataMigration.title') }}
+    </template>
+
+    <template #body>
+      <LabeledInput
+        v-model:value="targetVolumeName"
+        :label="t('harvester.modal.dataMigration.fields.targetVolumeName.label')"
+        :placeholder="t('harvester.modal.dataMigration.fields.targetVolumeName.placeholder')"
+        class="mb-20"
+        required
+      />
+
+      <LabeledSelect
+        v-model:value="targetStorageClassName"
+        :label="t('harvester.modal.dataMigration.fields.targetStorageClassName.label')"
+        :placeholder="t('harvester.modal.dataMigration.fields.targetStorageClassName.placeholder')"
+        :options="storageClassOptions"
+        required
+      />
+
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :label="err"
+      />
+    </template>
+
+    <template
+      #actions
+      class="actions"
+    >
+      <div class="buttons">
+        <button
+          class="btn role-secondary mr-10"
+          @click="close"
+        >
+          {{ t('generic.cancel') }}
+        </button>
+
+        <AsyncButton
+          mode="apply"
+          :disabled="disableSave"
+          @click="apply"
+        />
+      </div>
+    </template>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
--- a/pkg/harvester/dialog/HarvesterStorageMigrationDialog.vue
+++ b/pkg/harvester/dialog/HarvesterStorageMigrationDialog.vue
@ -0,0 +1,239 @@
+<script>
+import { mapGetters } from 'vuex';
+
+import { PVC } from '@shell/config/types';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { sortBy } from '@shell/utils/sort';
+import { HCI } from '../types';
+import { parseVolumeClaimTemplates } from '@pkg/harvester/utils/vm';
+
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import AsyncButton from '@shell/components/AsyncButton';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+
+export default {
+  name: 'HarvesterStorageMigrationDialog',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton, Banner, Card, LabeledSelect
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  async fetch() {
+    this.allPVCs = await this.$store.dispatch('harvester/findAll', { type: PVC });
+  },
+
+  data() {
+    return {
+      sourceVolume: '',
+      targetVolume: '',
+      errors:       [],
+      allPVCs:      [],
+    };
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources[0];
+    },
+
+    sourceVolumeOptions() {
+      const volumes = this.actionResource.spec?.template?.spec?.volumes || [];
+
+      return sortBy(
+        volumes
+          .map((v) => v.persistentVolumeClaim?.claimName)
+          .filter((name) => !!name)
+          .map((name) => ({
+            label: name,
+            value: name
+          })),
+        'label'
+      );
+    },
+
+    namespacePVCs() {
+      return this.allPVCs.filter((pvc) => pvc.metadata.namespace === this.actionResource.metadata.namespace);
+    },
+
+    vmUsedVolumeNames() {
+      const allVMs = this.$store.getters['harvester/all'](HCI.VM) || [];
+      const names = new Set();
+
+      allVMs.forEach((vm) => {
+        // Collect volume names from spec.template.spec.volumes (both PVC and DataVolume references)
+        const volumes = vm.spec?.template?.spec?.volumes || [];
+
+        volumes.forEach((v) => {
+          const name = v.persistentVolumeClaim?.claimName || v.dataVolume?.name;
+
+          if (name) {
+            names.add(`${ vm.metadata.namespace }/${ name }`);
+          }
+        });
+
+        // Collect volume names from volumeClaimTemplates annotation
+        const templates = parseVolumeClaimTemplates(vm);
+
+        templates.forEach((t) => {
+          if (t.metadata?.name) {
+            names.add(`${ vm.metadata.namespace }/${ t.metadata.name }`);
+          }
+        });
+      });
+
+      return names;
+    },
+
+    targetVolumeOptions() {
+      return sortBy(
+        this.namespacePVCs
+          .filter((pvc) => {
+            // Exclude volumes used by any VM (via spec.volumes or volumeClaimTemplates)
+            if (this.vmUsedVolumeNames.has(`${ pvc.metadata.namespace }/${ pvc.metadata.name }`)) {
+              return false;
+            }
+
+            return true;
+          })
+          .map((pvc) => ({
+            label: pvc.metadata.name,
+            value: pvc.metadata.name
+          })),
+        'label'
+      );
+    },
+
+    disableSave() {
+      return !this.sourceVolume || !this.targetVolume;
+    },
+  },
+
+  methods: {
+    close() {
+      this.sourceVolume = '';
+      this.targetVolume = '';
+      this.errors = [];
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      if (!this.actionResource) {
+        buttonDone(false);
+
+        return;
+      }
+
+      if (!this.sourceVolume) {
+        const name = this.t('harvester.modal.storageMigration.fields.sourceVolume.label');
+
+        this['errors'] = [this.t('validation.required', { key: name })];
+        buttonDone(false);
+
+        return;
+      }
+
+      if (!this.targetVolume) {
+        const name = this.t('harvester.modal.storageMigration.fields.targetVolume.label');
+
+        this['errors'] = [this.t('validation.required', { key: name })];
+        buttonDone(false);
+
+        return;
+      }
+
+      try {
+        await this.actionResource.doAction('storageMigration', {
+          sourceVolume: this.sourceVolume,
+          targetVolume: this.targetVolume
+        }, {}, false);
+
+        buttonDone(true);
+        this.close();
+      } catch (err) {
+        const error = err?.data || err;
+
+        this['errors'] = exceptionToErrorsArray(error);
+        buttonDone(false);
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <template #title>
+      {{ t('harvester.modal.storageMigration.title') }}
+    </template>
+
+    <template #body>
+      <LabeledSelect
+        v-model:value="sourceVolume"
+        :label="t('harvester.modal.storageMigration.fields.sourceVolume.label')"
+        :placeholder="t('harvester.modal.storageMigration.fields.sourceVolume.placeholder')"
+        :options="sourceVolumeOptions"
+        class="mb-20"
+        required
+      />
+
+      <LabeledSelect
+        v-model:value="targetVolume"
+        :label="t('harvester.modal.storageMigration.fields.targetVolume.label')"
+        :placeholder="t('harvester.modal.storageMigration.fields.targetVolume.placeholder')"
+        :options="targetVolumeOptions"
+        required
+      />
+
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :label="err"
+      />
+    </template>
+
+    <template
+      #actions
+      class="actions"
+    >
+      <div class="buttons">
+        <button
+          class="btn role-secondary mr-10"
+          @click="close"
+        >
+          {{ t('generic.cancel') }}
+        </button>
+
+        <AsyncButton
+          mode="apply"
+          :disabled="disableSave"
+          @click="apply"
+        />
+      </div>
+    </template>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
--- a/pkg/harvester/edit/harvesterhci.io.volume.vue
+++ b/pkg/harvester/edit/harvesterhci.io.volume.vue
@ -9,8 +9,11 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Conditions from '@shell/components/form/Conditions';
 import { Banner } from '@components/Banner';
+import { Checkbox } from '@components/Form/Checkbox';
+import jsyaml from 'js-yaml';
+import { exceptionToErrorsArray } from '@shell/utils/error';
 import { allHash } from '@shell/utils/promise';
-import { get } from '@shell/utils/object';
+import { clone, get } from '@shell/utils/object';
 import { STORAGE_CLASS, LONGHORN, PV } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { saferDump } from '@shell/utils/create-yaml';
@ -33,6 +36,7 @@ export default {

  components: {
    Banner,
+    Checkbox,
    Tab,
    UnitInput,
    CruResource,
@ -90,14 +94,34 @@ export default {
      source,
      storage,
      imageId,
-      snapshots: [],
-      images:    [],
+      showAdvanced:         false,
+      createWithDataVolume: false,
+      snapshots:            [],
+      images:               [],
      GIBIBYTE
    };
  },

  created() {
    this.registerBeforeHook(this.willSave, 'willSave');
+
+    if (this.mode === _CREATE) {
+      const originalSaveYaml = this.value.saveYaml?.bind(this.value);
+
+      this.value.saveYaml = async(yaml) => {
+        if (this.createWithDataVolume && this.isBlank) {
+          const parsed = jsyaml.load(yaml);
+          const dvObj = { ...parsed, type: 'cdi.kubevirt.io.datavolume' };
+          const dataVolume = await this.$store.dispatch('harvester/create', dvObj);
+
+          await dataVolume.save();
+
+          return dataVolume;
+        }
+
+        return originalSaveYaml(yaml);
+      };
+    }
  },

  computed: {
@ -135,6 +159,10 @@ export default {
      return Object.values(VOLUME_MODE);
    },

+    accessModeOptions() {
+      return ['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany'];
+    },
+
    imageOption() {
      return sortBy(
        this.images
@ -275,6 +303,10 @@ export default {
      return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
    },

+    isCreatePVCWithDataVolumeFeatureEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('createPVCWithDataVolume');
+    },
+
    isResizeDisabled() {
      return (
        !this.isLHV2VolExpansionFeatureEnabled &&
@ -341,6 +373,58 @@ export default {

      return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
    },
+    buildDataVolumeObj() {
+      const storage = {
+        storageClassName: this.value.spec.storageClassName,
+        resources:        { requests: { storage: this.storage } },
+      };
+
+      if (this.showAdvanced && this.value.spec.accessModes?.length > 0) {
+        storage.accessModes = this.value.spec.accessModes;
+      }
+
+      if (this.showAdvanced && this.value.spec.volumeMode) {
+        storage.volumeMode = this.value.spec.volumeMode;
+      }
+
+      return {
+        type:       'cdi.kubevirt.io.datavolume',
+        apiVersion: 'cdi.kubevirt.io/v1beta1',
+        kind:       'DataVolume',
+        metadata:   {
+          name:        this.value.metadata.name,
+          namespace:   this.value.metadata.namespace,
+          annotations: this.value.metadata.annotations || {},
+          labels:      this.value.metadata.labels || {},
+        },
+        spec: {
+          source: { blank: {} },
+          storage,
+        }
+      };
+    },
+
+    async save(buttonDone) {
+      if (this.isCreate && this.isBlank && this.createWithDataVolume) {
+        try {
+          this.update();
+          const dvObj = this.buildDataVolumeObj();
+          const dataVolume = await this.$store.dispatch('harvester/create', dvObj);
+
+          await dataVolume.save();
+          buttonDone(true);
+          this.done();
+        } catch (err) {
+          const error = err?.data || err;
+
+          this['errors'] = exceptionToErrorsArray(error);
+          buttonDone(false);
+        }
+      } else {
+        await CreateEditView.methods.save.call(this, buttonDone);
+      }
+    },
+
    willSave() {
      this.update();
    },
@ -383,9 +467,17 @@ export default {
      this.update();
    },
    generateYaml() {
-      const out = saferDump(this.value);
+      this.update();

-      return out;
+      if (this.isCreate && this.isBlank && this.createWithDataVolume) {
+        return saferDump(this.buildDataVolumeObj());
+      }
+
+      const plain = clone(this.value);
+
+      delete plain.saveYaml;
+
+      return saferDump(plain);
    },
  }
 };
@ -458,18 +550,6 @@ export default {
          @update:value="update"
        />

-        <LabeledSelect
-          v-if="showVolumeMode"
-          v-model:value="value.spec.volumeMode"
-          :label="t('harvester.volume.volumeMode')"
-          :options="volumeModeOptions"
-          required
-          :disabled="!isCreate"
-          :mode="mode"
-          class="mb-20"
-          @update:value="update"
-        />
-
        <UnitInput
          v-model:value="storage"
          :label="t('harvester.volume.size')"
@ -490,6 +570,44 @@ export default {
        >
          <span>{{ t('harvester.volume.longhorn.disableResize') }}</span>
        </Banner>
+
+        <div class="row mb-20">
+          <Checkbox
+            v-if="isCreate && isBlank && isCreatePVCWithDataVolumeFeatureEnabled"
+            v-model:value="createWithDataVolume"
+            :label="t('harvester.volume.createWithDataVolume')"
+            tooltip-key="harvester.volume.createWithDataVolumeTooltip"
+          />
+        </div>
+        <a
+          v-if="isCreate && isCreatePVCWithDataVolumeFeatureEnabled"
+          role="button"
+          class="hand"
+          @click="showAdvanced = !showAdvanced"
+        >
+          {{ showAdvanced ? t('harvester.volume.hideAdvanced') : t('harvester.volume.showAdvanced') }}
+        </a>
+
+        <LabeledSelect
+          v-if="showAdvanced"
+          v-model:value="value.spec.accessModes"
+          :label="t('harvester.volume.accessModes')"
+          :options="accessModeOptions"
+          :multiple="true"
+          :mode="mode"
+          class="mb-20 mt-20"
+          @update:value="update"
+        />
+
+        <LabeledSelect
+          v-if="showAdvanced"
+          v-model:value="value.spec.volumeMode"
+          :label="t('harvester.volume.volumeMode')"
+          :options="volumeModeOptions"
+          :mode="mode"
+          class="mb-20"
+          @update:value="update"
+        />
      </Tab>
      <Tab
        v-if="!isCreate"
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue
@ -31,6 +31,7 @@ export default {
    const _hash = {
      pciclaims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.PCI_CLAIM }),
      sriovs:    this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOV }),
+      srigpuovs:    this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOVGPU_DEVICE }),
    };

    await allHash(_hash);
@ -106,19 +107,32 @@ export default {
  },

  computed: {
-    parentSriovOptions() {
+    allSriovs() {
      const inStore = this.$store.getters['currentProduct'].inStore;
-      const allSriovs = this.$store.getters[`${ inStore }/all`](HCI.SR_IOV) || [];

-      return allSriovs.map((sriov) => {
-        return sriov.id;
-      });
+      return this.$store.getters[`${ inStore }/all`](HCI.SR_IOV) || [];
+    },
+    allSriovGPUs() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return this.$store.getters[`${ inStore }/all`](HCI.SR_IOVGPU_DEVICE) || [];
+    },
+    parentSriovOptions() {
+      return this.allSriovs.map((sriov) => sriov.id);
+    },
+    parentSriovGPUOptions() {
+      return this.allSriovGPUs.map((sriovgpu) => sriovgpu.id);
    },
    parentSriovLabel() {
      return HCI_ANNOTATIONS.PARENT_SRIOV;
-    }
+    },
+    parentSriovGPULabel() {
+      return HCI_ANNOTATIONS.PARENT_SRIOV_GPU;
+    },
+    vGPUAsPCIDeviceEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+    },
  },
-
  methods: {
    enableGroup(rows = []) {
      const row = rows[0];
@ -206,6 +220,15 @@ export default {
        :rows="rows"
        @change-rows="changeRows"
      />
+      <FilterBySriov
+        v-if="vGPUAsPCIDeviceEnabled"
+        ref="filterByParentSRIOVGPU"
+        :parent-sriov-options="parentSriovGPUOptions"
+        :parent-sriov-label="parentSriovGPULabel"
+        :label="t('harvester.sriov.parentSriovGPU')"
+        :rows="rows"
+        @change-rows="changeRows"
+      />
    </template>
  </ResourceTable>
 </template>
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue
@ -8,6 +8,7 @@ import { set } from '@shell/utils/object';
 import { HCI } from '../../../types';
 import DeviceList from './DeviceList';
 import CompatibilityMatrix from '../CompatibilityMatrix';
+import MessageLink from '@shell/components/MessageLink';

 export default {
  name:       'VirtualMachinePCIDevices',
@ -15,7 +16,8 @@ export default {
    LabeledSelect,
    DeviceList,
    CompatibilityMatrix,
-    Banner
+    Banner,
+    MessageLink
  },
  props: {
    mode: {
@ -138,6 +140,13 @@ export default {
      return inUse;
    },

+    toVGpuDevicesPage() {
+      return {
+        name:   'harvester-c-cluster-resource',
+        params: { cluster: this.$store.getters['clusterId'], resource: HCI.VGPU_DEVICE },
+      };
+    },
+
    devicesByNode() {
      return this.enabledDevices?.reduce((acc, device) => {
        const nodeName = device.status?.nodeName;
@ -232,7 +241,12 @@ export default {
      <div class="row">
        <div class="col span-12">
          <Banner color="info">
-            <t k="harvester.pci.howToUseDevice" />
+            <MessageLink
+              :to="toVGpuDevicesPage"
+              prefix-label="harvester.pci.howToUseDeviceInVMCreation.prefix"
+              middle-label="harvester.pci.howToUseDeviceInVMCreation.middle"
+              suffix-label="harvester.pci.howToUseDeviceInVMCreation.suffix"
+            />
          </Banner>
          <Banner
            v-if="selectedDevices.length > 0"
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@ -211,6 +211,10 @@ export default {

      return false;
    },
+
+    vGPUAsPCIDeviceEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+    },
    usbPassthroughEnabled() {
      return this.$store.getters['harvester-common/getFeatureEnabled']('usbPassthrough');
    },
@ -740,7 +744,7 @@ export default {
      </Tab>

      <Tab
-        v-if="enabledSriovgpu"
+        v-if="enabledSriovgpu && !vGPUAsPCIDeviceEnabled"
        :label="t('harvester.tab.vGpuDevices')"
        name="vGpuDevices"
        :weight="-6"
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@ -123,6 +123,24 @@ harvester:
      namespace: Namespace
      message:
        success: 'Image { name } created successfully.'
+    storageMigration:
+      title: Storage Migration
+      fields:
+        sourceVolume:
+          label: Source Volume
+          placeholder: Select a source volume
+        targetVolume:
+          label: Target Volume
+          placeholder: Select a target volume
+    dataMigration:
+      title: Data Migration
+      fields:
+        targetVolumeName:
+          label: Target Volume Name
+          placeholder: Enter a target volume name
+        targetStorageClassName:
+          label: Target Storage Class
+          placeholder: Select a storage class
    migration:
      failedMessage: Latest migration failed!
      title: Migration
@ -232,6 +250,9 @@ harvester:
    migrate: Migrate
    cpuAndMemoryHotplug: Edit CPU and Memory
    abortMigration: Abort Migration
+    storageMigration: Storage Migration
+    cancelStorageMigration: Cancel Storage Migration
+    dataMigration: Data Migration
    createTemplate: Generate Template
    enableMaintenance: Enable Maintenance Mode
    disableMaintenance: Disable Maintenance Mode
@ -355,7 +376,14 @@ harvester:
    available: Available Devices
    compatibleNodes: Compatible Nodes
    impossibleSelection: 'There are no hosts with all of the selected devices.'
-    howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine.'
+    howToUseDeviceInVMCreation: 
+      prefix: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine. <br>For vGPU devices, please enable them on the'
+      middle: vGPU Devices
+      suffix: page first.
+    howToUseDevice: 
+      prefix: 'Select the device in the table to enable PCI passthrough. <br>For vGPU devices, please enable them on the'
+      middle: vGPU Devices
+      suffix: page.
    deviceInTheSameHost: 'You can only select devices on the same host.'
    oldFormatDevices:
      help: |-
@ -425,7 +453,7 @@ harvester:
      volume:
        upperType: Volume name
        lowerType: volume name
-        needImageOrExisting: 'At least an image volume or an existing root-disk volume is required!'
+        needAtLeastOneBootable: 'At least one bootable volume is required!'
    image:
      ruleTip: 'The URL you have entered ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
      ruleFileTip: 'The file you have chosen ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
@ -898,6 +926,11 @@ harvester:
      conditions: Conditions
    size: Size
    volumeMode: Volume Mode
+    accessModes: Access Modes
+    createWithDataVolume: Create with DataVolume
+    createWithDataVolumeTooltip: Create Volume with Kubevirt/Containerized Data Importer way. It can fill accessMode/volumeMode automatically.
+    showAdvanced: Show Advanced Options
+    hideAdvanced: Hide Advanced Options
    source: Source
    kind: Kind
    sourceOptions:
@ -1266,6 +1299,11 @@ harvester:
        addIp: Add Exclude IP
      warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
      tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 2 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
+    rwxNetwork:
+      warning: 'WARNING: <br/> Any change to rwx-network requires longhorn RWX volumes detached before applying this setting.<br/>Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
+      shareStorageNetwork: Share Storage Network
+      dedicatedRwxNetwork: Dedicated RWX Network
+      shareStorageNetworkWarning: The rwx-network is governed by storage-network, and changes here won't take effect until share-storage-network is set to false.
    vmForceDeletionPolicy:
      period: Period
      vmMigrationTimeout: VM Migration Timeout
@ -1353,14 +1391,18 @@ harvester:
    clusterRegistrationUrl:
      url: URL
      insecureSkipTLSVerify: Insecure Skip TLS Verify
-      tip: 
-        prefix: Harvester secures cluster registration via TLS by default. If opt out "Insecure SKip TLS Verify", you must provide custom CA certificates using the
+      tip:
+        prefix: Harvester secures cluster registration via TLS by default. If opt out "Insecure Skip TLS Verify", you must provide custom CA certificates using the
        middle: 'additional-ca'
        suffix: setting.
      message: To completely unset the imported Harvester cluster, please also remove it on the Rancher Dashboard UI via the <code> Virtualization Management </code> page.
    ntpServers:
      isNotIPV4: The address you entered is not IPv4 or host. Please enter a valid IPv4 address or a host address.
      isDuplicate: There are duplicate NTP server configurations.
+    instanceManagerResources:
+      parseError: "Failed to parse configuration: {error}"
+      v1: "V1 Data Engine"
+      v2: "V2 Data Engine"
    kubevirtMigration:
      parseError: "Failed to parse configuration: {error}"
      parallelMigrationsPerCluster: "Parallel Migrations Per Cluster"
@ -1832,7 +1874,8 @@ harvester:
    numVFs: Number Of Virtual Functions
    vfAddresses: Virtual Functions Addresses
    showMore: Show More
-    parentSriov: Filter By Parent SR-IOV
+    parentSriov: Filter By Parent SR-IOV Netork Device
+    parentSriovGPU: Filter By Parent SR-IOV GPU Device

  sriovgpu:
    label: SR-IOV GPU Devices
@ -1979,6 +2022,7 @@ advancedSettings:
    'harv-vm-force-reset-policy': Configuration for the force-reset action when a virtual machine is stuck on a node that is down.
    'harv-ssl-parameters': Custom SSL Parameters for TLS validation.
    'harv-storage-network': 'Longhorn storage-network setting.'
+    'harv-rwx-network': 'Configure RWX network behavior for shared or dedicated storage network usage.'
    'harv-support-bundle-namespaces': Select additional namespaces to include in the support bundle.
    'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that Harvester will automatically add as virtual machine storage.
    'harv-support-bundle-image': Support bundle image configuration. Find different versions in <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a>.
@ -1994,6 +2038,7 @@ advancedSettings:
    'harv-rancher-cluster': 'Configure Rancher cluster integration settings for guest cluster management.'
    'harv-max-hotplug-ratio': 'The ratio for kubevirt to limit the maximum CPU and memory that can be hotplugged to a VM. The value could be an integer between 1 and 20, default to 4.'
    'harv-kubevirt-migration': 'Configure cluster-wide KubeVirt live migration parameters.'
+    'harv-instance-manager-resources': 'Configure resource percentage reservations for Longhorn instance manager V1 and V2. Valid instance manager CPU range between 0 - 40.'

 typeLabel:
  kubevirt.io.virtualmachine: |-
@ -2186,12 +2231,12 @@ typeLabel:
      other { VMware Sources }
    }
  migration.harvesterhci.io.ovasource: |-
-    {count, plural,     
+    {count, plural,
      one { OVA Source }
      other { OVA Sources }
-    } 
+    }
  migration.harvesterhci.io.virtualmachineimport: |-
    {count, plural,
      one { Virtual Machine Import }
      other { Virtual Machine Imports }
-    }
+    }
--- a/pkg/harvester/list/devices.harvesterhci.io.pcidevice.vue
+++ b/pkg/harvester/list/devices.harvesterhci.io.pcidevice.vue
@ -60,6 +60,17 @@ export default {
      return schema;
    },

+    toVGpuDevicesPage() {
+      return {
+        name:   'harvester-c-cluster-resource',
+        params: { cluster: this.$store.getters['clusterId'], resource: HCI.VGPU_DEVICE },
+      };
+    },
+
+    vGPUAsPCIDeviceEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+    },
+
    rows() {
      const inStore = this.$store.getters['currentProduct'].inStore;
      const rows = this.$store.getters[`${ inStore }/all`](HCI.PCI_DEVICE);
@ -85,11 +96,23 @@ export default {
      {{ t('harvester.pci.noPCIPermission') }}
    </Banner>
  </div>
-  <DeviceList
-    v-else-if="hasSchema && enabledPCI"
-    :devices="rows"
-    :schema="schema"
-  />
+  <div v-else-if="hasSchema && enabledPCI">
+    <Banner
+      v-if="vGPUAsPCIDeviceEnabled"
+      color="info"
+    >
+      <MessageLink
+        :to="toVGpuDevicesPage"
+        prefix-label="harvester.pci.howToUseDevice.prefix"
+        middle-label="harvester.pci.howToUseDevice.middle"
+        suffix-label="harvester.pci.howToUseDevice.suffix"
+      />
+    </Banner>
+    <DeviceList
+      :devices="rows"
+      :schema="schema"
+    />
+  </div>
  <div v-else>
    <Banner color="warning">
      <MessageLink
--- a/pkg/harvester/list/harvesterhci.io.volume.vue
+++ b/pkg/harvester/list/harvesterhci.io.volume.vue
@ -70,8 +70,13 @@ export default {
      return schema;
    },
    filterRows() {
-      // we only show the non golden image PVCs in the list
-      return this.rows.filter((pvc) => !pvc?.isGoldenImageVolume);
+      return this.rows.filter((pvc) => {
+        if (pvc?.isGoldenImageVolume || pvc?.isCDIPopulatorVolume) {
+          return false;
+        }
+
+        return true;
+      });
    },
    headers() {
      return [
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@ -707,18 +707,22 @@ export default {
      }
    },

-    needVolume(R) {
-      if (R.image === EMPTY_IMAGE) {
-        return false;
+    needVolumeRelatedInfo(R) {
+      // return [needVolume, needVolumeClaimTemplate]
+      if (R.source === SOURCE_TYPE.CONTAINER) {
+        return [true, false];
      }

-      return true;
+      if (R.source === SOURCE_TYPE.IMAGE && R.image === EMPTY_IMAGE) {
+        return [false, false];
+      }
+
+      return [true, true];
    },

    parseDiskRows(disk) {
      const disks = [];
      const volumes = [];
-      const diskNameLabels = [];
      const volumeClaimTemplates = [];

      disk.forEach( (R, index) => {
@ -726,14 +730,18 @@ export default {

        disks.push(_disk);

-        if (this.needVolume(R)) {
-          const prefixName = this.value.metadata?.name || '';
-          const dataVolumeName = this.parseDataVolumeName(R, prefixName);
+        const prefixName = this.value.metadata?.name || '';
+        const dataVolumeName = this.parseDataVolumeName(R, prefixName);
+        const [needVolume, needVolumeClaimTemplate] = this.needVolumeRelatedInfo(R);
+
+        if (needVolume) {
          const _volume = this.parseVolume(R, dataVolumeName);
-          const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);

          volumes.push(_volume);
-          diskNameLabels.push(dataVolumeName);
+        }
+        if (needVolumeClaimTemplate) {
+          const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
+
          volumeClaimTemplates.push(_dataVolumeTemplate);
        }
      });
--- a/pkg/harvester/models/devices.harvesterhci.io.pcidevice.js
+++ b/pkg/harvester/models/devices.harvesterhci.io.pcidevice.js
@ -1,6 +1,7 @@
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { escapeHtml } from '@shell/utils/string';
 import { HCI } from '../types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';

 const STATUS_DISPLAY = {
  enabled: {
@ -32,7 +33,7 @@ export default class PCIDevice extends SteveModel {
    out.push(
      {
        action:     'enablePassthroughBulk',
-        enabled:    !this.isEnabling,
+        enabled:    !this.isEnabling && !this.isvGPUDevice,
        icon:       'icon icon-fw icon-dot',
        label:      'Enable Passthrough',
        bulkable:   true,
@ -41,7 +42,7 @@ export default class PCIDevice extends SteveModel {
      },
      {
        action:   'disablePassthrough',
-        enabled:  this.isEnabling && this.claimedByMe,
+        enabled:  this.isEnabling && this.claimedByMe && !this.isvGPUDevice,
        icon:     'icon icon-fw icon-dot-open',
        label:    'Disable Passthrough',
        bulkable: true,
@ -52,6 +53,14 @@ export default class PCIDevice extends SteveModel {
    return out;
  }

+  get isvGPUDevice() {
+    if (!this.vGPUAsPCIDeviceFeatureEnabled) {
+      return false;
+    }
+
+    return !!this.metadata?.labels?.[HCI_ANNOTATIONS.PARENT_SRIOV_GPU];
+  }
+
  get canYaml() {
    return false;
  }
@ -176,6 +185,10 @@ export default class PCIDevice extends SteveModel {
    return this.status?.description;
  }

+  get vGPUAsPCIDeviceFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
+  }
+
  showDetachWarning() {
    this.$dispatch('growl/warning', {
      title:   this.$rootGetters['i18n/t']('harvester.pci.detachWarning.title'),
--- a/pkg/harvester/models/harvester/persistentvolumeclaim.js
+++ b/pkg/harvester/models/harvester/persistentvolumeclaim.js
@ -9,6 +9,7 @@ import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
 import { HCI, VOLUME_SNAPSHOT } from '../../types';
 import HarvesterResource from '../harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../config/harvester';
+import { CDI_POPULATOR_KIND } from '../../config/types';
 import { LVM_DRIVER } from './storage.k8s.io.storageclass';

 const DEGRADED_ERRORS = ['replica scheduling failed', 'precheck new replica failed'];
@ -44,7 +45,7 @@ export default class HciPv extends HarvesterResource {
    const exportImageAction = {
      action:  'exportImage',
      enabled: this.hasAction('export') && !this.isEncrypted,
-      icon:    'icon icon-copy',
+      icon:    'icon icon-external-link',
      label:   this.t('harvester.action.exportImage')
    };
    const takeSnapshotAction = {
@ -77,10 +78,23 @@ export default class HciPv extends HarvesterResource {
        icon:    'icon icon-backup',
        label:   this.t('harvester.action.cancelExpand')
      },
+      {
+        action:  'dataMigration',
+        enabled: this.hasAction('dataMigration') && this.createPVCWithDataVolumeFeatureEnabled,
+        icon:    'icon icon-copy',
+        label:   this.t('harvester.action.dataMigration')
+      },
      ...out
    ];
  }

+  dataMigration(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      component: 'HarvesterDataMigrationDialog'
+    });
+  }
+
  exportImage(resources = this) {
    this.$dispatch('promptModal', {
      resources,
@ -339,10 +353,20 @@ export default class HciPv extends HarvesterResource {
    return this?.metadata?.annotations?.[HCI_ANNOTATIONS.GOLDEN_IMAGE] === 'true';
  }

+  get isCDIPopulatorVolume() {
+    const kind = this?.metadata?.annotations?.[HCI_ANNOTATIONS.CDI_POPULATOR_KIND];
+
+    return kind === CDI_POPULATOR_KIND.VOLUME_IMPORT_SOURCE || kind === CDI_POPULATOR_KIND.VOLUME_CLONE_SOURCE;
+  }
+
  get thirdPartyStorageFeatureEnabled() {
    return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
  }

+  get createPVCWithDataVolumeFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('createPVCWithDataVolume');
+  }
+
  get resourceExternalLink() {
    const host = window.location.host;
    const { params } = this.currentRoute();
--- a/pkg/harvester/models/kubevirt.io.virtualmachine.js
+++ b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@ -199,6 +199,18 @@ export default class VirtVm extends HarvesterResource {
        icon:    'icon icon-close',
        label:   this.t('harvester.action.abortMigration')
      },
+      {
+        action:  'storageMigration',
+        enabled: !!this.actions?.storageMigration,
+        icon:    'icon icon-copy',
+        label:   this.t('harvester.action.storageMigration')
+      },
+      {
+        action:  'cancelStorageMigration',
+        enabled: !!this.actions?.cancelStorageMigration,
+        icon:    'icon icon-close',
+        label:   this.t('harvester.action.cancelStorageMigration')
+      },
      {
        action:  'addHotplugVolume',
        enabled: !!this.actions?.addVolume,
@ -368,6 +380,13 @@ export default class VirtVm extends HarvesterResource {
    });
  }

+  storageMigration(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      component: 'HarvesterStorageMigrationDialog'
+    });
+  }
+
  backupVM(resources = this) {
    this.$dispatch('promptModal', {
      resources,
@ -520,6 +539,10 @@ export default class VirtVm extends HarvesterResource {
    this.doActionGrowl('abortMigration', {});
  }

+  cancelStorageMigration() {
+    this.doActionGrowl('cancelStorageMigration', {});
+  }
+
  createTemplate(resources = this) {
    this.$dispatch('promptModal', {
      resources,
@ -770,11 +793,11 @@ export default class VirtVm extends HarvesterResource {
  }

  get isPending() {
-    if (this &&
+    if ((this &&
      !this.isVMExpectedRunning &&
      this.isVMCreated &&
      this.vmi?.status?.phase === VMIPhase.Pending
-    ) {
+    ) || (this.metadata?.annotations?.[HCI_ANNOTATIONS.CLONE_BACKEND_STORAGE_STATUS] === 'cloning')) {
      return { status: VMIPhase.Pending };
    }

--- a/pkg/harvester/package.json
+++ b/pkg/harvester/package.json
@ -1,7 +1,7 @@
 {
  "name": "harvester",
  "description": "Rancher UI Extension for Harvester",
-  "version": "1.8.0-dev",
+  "version": "1.8.0-rc6",
  "private": false,
  "rancher": {
    "annotations": {
@ -29,4 +29,4 @@
    "last 2 versions",
    "not dead"
  ]
-}
+}
--- a/pkg/harvester/validators/vm.js
+++ b/pkg/harvester/validators/vm.js
@ -69,7 +69,7 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
    validName(getters, errors, D.name, diskNames, prefix, type, lowerType, upperType);
  });

-  let requiredVolume = false;
+  let hasBootableVolume = false;

  _volumes.forEach((V, idx) => {
    const { type, typeValue } = getVolumeType(getters, V, _volumeClaimTemplates, value);
@ -77,7 +77,7 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
    const prefix = V.name || idx + 1;

    if ([SOURCE_TYPE.IMAGE, SOURCE_TYPE.ATTACH_VOLUME, SOURCE_TYPE.CONTAINER].includes(type)) {
-      requiredVolume = true;
+      hasBootableVolume = true;
    }

    if (type === SOURCE_TYPE.NEW || type === SOURCE_TYPE.IMAGE) {
@ -137,10 +137,10 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
  });

  /**
-   *  At least one volume must be create.  (Verify only when create.)
+   *  At least one bootable volume must be provided.  (Verify only when create.)
   */
-  if ((!requiredVolume || _volumes.length === 0) && !value.links) {
-    errors.push(getters['i18n/t']('harvester.validation.vm.volume.needImageOrExisting'));
+  if (!hasBootableVolume && !value.links) {
+    errors.push(getters['i18n/t']('harvester.validation.vm.volume.needAtLeastOneBootable'));
  }

  return errors;
--- a/scripts/bump_version.sh
+++ b/scripts/bump_version.sh
@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+# Usage: update package.json and pkg/harvester/package.json to desired version
+# Example: ./scripts/bump_version.sh v1.8.0-rc3
+
+VERSION="$1"
+
+if [ -z "$VERSION" ]; then
+  echo "Usage: $0 <version>"
+  echo "Example: $0 v1.8.0-rc3"
+  exit 1
+fi
+
+# Strip leading 'v' if present
+VERSION="${VERSION#v}"
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+
+FILES=(
+  "$ROOT_DIR/package.json"
+  "$ROOT_DIR/pkg/harvester/package.json"
+)
+
+for FILE in "${FILES[@]}"; do
+  if [ ! -f "$FILE" ]; then
+    echo "File not found: $FILE"
+    exit 1
+  fi
+
+  # Use node to update version in-place while preserving formatting
+  node -e "
+    const fs = require('fs');
+    const raw = fs.readFileSync('$FILE', 'utf8');
+    const updated = raw.replace(/\"version\":\s*\"[^\"]*\"/, '\"version\": \"$VERSION\"');
+    fs.writeFileSync('$FILE', updated);
+  "
+
+  echo "Updated $FILE -> $VERSION"
+done
--- a/yarn.lock
+++ b/yarn.lock
@ -13844,9 +13844,9 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==

 yaml@^2.5.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5"
-  integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.3.tgz#a0d6bd2efb3dd03c59370223701834e60409bd7d"
+  integrity sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==

 yargs-parser@^18.1.2:
  version "18.1.3"
Author	SHA1	Message	Date
Harvester Bot	3f80a71303	chore: bump version to 1.8.0-rc6 (#812 ) Signed-off-by: Harvester Bot <94133267+harvesterhci-io-github-bot@users.noreply.github.com>	2026-04-16 13:43:38 +08:00
Andy Lee	13e4154335	Revert "deps: update patch digest dependencies (#796 )" (#809 ) This reverts commit 7788161d94b23917be580ef6676aef7fdb3c243e.	2026-04-13 16:34:30 +08:00
renovate[bot]	a80b87ce4f	deps: update fossas/fossa-action action to v1.9.0 (#797 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-07 16:24:18 +08:00
mergify[bot]	809b9925fa	ci: add add_minrelaseday to delay dep update (#798 ) (#800 ) (cherry picked from commit 6dd9b333365f172bf7a9993a9e3a82c9d49b27ad) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-04-07 15:30:12 +08:00
renovate[bot]	7788161d94	deps: update patch digest dependencies (#796 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-05 08:34:47 +00:00
mergify[bot]	90b8a821a1	chore: bump version to 1.8.0-rc5 (#789 ) (#790 ) (cherry picked from commit 1f9e9b336ba94bc7ec423680666b4303c706e259) Signed-off-by: Tim Liou <tim.liou@suse.com> Co-authored-by: Tim Liou <tim.liou@suse.com>	2026-04-01 09:17:31 +08:00
mergify[bot]	87ff014bd8	refactor: add banner in PCI Devices page (#785 ) (#788 ) * refactor: add banner in PCI Devices page * refactor: based on copilot review --------- (cherry picked from commit c5b4f6cd1ee6a23d14f251b6d45d13e7c2274b2b) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-04-01 09:05:00 +08:00
mergify[bot]	20328b06e6	fix: the rancher-eio/read-vault-secret sha (#786 ) (#787 ) (cherry picked from commit 4ce35ce075e7a1fd77fd82e9f20e932c05565216) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-31 14:09:22 +08:00
mergify[bot]	bbc415a2b4	chore: bump version to 1.8.0-rc4 (#778 ) (#779 ) (cherry picked from commit 9d698b1230912a23515c2204220408bba122fb4c) Signed-off-by: Tim Liou <tim.liou@suse.com> Co-authored-by: Tim Liou <tim.liou@suse.com>	2026-03-27 16:42:53 +08:00
mergify[bot]	c12d4b5fba	feat: support advance option and creation from DataVolume (#776 ) (#777 ) * feat: support advance option and creation from DataVolume - advance option would let user change the accessMode/volumeMode - creation from DataVolume could supports various scenario with 3rd-party storage * feat: add data migration action on volume page * refactor: use show advanced options link instead of checkbox * feat: add feature flag * feat: add feature flag for dataMigration action --------- (cherry picked from commit 566e79eda5c08e84e431d5e048e4bb581e7d9aaf) Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com> Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: freeze <1615081+Vicente-Cheng@users.noreply.github.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-26 17:33:01 +08:00
mergify[bot]	dc91be11f9	chore: bump version to 1.8.0-rc3 (#774 ) (#775 ) (cherry picked from commit 42ddcfc1feea10ee3441758f8852f74c3ecc3057) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-26 12:35:12 +08:00
mergify[bot]	e5b72499b5	fix: use default value got undefined value in payload (#772 ) (#773 ) (cherry picked from commit ad3decf71f82e5158ddf6a22965babd79c346a67) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-25 17:12:51 +08:00
mergify[bot]	e66037b007	ci: remove the single quota for use commit hash (#767 ) (#771 ) (cherry picked from commit 8083a41df04ed5c82346cf3798dd85eedcb1e13a) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-25 14:13:08 +08:00
mergify[bot]	c676cad057	chore: pin GH Actions to commit sha (#765 ) (#766 ) (cherry picked from commit 62801b3b1371a221f0c485abe50f22b005155fe7) Co-authored-by: freeze <1615081+Vicente-Cheng@users.noreply.github.com>	2026-03-25 14:08:49 +08:00
mergify[bot]	254abd4648	ci: add CODEOWNERS file (#768 ) (#769 ) (cherry picked from commit 46b860260a738bdce7ac13a08f7ceabec6fc922c) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-25 13:42:42 +08:00
renovate[bot]	1df1d3534a	deps: update dependency yaml to v2.8.3 (#757 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-03-22 13:06:18 +00:00
mergify[bot]	ff1e6e6e7f	docs: update install instruction doc link (#753 ) (#754 ) (cherry picked from commit 97e93dba0b056cbae2062cad099b96615f22a0cb) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-20 16:53:54 +08:00
mergify[bot]	622242e4a5	refactor: change rwxNetwork setting to kind json (#751 ) (#752 ) (cherry picked from commit 9a8a709e56432b1d6ccf1f30e92b5a7dbefdb355) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-20 14:48:49 +08:00
mergify[bot]	d8ea9be174	feat: introduce rwxNetwork setting (#746 ) (#750 ) * feat: add rwxNetwork setting * fix: network payload --------- (cherry picked from commit d1949641a7b6f5055a0eba210196d5e83db08f1a) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-19 16:19:44 +08:00
mergify[bot]	f8a479cfcf	feat: add storage migration operation (#724 ) (#749 ) - add storage migration - add cancel storage migration (cherry picked from commit 9c9f59c939706edac551692694ea4ab88ec192d0) Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com> Co-authored-by: freeze <1615081+Vicente-Cheng@users.noreply.github.com>	2026-03-19 11:53:24 +08:00
mergify[bot]	6d5e584113	chore: bump to v1.8.0-rc2 (#747 ) (#748 ) (cherry picked from commit ccc14c7fb99b430fc7f24e580fae7f0d8a606f09) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-19 11:31:07 +08:00
mergify[bot]	a9eb04195e	feat: introduce instance-manager-resources setting (#744 ) (#745 ) (cherry picked from commit 2ba471907e6b869352fb78bbadb76eb3c1f26bb2) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-18 17:21:28 +08:00
mergify[bot]	0441c1f6e3	refactor: remove using resourceName to determine is vGPU device (#741 ) (#743 ) (cherry picked from commit 5aea476f645d201afb26e39b7be7f7a8049c9925) Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-18 17:16:28 +08:00
mergify[bot]	dde58269d5	fix: typo (#740 ) (#742 ) (cherry picked from commit 519c7d9f1fc0d59817c62d476e20599e07643c0e) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-17 16:33:37 +08:00
mergify[bot]	b8111f0ad7	fix: reword the error message to focus on bootable volume (#736 ) (#738 ) (cherry picked from commit a9c392c13feb3cfe4100843eb41e0501e6708aaf) Signed-off-by: Tim Liou <tim.liou@suse.com> Co-authored-by: Tim Liou <tim.liou@suse.com>	2026-03-12 17:46:08 +08:00
mergify[bot]	6d627f82e9	fix: container disks don't need volumeClaimTemplates but volumes (#735 ) (#737 ) (cherry picked from commit 888ec7a50fdc2e8ffc7d5210ae0e39d30c3e43cc) Signed-off-by: Tim Liou <tim.liou@suse.com> Co-authored-by: Tim Liou <tim.liou@suse.com>	2026-03-12 17:45:40 +08:00
mergify[bot]	cfc7a76fe7	feat: add vGPU filter button and hide the enable/disable passthrough in PCIDevice page (#729 ) (#732 ) * feat: add another filter button * feat: add feature falg to hide vGPU enable/disable actions in PCIDevices page * refactor: update with conditionally rendering --------- (cherry picked from commit 23344e0c0759e970bbdc88bc463774053448e0a1) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-11 15:39:41 +08:00
mergify[bot]	71d3067354	feat: ensure the state is pending when perform cloning the efi (#730 ) (#734 ) * feat: ensure the state is pending when perform cloning the efi * feat: define harvesterhci.io/clone-backend-storage-status in labels-annotations.js --------- (cherry picked from commit a2486a7d389ff86760f8456a73ef2202ed06ca02) Signed-off-by: pohanhuang <pohan.huang@suse.com> Co-authored-by: Po Han Huang <hhcs9527@gmail.com>	2026-03-11 15:39:01 +08:00
mergify[bot]	9ecc372009	chore: bump to v1.8.0-rc1 (#731 ) (#733 ) (cherry picked from commit df3d249923a51ea10d9080fecea6c5b942f47f8a) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>	2026-03-11 15:34:55 +08:00