chore: remove run-lint from build-standalone-on-release (#355) (#387)

(cherry picked from commit 7386a2deb6)

Signed-off-by: Nick Chung <nick.chung@suse.com>
Co-authored-by: Nick Chung <Nick.Chung@suse.com>

.eslintignore

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

.github/actions/setup/action.yaml

@@ -4,7 +4,7 @@ description: Setup node and install dependencies
 runs:
   using: 'composite'
   steps:
-    - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+    - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'

.github/auto-assign-config.yaml

@@ -3,4 +3,5 @@ addReviewers: true
 numberOfReviewers: 0
 reviewers:
 - a110605
-- houhoucoop
+- houhoucoop
+- NickChungSUSE

.github/mergify.yml

@@ -1,14 +1,33 @@
 pull_request_rules:
-  - 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.5
+  conditions:
+    - base=main
+    - label="require backport 1.5"
+  actions:
+    backport:
+      branches:
+        - "release-harvester-v1.5"
+      assignees:
+        - "{{ author }}"
+      labels:
+        - "v1.5 backport PR"
 
-commands_restrictions:
-  backport:
-    conditions:
-      - or:
-        - sender-permission>=write
-        - sender=github-actions[bot]
+- 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}}? 🙏

.github/release.yml

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

.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@b70f0bdf12a03e5e3f33e4f92ccb6c89deb3ebd9 # main
+      - uses: rancher/gh-issue-mgr/auto-assign-action@main
         with:
-          configuration-path: .github/auto-assign-config.yaml
+          configuration-path: .github/auto-assign-config.yaml

.github/workflows/backport-label.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref }}
 

.github/workflows/backport-request.yaml

@@ -1,49 +0,0 @@
-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@34e114876b0b11c390a56381ad16ebd13914f8d5 # 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-and-publish-catalog-on-release.yaml

@@ -11,19 +11,18 @@ defaults:
     working-directory: ./
 
 jobs:
-  check-version:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
 
-      - name: Check package version
-        env:
-          TAG_VERSION: ${{ github.event.release.tag_name }}
-        run: ./scripts/check-version.sh $TAG_VERSION
+      - name: Run tests
+        uses: ./.github/actions/lint
 
   build-and-push-extension-catalog:
-    needs: check-version
+    needs: lint
     uses: ./.github/workflows/build-extension-catalog.yml
     permissions:
       actions: write

.github/workflows/build-and-publish-standalone.yaml

@@ -25,12 +25,12 @@ jobs:
     name: Build & Upload Hosted
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
         # Note - Cannot use the setup action here as it uses a different yarn install arg
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -45,20 +45,19 @@ jobs:
         run: ./scripts/build-upload-gate
 
       - name: Get gcs auth
-        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
+        uses: rancher-eio/read-vault-secrets@main
         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@c200f3691d83b41bf9bbd8638997a462592937ed # v2
-        
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: "${{ env.GOOGLE_AUTH }}"
 
       - name: Upload build
-        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
+        uses: 'google-github-actions/upload-cloud-storage@v2'
         # https://github.com/google-github-actions/upload-cloud-storage
         with:
           path: ${{steps.build-hosted.outputs.BUILD_HOSTED_DIR}}
@@ -72,12 +71,12 @@ jobs:
     name: Build & Upload Embedded
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
         # Note - Cannot use the setup action here as it uses a different yarn install arg
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -90,19 +89,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@d266f55186f80a893839f6e15662e67388e443e6 # v3
+        uses: rancher-eio/read-vault-secrets@main
         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@c200f3691d83b41bf9bbd8638997a462592937ed # v2
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: "${{ env.GOOGLE_AUTH }}"
 
       - name: Upload tar
-        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
+        uses: 'google-github-actions/upload-cloud-storage@v2'
         with:
           path: ${{steps.build-embedded.outputs.BUILD_EMBEDED_TGZ}}
           destination: releases.rancher.com/harvester-ui/dashboard
@@ -115,12 +114,12 @@ jobs:
     name: Build & Upload Plugin
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
         # Note - Cannot use the setup action here as it uses a different yarn install arg
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -134,19 +133,19 @@ jobs:
         run: ./scripts/build-upload-gate
 
       - name: Get gcs auth
-        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
+        uses: rancher-eio/read-vault-secrets@main
         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@c200f3691d83b41bf9bbd8638997a462592937ed # v2
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: "${{ env.GOOGLE_AUTH }}"
 
       - name: Upload plugin tar
-        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
+        uses: 'google-github-actions/upload-cloud-storage@v2'
         with:
           path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_TARBALL}}
           destination: releases.rancher.com/harvester-ui/plugin
@@ -156,7 +155,7 @@ jobs:
           process_gcloudignore: false
 
       - name: Upload plugin directory
-        uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
+        uses: 'google-github-actions/upload-cloud-storage@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}}

.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@d266f55186f80a893839f6e15662e67388e443e6 # v3
+        uses: rancher-eio/read-vault-secrets@main
         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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@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@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        uses: docker/login-action@v3
         with:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
 
       - name: Setup Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
+        uses: azure/setup-helm@v3
         with:
           version: v3.8.0
 
       - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@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

.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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
 
       - name: Extract version from package.json
         id: get_version
@@ -62,7 +62,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
 
       - name: Setup environment
         run: |
@@ -70,7 +70,7 @@ jobs:
           yarn install --frozen-lockfile
 
       - name: Setup Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
+        uses: azure/setup-helm@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@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@v4
         with:
           name: charts
           path: tmp
@@ -94,7 +94,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout release branch
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@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@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@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@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0
+        uses: helm/chart-releaser-action@v1.4.1
         with:
           charts_dir: ./charts
         env:

.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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
 
       - name: Determine release tag
         id: determine_tag
@@ -29,21 +29,20 @@ jobs:
           else
             echo "Error: invalid tag format." && exit 1
           fi
-  check-version:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-      - name: Check package version
-        env:
-          TAG_VERSION: ${{ github.event.release.tag_name }}
-        run: ./scripts/check-version.sh $TAG_VERSION
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
 
+      - name: Run tests
+        uses: ./.github/actions/lint
   build-extension-charts:
     needs:
       - setup-release-tag
-      - check-version
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@9eb70a732e9be146722e1dbab431338366c2afc6 # creators-pkg-v3.0.10
+      - lint
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
     permissions:
       actions: write
       contents: write

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

@@ -5,20 +5,9 @@ on:
       - v[1-9].*
 
 jobs:
-  check-version:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-      - name: Check package version
-        env:
-          TAG_VERSION: ${{github.ref_name}}
-        run: ./scripts/check-version.sh $TAG_VERSION
-
   build:
     name: Build and Upload Package
     uses: ./.github/workflows/build-and-publish-standalone.yaml
-    needs: check-version
     permissions:
       contents: read
       packages: write

.github/workflows/fossa.yml

@@ -1,34 +0,0 @@
-name: FOSSA Scanning
-
-on:
-  push:
-    branches: ["main", "release-harvester-v*"]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  fossa-scanning:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-    - name: Checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-    # 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@d266f55186f80a893839f6e15662e67388e443e6 # v3
-      with:
-        secrets: |
-          secret/data/github/org/harvester/fossa/credentials token | FOSSA_API_KEY_PUSH_ONLY
-
-    - name: FOSSA scan
-      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
-        # pipeline.
-        run-tests: false

.github/workflows/release-label.yaml

@@ -1,30 +0,0 @@
-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@34e114876b0b11c390a56381ad16ebd13914f8d5 # 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,7 +7,6 @@ on:
       - main
       - 'release-*'
   pull_request:
-    types: [opened, reopened, edited, synchronize]
     branches:
       - main
       - 'release-*'
@@ -16,18 +15,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Need full history for commit-lint
 
       - 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: |
@@ -41,14 +35,8 @@ jobs:
             FROM="$GITHUB_BASE_SHA"
             TO="$GITHUB_HEAD_SHA"
           elif [ -n "$GITHUB_BEFORE" ] && [ -n "$GITHUB_AFTER" ]; then
-            if [ "$GITHUB_BEFORE" = "0000000000000000000000000000000000000000" ]; then
-              # first push to HEAD
-              FROM=""
-              TO="$GITHUB_AFTER"
-            else
-              FROM="$GITHUB_BEFORE"
-              TO="$GITHUB_AFTER"
-            fi
+            FROM="$GITHUB_BEFORE"
+            TO="$GITHUB_AFTER"
           else
             echo "No valid commit range found, skipping commitlint."
             exit 0
@@ -56,15 +44,7 @@ jobs:
 
           echo "FROM=$FROM"
           echo "TO=$TO"
-
-          if [ -z "$FROM" ]; then
-            echo "Linting last commit  $TO"
-            npx commitlint --last --verbose
-
-          else
-            echo "Linting commits from $FROM to $TO"
-            npx commitlint --from "$FROM" --to "$TO" --verbose
-          fi
+          npx commitlint --from "$FROM" --to "$TO" --verbose
         env:
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           GITHUB_BASE_SHA: ${{ github.event.pull_request.base.sha }}

README.md

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

commitlint.config.js

@@ -22,16 +22,12 @@ module.exports = {
         'security', // Security fixes
       ]
     ],
-    // Allows the scope to be empty. [0] means the rule is disabled.
-    'scope-empty':            [0, 'always'],
-    // Allows any string for the scope.
-    'scope-case':             [2, 'always', 'kebab-case'],
     'type-case':              [2, 'always', 'lower-case'],
     'type-empty':             [2, 'never'],
     'subject-case':           [0, 'never'],
     'subject-empty':          [2, 'never'],
     'subject-full-stop':      [2, 'never', '.'],
-    'subject-max-length':     [0, 'never'],
+    'subject-max-length':     [2, 'always', 72],
     'body-leading-blank':     [2, 'always'],
     'body-max-line-length':   [2, 'always', 100],
     'footer-leading-blank':   [2, 'always'],

package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.7.2-rc2",
+  "version": "1.6.0-rc1",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@babel/plugin-transform-class-static-block": "7.29.7",
-    "@rancher/shell": "3.0.8-rc.8",
+    "@babel/plugin-transform-class-static-block": "7.26.0",
+    "@rancher/shell": "3.0.5-rc.3",
     "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.19.0",
-    "cronstrue": "2.59.0",
+    "@types/node": "~20.10.0",
+    "cronstrue": "2.50.0",
     "d3-color": "3.1.0",
     "ejs": "3.1.10",
-    "follow-redirects": "1.16.0",
+    "follow-redirects": "1.15.6",
     "glob": "7.2.3",
     "glob-parent": "6.0.2",
     "json5": "2.2.3",
-    "@types/lodash": "4.17.24",
+    "@types/lodash": "4.17.5",
     "merge": "2.1.1",
-    "node-forge": "1.4.0",
+    "node-forge": "1.3.1",
     "nth-check": "2.1.1",
-    "qs": "6.15.2",
-    "roarr": "7.21.5",
-    "semver": "7.8.2",
+    "qs": "6.11.1",
+    "roarr": "7.0.4",
+    "semver": "7.5.4",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "scripts": {
@@ -46,7 +46,6 @@
     "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/README.md

@@ -1,178 +0,0 @@
-# harvester-ui-extension
-
-The Harvester UI Extension is a Rancher extension that provides the user interface for [Harvester](https://harvesterhci.io) within the [Rancher Dashboard](https://github.com/rancher/dashboard).
-
-> **Note:**
-> This extension is available starting from **Rancher 2.10.0**. Ensure your Rancher version is **2.10.0 or later** to access Harvester integration.
-
-## 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).
-
-
-## Development Setup
-
-Ensure **Node.js v20 or later** is installed for development and debugging.
-
-### Standalone Mode
-
-Run the extension standalone with hot reload at `https://localhost:8005`.
-
-```bash
-# Install dependencies
-yarn install
-
-# Start the development server
-RANCHER_ENV=harvester API=https://your-harvester-ip yarn dev
-
-# Example with specific server version
-RANCHER_ENV=harvester VUE_APP_SERVER_VERSION=v1.5.0 API=https://192.168.1.123 yarn dev
-```
-
-You may also define environment variables in a `.env` file:
-
-```env
-RANCHER_ENV=harvester
-VUE_APP_SERVER_VERSION=v1.5.0
-API=https://192.168.1.123
-```
-
-### Rancher Integration Mode
-
-To run as a Rancher extension, follow the [Rancher UI Extension Guide](https://extensions.rancher.io/extensions/next/extensions-getting-started#running-the-app).
-
-```bash
-API=https://your-rancher-ip yarn dev
-```
-
-## Commit Message Guidelines
-
-This project uses [commit-lint](https://commitlint.js.org/) with [Conventional Commits](https://www.conventionalcommits.org/) to ensure consistent and meaningful commit messages.
-
-### Commit Message Format
-
-All commit messages must follow the conventional commit format:
-
-```
-<type>[optional scope]: <description>
-
-[optional body]
-
-[optional footer(s)]
-```
-
-### Supported Types
-
-- **feat**: New features
-- **fix**: Bug fixes
-- **docs**: Documentation changes
-- **style**: Code style changes (formatting, missing semicolons, etc.)
-- **refactor**: Code refactoring
-- **perf**: Performance improvements
-- **test**: Adding or updating tests
-- **build**: Build system or external dependencies
-- **ci**: CI/CD changes
-- **chore**: Other changes that don't modify src or test files
-- **revert**: Reverts a previous commit
-- **wip**: Work in progress
-- **deps**: Dependency updates
-- **security**: Security fixes
-
-### Examples
-
-```bash
-# Feature
-git commit -m "feat: add new virtual machine creation wizard"
-
-# Bug fix
-git commit -m "fix: resolve memory leak in VM console"
-
-# Documentation
-git commit -m "docs: update installation instructions"
-
-# Breaking change
-git commit -m "feat!: change API endpoint structure
-
-BREAKING CHANGE: The /api/v1/vms endpoint has been replaced with /api/v2/vms"
-```
-
-### Git Hooks
-
-The project uses [Husky](https://typicode.github.io/husky/) to automatically validate commit messages and run linting before commits:
-
-- **pre-commit**: Runs ESLint to ensure code quality
-- **commit-msg**: Validates commit message format using commit-lint
-
-These hooks are automatically installed when you run `yarn install`.
-
-### Manual Validation
-
-You can manually validate commit messages:
-
-```bash
-# Validate the last commit
-yarn commitlint
-
-# Validate a specific commit
-npx commitlint --from <commit-hash>
-
-# Validate a range of commits
-npx commitlint --from <start-hash> --to <end-hash>
-```
-
-## Branch Structure
-
-- **`main`** – Main development branch
-- **`release-harvester-vX.Y`** – Stable release branches per version series
-- **`vX.Y-head`** – Testing branches for ongoing changes to extension builds in each release series
-
-> **Note:**
-> The `vX.Y-head` branches are auto-generated and kept in sync with release branches. Use these for testing the latest changes in each version series.
-
-## Testing Guidelines
-
-### UI Extension Testing
-
-To validate changes in a release series, switch to the appropriate `vX.Y-head` branch. For main branch testing, use `main-head`.
-
-- Examples:
-  - Test `1.0.x` series → `v1.0-head`
-  - Test `1.5.x` series → `v1.5-head`
-
-**Steps:**
-1. Navigate to **Rancher UI** → **Local** → **App** → **Repositories**
-2. Refresh the Harvester repository using the target `vX.Y-head` branch
-3. Go to the **Extensions** page and install the desired version
-
-### Standalone Mode Testing
-
-To test the standalone UI, configure Harvester to load the UI from an external source.
-
-- Examples of `ui-index`:
-  - Main branch → `https://releases.rancher.com/harvester-ui/dashboard/latest/index.html`
-  - Release series `1.5.x` → `https://releases.rancher.com/harvester-ui/dashboard/release-harvester-v1.5/index.html`
-
-**Steps:**
-1. Go to **Harvester UI** → **Advanced** → **Settings** → **UI**
-2. Set **ui-source** to `External`
-3. Set **ui-index** to the desired URL
-
-## Contributing
-
-If you want to contribute, start by reading this document, then visit our [Getting Started guide](https://extensions.rancher.io/extensions/next/extensions-getting-started) to learn how to develop and submit changes.
-
-## License
-
-Copyright (c) 2014-2025 [SUSE, LLC.](https://www.suse.com/)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

pkg/harvester/components/SettingList.vue

@@ -11,6 +11,7 @@ const CATEGORY = {
   ui: [
     'branding',
     'ui-source',
+    'ui-plugin-index',
     'ui-index',
   ]
 };
@@ -97,12 +98,8 @@ export default {
           return true;
         }
 
-        let description = this.t(setting.description, this.getDocLinkParams(setting) || {}, true)?.toLowerCase() || '';
+        const description = this.t(setting.description, this.getDocLinkParams(setting) || {}, true)?.toLowerCase() || '';
 
-        // remove <a> tags from description
-        if (description.includes('<a')) {
-          description = description.replace(/<a[^>]*>(.*?)<\/a>/g, '$1');
-        }
         // filter by description
         if (description.includes(searchQuery)) {
           return true;

pkg/harvester/components/novnc/NovncConsoleWrapper.vue

@@ -257,12 +257,8 @@ export default {
       });
     },
 
-    reconnect() {
-      this.$refs.novncConsole.reconnect();
-    },
-
     softReboot() {
-      this.vmResource.doSoftReboot();
+      this.vmResource.softrebootVM();
     },
 
     showKeysModal() {
@@ -310,13 +306,6 @@ 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"
@@ -383,15 +372,3 @@ 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;
-  }
-  .vm-console .v-popper__inner{
-    overflow-y: visible;
-  }
-</style>

pkg/harvester/components/settings/cluster-registration-url.vue

@@ -1,123 +0,0 @@
-<script>
-import MessageLink from '@shell/components/MessageLink';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import { HCI_SETTING } from '../../config/settings';
-import { Checkbox } from '@components/Form/Checkbox';
-import { Banner } from '@components/Banner';
-
-export default {
-  name: 'HarvesterEditClusterRegistrationURL',
-
-  components: {
-    LabeledInput, MessageLink, Checkbox, Banner
-  },
-
-  mixins: [CreateEditView],
-
-  data() {
-    let parseDefaultValue = {};
-
-    try {
-      parseDefaultValue = JSON.parse(this.value.value);
-    } catch (error) {
-      parseDefaultValue.url = this.value.value;
-      parseDefaultValue.insecureSkipTLSVerify = true;
-    }
-
-    return {
-      parseDefaultValue,
-      errors: []
-    };
-  },
-
-  computed: {
-    toCA() {
-      return `${ HCI_SETTING.ADDITIONAL_CA }?mode=edit`;
-    },
-    clusterRegistrationTLSVerifyEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('clusterRegistrationTLSVerify');
-    },
-    registrationURL: {
-      get() {
-        return this.clusterRegistrationTLSVerifyEnabled ? this.parseDefaultValue.url : this.parseDefaultValue;
-      },
-
-      set(value) {
-        if (this.clusterRegistrationTLSVerifyEnabled) {
-          this.parseDefaultValue.url = value;
-        } else {
-          this.parseDefaultValue = value;
-        }
-      }
-    }
-  },
-
-  methods: {
-    getDefaultValue() {
-      if (this.clusterRegistrationTLSVerifyEnabled) {
-        return { url: '', insecureSkipTLSVerify: false };
-      } else {
-        return '';
-      }
-    },
-
-    updateUrl() {
-      this.update();
-    },
-
-    update() {
-      if (this.clusterRegistrationTLSVerifyEnabled) {
-        this.value['value'] = JSON.stringify(this.parseDefaultValue);
-      } else {
-        this.value['value'] = this.parseDefaultValue;
-      }
-    },
-
-    useDefault() {
-      this.parseDefaultValue = this.getDefaultValue();
-    },
-
-    updateInsecureSkipTLSVerify(newValue) {
-      const { url = '' } = this.parseDefaultValue;
-
-      this.parseDefaultValue = { url, insecureSkipTLSVerify: newValue };
-      this.update();
-    },
-  }
-};
-</script>
-
-<template>
-  <div
-    class="row"
-  >
-    <div class="col span-12">
-      <Banner color="info">
-        <MessageLink
-          :to="toCA"
-          target="_blank"
-          prefix-label="harvester.setting.clusterRegistrationUrl.tip.prefix"
-          middle-label="harvester.setting.clusterRegistrationUrl.tip.middle"
-          suffix-label="harvester.setting.clusterRegistrationUrl.tip.suffix"
-        />
-      </Banner>
-      <LabeledInput
-        v-model:value="registrationURL"
-        class="mb-20"
-        :mode="mode"
-        :label="t('harvester.setting.clusterRegistrationUrl.url')"
-        @update:value="updateUrl"
-      />
-      <div v-if="clusterRegistrationTLSVerifyEnabled">
-        <Checkbox
-          v-model:value="parseDefaultValue.insecureSkipTLSVerify"
-          class="check mb-5"
-          type="checkbox"
-          :label="t('harvester.setting.clusterRegistrationUrl.insecureSkipTLSVerify')"
-          @update:value="updateInsecureSkipTLSVerify"
-        />
-      </div>
-    </div>
-  </div>
-</template>

pkg/harvester/components/settings/csi-online-expand-validation.vue

@@ -1,294 +0,0 @@
-<script>
-import { _EDIT } from '@shell/config/query-params';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import InfoBox from '@shell/components/InfoBox';
-import { Banner } from '@components/Banner';
-import { allHash } from '@shell/utils/promise';
-import { CSI_DRIVER } from '../../types';
-import { LONGHORN_DRIVER } from '@shell/config/types';
-
-export default {
-  name: 'CSIOnlineExpandValidation',
-
-  components: {
-    Banner,
-    InfoBox,
-    LabeledSelect,
-  },
-
-  props: {
-    mode: {
-      type:    String,
-      default: _EDIT,
-    },
-    value: {
-      type:    Object,
-      default: () => ({}),
-    },
-    registerBeforeHook: {
-      type:     Function,
-      required: true,
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    try {
-      await allHash({ csiDrivers: this.$store.dispatch(`${ inStore }/findAll`, { type: CSI_DRIVER }) });
-      this.fetchError = null;
-    } catch (error) {
-      console.error('Failed to fetch CSI drivers:', error); // eslint-disable-line no-console
-      this.fetchError = this.t(
-        'harvester.setting.csiOnlineExpandValidation.failedToLoadDrivers',
-        { error: error.message || error },
-        true
-      );
-    }
-  },
-
-  data() {
-    return {
-      configArr:  [],
-      parseError: null,
-      fetchError: null,
-    };
-  },
-
-  created() {
-    const initValue = this.value.value || this.value.default || '{}';
-
-    this.configArr = this.parseValue(initValue);
-    this.registerBeforeHook?.(this.willSave, 'willSave');
-  },
-
-  computed: {
-    allErrors() {
-      const errors = [];
-
-      if (this.fetchError) {
-        errors.push(this.fetchError);
-      }
-      if (this.parseError) {
-        errors.push(this.parseError);
-      }
-
-      return errors;
-    },
-
-    csiDrivers() {
-      if (this.fetchError) return [];
-
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      return this.$store.getters[`${ inStore }/all`](CSI_DRIVER) || [];
-    },
-
-    provisioners() {
-      const usedKeys = this.configArr.map(({ key }) => key);
-
-      return this.csiDrivers
-        .filter(({ name }) => !usedKeys.includes(name))
-        .map(({ name }) => name);
-    },
-
-    provisionerValue() {
-      return [
-        { label: 'True', value: true },
-        { label: 'False', value: false },
-      ];
-    },
-
-    disableAdd() {
-      return this.parseError || this.fetchError || this.configArr.length >= this.csiDrivers.length;
-    },
-
-    disableConfigEditing() {
-      return this.parseError || this.fetchError;
-    }
-  },
-
-  watch: {
-    'value.value'(newVal, oldVal) {
-      if (newVal !== oldVal) {
-        this.configArr = this.parseValue(newVal || '{}');
-      }
-    }
-  },
-
-  methods: {
-    _convertToBoolean(value) {
-      if (typeof value === 'boolean') return value;
-
-      if (typeof value === 'string') {
-        const lowerCaseValue = value.toLowerCase();
-
-        if (lowerCaseValue === 'true') return true;
-        if (lowerCaseValue === 'false') return false;
-      }
-
-      return false; // default to false for any other string or non-boolean type
-    },
-    parseValue(raw) {
-      try {
-        const json = JSON.parse(raw);
-
-        this.parseError = null;
-
-        return Object.entries(json).map(([key, value]) => ({
-          key,
-          value: this._convertToBoolean(value),
-        }));
-      } catch (e) {
-        console.error('[CSIOnlineExpandValidation] JSON Parsing Error:', raw, e); // eslint-disable-line no-console
-        this.parseError = this.t(
-          'harvester.setting.csiOnlineExpandValidation.invalidJsonFormat',
-          { error: e.message },
-          true
-        );
-
-        return [];
-      }
-    },
-
-    stringifyConfig() {
-      const obj = {};
-
-      this.configArr.forEach(({ key, value }) => {
-        obj[key] = value;
-      });
-
-      return this.configArr.length ? JSON.stringify(obj) : '';
-    },
-
-    update() {
-      this.value.value = this.stringifyConfig();
-    },
-
-    willSave() {
-      const errors = [];
-
-      this.configArr.forEach(({ key }) => {
-        if (!key) {
-          errors.push(
-            this.t('validation.required', { key: this.t('harvester.setting.csiOnlineExpandValidation.provisioner') }, true)
-          );
-        }
-      });
-
-      this.value.value = this.stringifyConfig();
-
-      return errors.length ? Promise.reject(errors) : Promise.resolve();
-    },
-
-    useDefault() {
-      this.configArr = this.parseValue(this.value.default || '{}');
-      this.update();
-    },
-
-    disableEdit(driverKey) {
-      return this.fetchError || driverKey === LONGHORN_DRIVER;
-    },
-
-    add() {
-      if (this.disableConfigEditing) return;
-
-      this.configArr.push({ key: '', value: true });
-    },
-
-    remove(index) {
-      if (this.disableConfigEditing) return;
-
-      this.configArr.splice(index, 1);
-      this.update();
-    },
-
-    onValueChange(idx, newVal) {
-      if (this.disableConfigEditing) return;
-
-      const val = newVal === 'true' ? true : newVal === 'false' ? false : newVal;
-
-      this.configArr[idx].value = val;
-      this.update();
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <Banner
-      v-for="(errorMsg, index) in allErrors"
-      :key="index"
-      color="error"
-    >
-      {{ errorMsg }}
-    </Banner>
-    <InfoBox
-      v-for="(driver, idx) in configArr"
-      :key="idx"
-      class="box"
-    >
-      <button
-        class="role-link btn btn-sm remove"
-        type="button"
-        :disabled="disableEdit(driver.key)"
-        @click="remove(idx)"
-      >
-        <i class="icon icon-x" />
-      </button>
-
-      <div class="row">
-        <div class="col span-4">
-          <LabeledSelect
-            v-model:value="driver.key"
-            label-key="harvester.setting.csiOnlineExpandValidation.provisioner"
-            required
-            searchable
-            :mode="mode"
-            :disabled="disableEdit(driver.key)"
-            :options="provisioners"
-            @update:value="update"
-            @keydown.native.enter.prevent
-          />
-        </div>
-
-        <div class="col span-4">
-          <LabeledSelect
-            v-model:value="driver.value"
-            :value="driver.value.toString()"
-            label-key="harvester.setting.csiOnlineExpandValidation.value"
-            required
-            searchable
-            :mode="mode"
-            :disabled="disableEdit(driver.key)"
-            :options="provisionerValue"
-            @update:value="val => onValueChange(idx, val)"
-            @keydown.native.enter.prevent
-          />
-        </div>
-      </div>
-    </InfoBox>
-
-    <button
-      class="btn btn-sm role-primary"
-      :disabled="disableAdd"
-      @click="add"
-    >
-      {{ t('generic.add') }}
-    </button>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.box {
-  position: relative;
-  padding-top: 40px;
-}
-.remove {
-  position: absolute;
-  top: 10px;
-  right: 10px;
-  padding: 0;
-}
-</style>

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

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

pkg/harvester/components/settings/rancher-cluster.vue

@@ -1,222 +0,0 @@
-<script>
-import CreateEditView from '@shell/mixins/create-edit-view';
-import { RadioGroup } from '@components/Form/Radio';
-import { SECRET } from '@shell/config/types';
-import { exceptionToErrorsArray } from '@shell/utils/error';
-import FileSelector, { createOnSelected } from '@shell/components/form/FileSelector';
-import YamlEditor from '@shell/components/YamlEditor';
-
-export default {
-  name: 'HarvesterRancherCluster',
-
-  components: {
-    RadioGroup,
-    FileSelector,
-    YamlEditor
-  },
-
-  mixins: [CreateEditView],
-
-  props: {
-    value: {
-      type:    Object,
-      default: () => ({}),
-    },
-    registerBeforeHook: {
-      type:     Function,
-      required: false,
-      default:  () => {},
-    },
-  },
-
-  data() {
-    let parseDefaultValue = {};
-
-    try {
-      const data = this.value.value || this.value.default || '{}';
-      const parsed = JSON.parse(data);
-
-      parseDefaultValue = {
-        kubeConfig:                                  '',
-        removeUpstreamClusterWhenNamespaceIsDeleted: parsed.removeUpstreamClusterWhenNamespaceIsDeleted || false
-      };
-    } catch (error) {
-      parseDefaultValue = {
-        kubeConfig:                                  '',
-        removeUpstreamClusterWhenNamespaceIsDeleted: false
-      };
-    }
-
-    return {
-      parseDefaultValue,
-      errors:           [],
-      existingSecret:   null,
-    };
-  },
-
-  async created() {
-    await this.checkExistingSecret();
-    if (this.registerBeforeHook) {
-      this.registerBeforeHook(this.willSave, 'willSave');
-    }
-  },
-
-  methods: {
-    onKeySelected: createOnSelected('parseDefaultValue.kubeConfig'),
-
-    update() {
-      if (this.parseDefaultValue.removeUpstreamClusterWhenNamespaceIsDeleted) {
-        this.value['value'] = JSON.stringify({ removeUpstreamClusterWhenNamespaceIsDeleted: true });
-      } else {
-        this.value['value'] = this.value.default || '{}';
-      }
-    },
-
-    async checkExistingSecret() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      await this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET });
-      const secrets = this.$store.getters[`${ inStore }/all`](SECRET) || [];
-
-      this.existingSecret = secrets.find((secret) => secret.metadata.name === 'rancher-cluster-config' &&
-        secret.metadata.namespace === 'harvester-system'
-      );
-
-      // If the secret exists and has data, populate the kubeConfig
-      if (this.existingSecret?.data?.kubeConfig) {
-        const decodedContent = atob(this.existingSecret.data.kubeConfig);
-
-        this.parseDefaultValue.kubeConfig = decodedContent;
-        this.$nextTick(() => {
-          this.update();
-        });
-      }
-    },
-
-    async createOrUpdateRancherKubeConfigSecret() {
-      this.errors = [];
-      // Check if kubeConfig is provided
-      if (!this.parseDefaultValue.kubeConfig) {
-        this.errors.push(this.t('validation.required', { key: this.t('harvester.setting.rancherCluster.kubeConfig') }, true));
-
-        return Promise.reject(this.errors);
-      }
-
-      try {
-        let secret;
-
-        if (this.existingSecret) {
-          secret = this.existingSecret;
-          secret.setData('kubeConfig', this.parseDefaultValue.kubeConfig);
-        } else {
-          const inStore = this.$store.getters['currentProduct'].inStore;
-
-          secret = await this.$store.dispatch(`${ inStore }/create`, {
-            apiVersion: 'v1',
-            kind:       'Secret',
-            metadata:   {
-              name:      'rancher-cluster-config',
-              namespace: 'harvester-system'
-            },
-            type: 'secret',
-            data: { kubeConfig: btoa(this.parseDefaultValue.kubeConfig) }
-          });
-        }
-        await secret.save();
-
-        return Promise.resolve();
-      } catch (err) {
-        this.errors = exceptionToErrorsArray(err);
-
-        return Promise.reject(this.errors);
-      }
-    },
-
-    async deleteRancherKubeConfigSecret() {
-      if (this.existingSecret) {
-        this.existingSecret.remove();
-      }
-    },
-
-    async willSave() {
-      // Only create or update secret if enabled
-      if (this.parseDefaultValue.removeUpstreamClusterWhenNamespaceIsDeleted) {
-        await this.createOrUpdateRancherKubeConfigSecret();
-      } else {
-        await this.deleteRancherKubeConfigSecret();
-      }
-
-      return Promise.resolve();
-    },
-
-    useDefault() {
-      this.parseDefaultValue = {
-        kubeConfig:                                  '',
-        removeUpstreamClusterWhenNamespaceIsDeleted: false
-      };
-    }
-  },
-
-  watch: {
-    'parseDefaultValue.removeUpstreamClusterWhenNamespaceIsDeleted'(val, oldVal) {
-      if (val && !oldVal && this.existingSecret?.data?.kubeConfig) {
-        // Populate kubeConfig with the existing secret value
-        this.parseDefaultValue.kubeConfig = atob(this.existingSecret.data.kubeConfig);
-      }
-    },
-    'parseDefaultValue.kubeConfig'(val) {
-      this.$refs.yaml?.updateValue(val);
-    }
-  }
-};
-</script>
-
-<template>
-  <div>
-    <div class="row mt-20">
-      <div class="col span-12">
-        <RadioGroup
-          v-model:value="parseDefaultValue.removeUpstreamClusterWhenNamespaceIsDeleted"
-          :label="t('harvester.setting.rancherCluster.removeUpstreamClusterWhenNamespaceIsDeleted')"
-          name="removeUpstreamClusterWhenNamespaceIsDeleted"
-          :options="[true, false]"
-          :labels="[t('generic.enabled'), t('generic.disabled')]"
-          @update:value="update"
-        />
-      </div>
-    </div>
-    <div
-      v-if="parseDefaultValue.removeUpstreamClusterWhenNamespaceIsDeleted"
-      class="row mt-20"
-    >
-      <div class="col span-12">
-        <FileSelector
-          class="btn btn-sm bg-primary mb-10"
-          :label="t('generic.readFromFile')"
-          @selected="onKeySelected"
-        />
-        <YamlEditor
-          ref="yaml"
-          v-model:value="parseDefaultValue.kubeConfig"
-          class="yaml-editor"
-          :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
-          @update:value="update"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-$yaml-height: 540px;
-
-:deep() .yaml-editor{
-  flex: 1;
-  min-height: $yaml-height;
-  & .code-mirror .CodeMirror {
-    position: initial;
-    height: auto;
-    min-height: $yaml-height;
-  }
-}
-</style>

pkg/harvester/components/settings/support-bundle-namespaces.vue

@@ -18,20 +18,16 @@ export default {
 
     await this.$store.dispatch('harvester/findAll', { type: NAMESPACE });
 
-    if (this.customSupportBundleFeatureEnabled) {
-      try {
-        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl']('v1/harvester/namespaces?link=supportbundle');
-        const response = await this.$store.dispatch('harvester/request', { url });
+    try {
+      const url = this.$store.getters['harvester-common/getHarvesterClusterUrl']('v1/harvester/namespaces?link=supportbundle');
+      const response = await this.$store.dispatch('harvester/request', { url });
 
-        this.defaultNamespaces = response.data || [];
-      } catch (error) {
-        this.defaultNamespaces = [];
-      }
-    } else {
+      this.defaultNamespaces = response.data || [];
+    } catch (error) {
       this.defaultNamespaces = [];
+    } finally {
+      this.loading = false;
     }
-
-    this.loading = false;
   },
 
   data() {
@@ -46,30 +42,18 @@ export default {
   },
 
   computed: {
-    customSupportBundleFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('customSupportBundle');
-    },
-
     allNamespaces() {
       return this.$store.getters['harvester/all'](NAMESPACE).map((ns) => ns.id);
     },
 
     filteredNamespaces() {
-      if (!this.customSupportBundleFeatureEnabled) {
-        return this.allNamespaces;
-      }
-
       const defaultIds = this.defaultNamespaces.map((ns) => ns.id);
 
       return this.allNamespaces.filter((ns) => !defaultIds.includes(ns));
     },
 
     namespaceOptions() {
-      const mappedNamespaces = this.filteredNamespaces.map((ns) => ({ label: ns, value: ns }));
-
-      if (!this.customSupportBundleFeatureEnabled) {
-        return mappedNamespaces;
-      }
+      if (this.availableNamespaces.length === 0) return [];
 
       const allSelected =
         this.namespaces.length === this.filteredNamespaces.length &&
@@ -77,7 +61,7 @@ export default {
 
       const controlOption = allSelected ? { label: this.t('harvester.modal.bundle.namespaces.unselectAll'), value: UNSELECT_ALL } : { label: this.t('harvester.modal.bundle.namespaces.selectAll'), value: SELECT_ALL };
 
-      return [controlOption, ...mappedNamespaces];
+      return [controlOption, ...this.filteredNamespaces];
     }
   },
 

pkg/harvester/components/settings/vm-migration-network.vue

@@ -1,270 +0,0 @@
-<script>
-import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
-import { RadioGroup } from '@components/Form/Radio';
-import { Banner } from '@components/Banner';
-import ArrayList from '@shell/components/form/ArrayList';
-import { allHash } from '@shell/utils/promise';
-import { isValidCIDR } from '@shell/utils/validators/cidr';
-import { NODE } from '@shell/config/types';
-import { _EDIT } from '@shell/config/query-params';
-import { HCI } from '../../types';
-
-const DEFAULT_NETWORK = {
-  clusterNetwork: '',
-  vlan:           '',
-  range:          '',
-  exclude:        [],
-};
-
-export default {
-  name: 'VMMigrationNetwork',
-
-  components: {
-    LabeledInput,
-    LabeledSelect,
-    RadioGroup,
-    Banner,
-    ArrayList,
-  },
-
-  props: {
-    registerBeforeHook: {
-      type:     Function,
-      required: true,
-    },
-    mode: {
-      type:    String,
-      default: _EDIT,
-    },
-    value: {
-      type:    Object,
-      default: () => ({ value: '' }),
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    try {
-      await allHash({
-        clusterNetworks: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER_NETWORK }),
-        vlanStatus:      this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VLAN_STATUS }),
-        nodes:           this.$store.dispatch(`${ inStore }/findAll`, { type: NODE }),
-      });
-
-      this.fetchError = null;
-    } catch (e) {
-      console.error('Failed to fetch network data:', e); // eslint-disable-line no-console
-      this.fetchError = this.t('harvester.setting.vmMigrationNetwork.fetchError', { error: e.message || e }, true);
-    }
-  },
-
-  data() {
-    const { parsed, enabled, parseError } = this.parseInitialValue();
-
-    return {
-      enabled,
-      network:    { ...DEFAULT_NETWORK, ...parsed },
-      fetchError: null,
-      parseError,
-    };
-  },
-
-  created() {
-    this.registerBeforeHook?.(this.willSave, 'willSave');
-  },
-
-  computed: {
-    allErrors() {
-      return [this.fetchError, this.parseError].filter(Boolean);
-    },
-
-    clusterNetworkOptions() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const networks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
-
-      return networks.map((net) => ({
-        label:    net.isReadyForStorageNetwork ? net.id : `${ net.id } (${ this.t('generic.notReady') })`,
-        value:    net.id,
-        disabled: !net.isReadyForStorageNetwork,
-      }));
-    },
-
-    disableEdit() {
-      return !!(this.fetchError || this.parseError);
-    },
-  },
-
-  methods: {
-    parseInitialValue() {
-      let parsed = {};
-      let enabled = false;
-      let parseError = null;
-
-      try {
-        if (typeof this.value.value === 'string' && this.value.value.trim()) {
-          parsed = JSON.parse(this.value.value);
-          enabled = true;
-        }
-      } catch (e) {
-        console.error('[VMMigrationNetwork] Failed to parse value:', e); // eslint-disable-line no-console
-        parseError = this.t('harvester.setting.vmMigrationNetwork.parseError', { error: e.message }, true);
-      }
-
-      if (!Array.isArray(parsed.exclude)) {
-        parsed.exclude = [];
-      }
-
-      return {
-        parsed, enabled, parseError
-      };
-    },
-
-    clearErrors() {
-      this.fetchError = null;
-      this.parseError = null;
-    },
-
-    inputVlan(val) {
-      this.network.vlan = val ? Math.min(4094, Math.max(1, Number(val))) : '';
-      this.update();
-    },
-
-    useDefault() {
-      this.network = { ...DEFAULT_NETWORK };
-      this.value.value = '';
-      this.enabled = false;
-      this.clearErrors();
-    },
-
-    update() {
-      try {
-        this.value.value = this.enabled ? JSON.stringify({
-          ...this.network,
-          exclude: (this.network.exclude || []).filter((e) => !!e?.trim()),
-        }) : '';
-      } catch (e) {
-        console.error('Failed to stringify network config:', e); // eslint-disable-line no-console
-        this.value.value = '';
-      }
-    },
-
-    validateInputs() {
-      const errors = [];
-
-      if (!this.network.clusterNetwork) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.setting.vmMigrationNetwork.clusterNetwork') }, true));
-      }
-
-      if (!this.network.range) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.setting.vmMigrationNetwork.range.label') }, true));
-      } else if (!isValidCIDR(this.network.range)) {
-        errors.push(this.t('harvester.setting.vmMigrationNetwork.range.invalid', null, true));
-      }
-
-      if (this.network.vlan === '') {
-        errors.push(this.t('validation.required', { key: this.t('harvester.setting.vmMigrationNetwork.vlan') }, true));
-      } else {
-        const vlan = Number(this.network.vlan);
-
-        if (isNaN(vlan) || vlan < 1 || vlan > 4094) {
-          errors.push(this.t('validation.between', {
-            key: this.t('harvester.setting.vmMigrationNetwork.vlan'),
-            min: 1,
-            max: 4094,
-          }, true));
-        }
-      }
-
-      for (const cidr of this.network.exclude || []) {
-        if (cidr && !isValidCIDR(cidr)) {
-          errors.push(this.t('harvester.setting.storageNetwork.exclude.invalid', { value: cidr }, true));
-        }
-      }
-
-      return errors;
-    },
-
-    async willSave() {
-      if (!this.enabled) {
-        this.useDefault();
-
-        return Promise.resolve();
-      }
-
-      this.update();
-
-      const errors = this.validateInputs();
-
-      return errors.length ? Promise.reject(errors) : Promise.resolve();
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <Banner
-      v-for="(errorMsg, index) in allErrors"
-      :key="index"
-      color="error"
-    >
-      {{ errorMsg }}
-    </Banner>
-    <RadioGroup
-      v-model:value="enabled"
-      class="mb-20"
-      name="enableMigrationNetwork"
-      :options="[true, false]"
-      :labels="[t('generic.enabled'), t('generic.disabled')]"
-      @update:value="update"
-    />
-    <template v-if="enabled">
-      <LabeledSelect
-        v-model:value="network.clusterNetwork"
-        required
-        label-key="harvester.setting.vmMigrationNetwork.clusterNetwork"
-        class="mb-20"
-        :mode="mode"
-        :options="clusterNetworkOptions"
-        :disabled="disableEdit"
-        @update:value="update"
-      />
-      <LabeledInput
-        v-model:value.number="network.vlan"
-        required
-        type="number"
-        class="mb-20"
-        :min="1"
-        :max="4094"
-        :mode="mode"
-        placeholder="e.g. 1 - 4094"
-        label-key="harvester.setting.vmMigrationNetwork.vlan"
-        :disabled="disableEdit"
-        @update:value="inputVlan"
-      />
-      <LabeledInput
-        v-model:value="network.range"
-        required
-        class="mb-5"
-        :mode="mode"
-        :placeholder="t('harvester.setting.vmMigrationNetwork.range.placeholder')"
-        label-key="harvester.setting.vmMigrationNetwork.range.label"
-        :disabled="disableEdit"
-        @update:value="update"
-      />
-      <ArrayList
-        v-model:value="network.exclude"
-        :show-header="true"
-        :default-add-value="''"
-        :mode="mode"
-        :add-disabled="disableEdit"
-        :add-label="t('harvester.setting.vmMigrationNetwork.exclude.addButton')"
-        :value-label="t('harvester.setting.vmMigrationNetwork.exclude.label')"
-        :value-placeholder="t('harvester.setting.storageNetwork.exclude.placeholder')"
-        @update:value="update"
-      />
-    </template>
-  </div>
-</template>

pkg/harvester/config/doc-links.js

@@ -1,13 +1,10 @@
 // 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`,
-  VPC_CONFIGURATION_EXAMPLES: `/networking/kubeovn-vpc#vpc-peering-configuration-examples`,
-  NETWORK_POLICY:             `/networking/kubeovn-vm-isolation/#network-policies`,
-  TRANSPARENT_HUGEPAGES:      `https://docs.kernel.org/admin-guide/mm/transhuge.html`,
+  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`,
 };

pkg/harvester/config/feature-flags.js

@@ -39,27 +39,9 @@ const FEATURE_FLAGS = {
   ],
   'v1.5.1': [],
   'v1.6.0': [
-    'customSupportBundle',
-    'csiOnlineExpandValidation',
-    'vmNetworkMigration',
-    'kubeovnVpcSubnet',
-    'rancherClusterSetting',
-    'cpuMemoryHotplug',
-    'cdiSettings',
-    'vmCloneRunStrategy',
-  ],
-  'v1.6.1': [],
-  'v1.7.0': [
-    'vmMachineTypeAuto',
-    'lhV2VolExpansion',
-    'l2VlanTrunkMode',
-    'kubevirtMigration',
-    'hotplugNic'
-  ],
-  'v1.7.1': [],
-  'v1.7.2': [
-    'clusterRegistrationTLSVerify'
-  ],
+    'vmMachineTypes',
+    'customSupportBundle'
+  ]
 };
 
 const generateFeatureFlags = () => {

pkg/harvester/config/harvester-cluster.js

@@ -10,7 +10,6 @@ import {
   LOGGING,
   STORAGE_CLASS,
   SECRET,
-  NETWORK_POLICY
 } from '@shell/config/types';
 import { HCI, VOLUME_SNAPSHOT } from '../types';
 import {
@@ -425,8 +424,6 @@ export function init($plugin, store) {
     [
       HCI.CLUSTER_NETWORK,
       HCI.NETWORK_ATTACHMENT,
-      HCI.VPC,
-      NETWORK_POLICY,
       HCI.LB,
       HCI.IP_POOL,
     ],
@@ -457,7 +454,6 @@ export function init($plugin, store) {
       HCI.PCI_DEVICE,
       HCI.SR_IOVGPU_DEVICE,
       HCI.VGPU_DEVICE,
-      HCI.MIG_CONFIGURATION,
       HCI.USB_DEVICE,
       HCI.ADD_ONS,
       HCI.SECRET,
@@ -554,36 +550,6 @@ export function init($plugin, store) {
     exact: false
   });
 
-  configureType(HCI.VPC, { hiddenNamespaceGroupButton: true, canYaml: false });
-
-  virtualType({
-    labelKey:   'harvester.vpc.label',
-    name:       HCI.VPC,
-    namespaced: true,
-    weight:     187,
-    route:      {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VPC }
-    },
-    exact:      false,
-    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:    {
@@ -850,26 +816,6 @@ export function init($plugin, store) {
     ]
   });
 
-  virtualType({
-    labelKey:   'harvester.migconfiguration.label',
-    group:      'advanced',
-    weight:     12,
-    name:       HCI.MIG_CONFIGURATION,
-    namespaced: false,
-    route:      {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.MIG_CONFIGURATION }
-    },
-    exact:      false,
-    ifHaveType: HCI.MIG_CONFIGURATION,
-  });
-
-  configureType(HCI.MIG_CONFIGURATION, {
-    isCreatable:                false,
-    hiddenNamespaceGroupButton: true,
-    canYaml:                    false,
-  });
-
   virtualType({
     labelKey:   'harvester.usb.label',
     group:      'advanced',

pkg/harvester/config/harvester-map.js

@@ -1,5 +1,3 @@
-import { HCI } from '../types';
-
 // TODO: delete this not used variable
 export const MemoryUnit = [{
   label: 'Mi',
@@ -72,7 +70,6 @@ export const ADD_ONS = {
   RANCHER_MONITORING:               'rancher-monitoring',
   VM_IMPORT_CONTROLLER:             'vm-import-controller',
   LVM_DRIVER:                       'lvm.driver.harvesterhci.io',
-  KUBEOVN_OPERATOR:                 'kubeovn-operator',
 };
 
 export const CSI_SECRETS = {
@@ -83,14 +80,3 @@ export const CSI_SECRETS = {
   CSI_NODE_STAGE_SECRET_NAME:        'csi.storage.k8s.io/node-stage-secret-name',
   CSI_NODE_STAGE_SECRET_NAMESPACE:   'csi.storage.k8s.io/node-stage-secret-namespace',
 };
-
-// Some harvester CRD type is not equal to model file name, define the mapping here
-export const HARVESTER_CRD_MAP = {
-  node:                                     HCI.HOST,
-  configmap:                                HCI.CLOUD_TEMPLATE,
-  persistentvolumeclaim:                    HCI.VOLUME,
-  'snapshot.storage.k8s.io.volumesnapshot': HCI.SNAPSHOT,
-  // specific groupable table detail page
-  'network.harvesterhci.io.vlanconfig':     HCI.CLUSTER_NETWORK,
-  'kubeovn.io.subnet':                      HCI.VPC
-};

pkg/harvester/config/labels-annotations.js

@@ -50,7 +50,6 @@ export const HCI = {
   STORAGE_CLASS:                    'harvesterhci.io/storageClassName',
   STORAGE_NETWORK:                  'storage-network.settings.harvesterhci.io',
   ADDON_EXPERIMENTAL:               'addon.harvesterhci.io/experimental',
-  ADDON_DISPLAYNAME:                'addon.harvesterhci.io/displayName',
   VOLUME_ERROR:                     'longhorn.io/volume-scheduling-error',
   VOLUME_FOR_VM:                    'harvesterhci.io/volumeForVirtualMachine',
   KVM_AMD_CPU:                      'cpu-feature.node.kubevirt.io/svm',
@@ -71,11 +70,5 @@ export const HCI = {
   K8S_ARCH:                         'kubernetes.io/arch',
   IMAGE_DISPLAY_NAME:               'harvesterhci.io/imageDisplayName',
   CUSTOM_IP:                        'harvesterhci.io/custom-ip',
-  IMPORTED_IMAGE:                   'migration.harvesterhci.io/imported',
-  VM_CPU_MEMORY_HOTPLUG:            'harvesterhci.io/enableCPUAndMemoryHotplug',
-  FILESYSTEM_OVERHEAD:              'cdi.harvesterhci.io/filesystemOverhead',
-  CLONE_STRATEGY:                   'cdi.harvesterhci.io/storageProfileCloneStrategy',
-  VOLUME_MODE_ACCESS_MODES:         'cdi.harvesterhci.io/storageProfileVolumeModeAccessModes',
-  VOLUME_SNAPSHOT_CLASS:            'cdi.harvesterhci.io/storageProfileVolumeSnapshotClass',
-  MAC_ADDRESS:                      'harvesterhci.io/mac-address',
+  IMPORTED_IMAGE:                   'migration.harvesterhci.io/imported'
 };

pkg/harvester/config/query-params.js

@@ -1,2 +1 @@
 export const CLUSTER_NETWORK = 'clusterNetwork';
-export const VPC = 'vpc';

pkg/harvester/config/settings.ts

@@ -4,6 +4,7 @@ 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',
@@ -27,7 +28,6 @@ export const HCI_SETTING = {
   RELEASE_DOWNLOAD_URL:                   'release-download-url',
   CCM_CSI_VERSION:                        'harvester-csi-ccm-versions',
   CSI_DRIVER_CONFIG:                      'csi-driver-config',
-  CSI_ONLINE_EXPAND_VALIDATION:           'csi-online-expand-validation',
   VM_TERMINATION_PERIOD:                  'default-vm-termination-grace-period-seconds',
   NTP_SERVERS:                            'ntp-servers',
   AUTO_ROTATE_RKE2_CERTS:                 'auto-rotate-rke2-certs',
@@ -35,10 +35,6 @@ export const HCI_SETTING = {
   LONGHORN_V2_DATA_ENGINE_ENABLED:        'longhorn-v2-data-engine-enabled',
   ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO: 'additional-guest-memory-overhead-ratio',
   UPGRADE_CONFIG:                         'upgrade-config',
-  VM_MIGRATION_NETWORK:                   'vm-migration-network',
-  RANCHER_CLUSTER:                        'rancher-cluster',
-  MAX_HOTPLUG_RATIO:                      'max-hotplug-ratio',
-  KUBEVIRT_MIGRATION:                     'kubevirt-migration'
 };
 
 export const HCI_ALLOWED_SETTINGS = {
@@ -57,15 +53,12 @@ export const HCI_ALLOWED_SETTINGS = {
     from:        'import',
     featureFlag: 'autoRotateRke2CertsSetting'
   },
-  [HCI_SETTING.CSI_DRIVER_CONFIG]:            { kind: 'json', from: 'import' },
-  [HCI_SETTING.CSI_ONLINE_EXPAND_VALIDATION]: {
-    kind: 'json', from: 'import', featureFlag: 'csiOnlineExpandValidation'
-  },
-  [HCI_SETTING.SERVER_VERSION]:               { readOnly: true },
-  [HCI_SETTING.UPGRADE_CHECKER_ENABLED]:      { kind: 'boolean' },
-  [HCI_SETTING.UPGRADE_CHECKER_URL]:          { kind: 'url' },
-  [HCI_SETTING.HTTP_PROXY]:                   { kind: 'json', from: 'import' },
-  [HCI_SETTING.ADDITIONAL_CA]:                {
+  [HCI_SETTING.CSI_DRIVER_CONFIG]:       { kind: 'json', from: 'import' },
+  [HCI_SETTING.SERVER_VERSION]:          { readOnly: true },
+  [HCI_SETTING.UPGRADE_CHECKER_ENABLED]: { kind: 'boolean' },
+  [HCI_SETTING.UPGRADE_CHECKER_URL]:     { kind: 'url' },
+  [HCI_SETTING.HTTP_PROXY]:              { kind: 'json', from: 'import' },
+  [HCI_SETTING.ADDITIONAL_CA]:           {
     kind: 'multiline', canReset: true, from: 'import'
   },
   [HCI_SETTING.OVERCOMMIT_CONFIG]:                      { kind: 'json', from: 'import' },
@@ -84,6 +77,7 @@ 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
   },
@@ -109,22 +103,11 @@ export const HCI_ALLOWED_SETTINGS = {
     featureFlag: 'upgradeConfigSetting',
     docPath:      'UPGRADE_CONFIG_URL'
   },
-  [HCI_SETTING.RANCHER_CLUSTER]:                        {
-    kind: 'custom', from: 'import', canReset: true, featureFlag: 'rancherClusterSetting'
-  },
-  [HCI_SETTING.MAX_HOTPLUG_RATIO]:    { kind: 'number', featureFlag: 'cpuMemoryHotplug' },
-  [HCI_SETTING.VM_MIGRATION_NETWORK]:  {
-    kind: 'json', from: 'import', canReset: true, featureFlag: 'vmNetworkMigration',
-  },
-  [HCI_SETTING.KUBEVIRT_MIGRATION]: {
-    kind: 'json', from: 'import', canReset: true, featureFlag: 'kubevirtMigration',
-  }
 };
 
 export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
   [HCI_SETTING.CLUSTER_REGISTRATION_URL]: {
-    kind:     'custom',
-    from:     'import',
+    kind:     'url',
     canReset: true,
   },
   [HCI_SETTING.UI_PL]: {

pkg/harvester/config/table-headers.js

@@ -104,30 +104,3 @@ export const HARVESTER_DESCRIPTION = {
   ...DESCRIPTION,
   width: 150,
 };
-
-// The CIDR_BLOCK column in VPC list page
-export const CIDR_BLOCK = {
-  name:     'cidrBlock',
-  labelKey: 'harvester.subnet.cidrBlock.label',
-  sort:     'cidrBlock',
-  value:    'spec.cidrBlock',
-  align:    'left',
-};
-
-// The Protocol column in VPC list page
-export const PROTOCOL = {
-  name:     'protocol',
-  labelKey: 'harvester.subnet.protocol.label',
-  sort:     'protocol',
-  value:    'spec.protocol',
-  align:    'left',
-};
-
-// The Provider column in VPC list page
-export const PROVIDER = {
-  name:     'provider',
-  labelKey: 'harvester.subnet.provider.label',
-  sort:     'provider',
-  value:    'spec.provider',
-  align:    'left',
-};

pkg/harvester/config/types.js

@@ -4,28 +4,11 @@ export const BACKUP_TYPE = {
 };
 
 export const NETWORK_TYPE = {
-  L2VLAN:       'L2VlanNetwork',
-  UNTAGGED:     'UntaggedNetwork',
-  OVERLAY:      'OverlayNetwork',
-  L2TRUNK_VLAN: 'L2VlanTrunkNetwork',
+  L2VLAN:   'L2VlanNetwork',
+  UNTAGGED: 'UntaggedNetwork'
 };
 
 export const VOLUME_MODE = {
   BLOCK:       'Block',
   FILE_SYSTEM: 'Filesystem'
 };
-
-export const NETWORK_PROTOCOL = {
-  IPv4: 'IPv4',
-  IPv6: 'IPv6',
-};
-
-export const INTERNAL_STORAGE_CLASS = {
-  VMSTATE_PERSISTENCE: 'vmstate-persistence',
-  LONGHORN_STATIC:     'longhorn-static',
-};
-
-export const L2VLAN_MODE = {
-  ACCESS: 'access',
-  TRUNK:  'trunk',
-};

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

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

pkg/harvester/detail/harvesterhci.io.host/HarvesterHugepages.vue

@@ -1,119 +0,0 @@
-<script>
-import LabelValue from '@shell/components/LabelValue';
-import { HCI } from '../../types';
-import { DOC } from '../../config/doc-links';
-
-export default {
-  name:       'HarvesterHugepages',
-  components: { LabelValue },
-
-  props: {
-    node: {
-      type:     Object,
-      required: true,
-    },
-  },
-
-  computed: {
-    docsTransparentHugepagesLink() {
-      return DOC.TRANSPARENT_HUGEPAGES;
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    const hash = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.HUGEPAGES });
-
-    this.hugepages = hash.find((node) => {
-      return node.id === this.node.id;
-    }) || {};
-  },
-
-  data() {
-    return { hugepages: {} };
-  },
-};
-</script>
-
-<template>
-  <div>
-    <template v-if="hugepages.status">
-      <h2>{{ t('harvester.host.hugepages.meminfo') }}</h2>
-
-      <div class="row mb-20">
-        <div class="col span-6">
-          <LabelValue
-            :name="t('harvester.host.hugepages.status.anon')"
-            :value="hugepages.status.meminfo.anonHugePages"
-          />
-        </div>
-        <div class="col span-6">
-          <LabelValue
-            :name="t('harvester.host.hugepages.status.size')"
-            :value="hugepages.status.meminfo.hugepageSize"
-          />
-        </div>
-      </div>
-
-      <div class="row mb-20">
-        <div class="col span-3">
-          <LabelValue
-            :name="t('harvester.host.hugepages.status.total')"
-            :value="hugepages.status.meminfo.hugePagesTotal"
-          />
-        </div>
-        <div class="col span-3">
-          <LabelValue
-            :name="t('harvester.host.hugepages.status.free')"
-            :value="hugepages.status.meminfo.hugePagesFree"
-          />
-        </div>
-        <div class="col span-3">
-          <LabelValue
-            :name="t('harvester.host.hugepages.status.rsvd')"
-            :value="hugepages.status.meminfo.hugePagesRsvd"
-          />
-        </div>
-        <div class="col span-3">
-          <LabelValue
-            :name="t('harvester.host.hugepages.status.surp')"
-            :value="hugepages.status.meminfo.hugePagesSurp"
-          />
-        </div>
-      </div>
-
-      <div>
-        <hr class="divider" />
-        <h3>
-          <t
-            k="harvester.host.hugepages.transparent.title"
-            :raw="true"
-            :url="docsTransparentHugepagesLink"
-          />
-        </h3>
-
-        <div class="row mb-20">
-          <div class="col span-4">
-            <LabelValue
-              :name="t('harvester.host.hugepages.transparent.enabled')"
-              :value="hugepages.spec.transparent.enabled"
-            />
-          </div>
-          <div class="col span-4">
-            <LabelValue
-              :name="t('harvester.host.hugepages.transparent.shmemEnabled')"
-              :value="hugepages.spec.transparent.shmemEnabled"
-            />
-          </div>
-          <div class="col span-4">
-            <LabelValue
-              :name="t('harvester.host.hugepages.transparent.defrag')"
-              :value="hugepages.spec.transparent.defrag"
-            />
-          </div>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>

pkg/harvester/detail/harvesterhci.io.host/VirtualMachineInstance.vue

@@ -47,26 +47,20 @@ export default {
         STATE,
         NAME,
         {
-          name:        'CPU',
-          label:       'CPU',
-          sort:        ['displayCPU'],
-          value:       'displayCPU',
-          align:       'center',
-          dashIfEmpty: true,
+          name:     'vmCPU',
+          labelKey: 'tableHeaders.cpu',
+          search:   false,
+          sort:     ['spec.template.spec.domain.cpu.cores'],
+          value:    'spec.template.spec.domain.cpu.cores',
+          width:    120
         },
         {
-          name:          'Memory',
-          value:         'displayMemory',
-          sort:          ['memorySort'],
-          align:         'center',
-          labelKey:      'tableHeaders.memory',
-          formatter:     'Si',
-          formatterOpts: {
-            opts: {
-              increment: 1024, addSuffix: true, maxExponent: 3, minExponent: 3, suffix: 'i',
-            },
-            needParseSi: true
-          },
+          name:     'vmRAM',
+          labelKey: 'glance.memory',
+          search:   false,
+          sort:     ['memorySort'],
+          value:    'spec.template.spec.domain.resources.limits.memory',
+          width:    120
         },
         {
           name:      'ip',

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

@@ -27,7 +27,6 @@ import Instance from './VirtualMachineInstance';
 import Disk from './HarvesterHostDisk';
 import VlanStatus from './VlanStatus';
 import HarvesterKsmtuned from './HarvesterKsmtuned.vue';
-import HarvesterHugepages from './HarvesterHugepages.vue';
 import HarvesterSeeder from './HarvesterSeeder';
 
 const LONGHORN_SYSTEM = 'longhorn-system';
@@ -47,7 +46,6 @@ export default {
     VlanStatus,
     LabelValue,
     HarvesterKsmtuned,
-    HarvesterHugepages,
     Loading,
     SortableTable,
     HarvesterSeeder,
@@ -211,12 +209,6 @@ export default {
       return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.KSTUNED);
     },
 
-    hasHugepagesSchema() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.HUGEPAGES);
-    },
-
     hasBlockDevicesSchema() {
       return !!this.$store.getters['harvester/schemaFor'](HCI.BLOCK_DEVICE);
     },
@@ -476,16 +468,6 @@ export default {
         />
       </Tab>
 
-      <Tab
-        v-if="hasHugepagesSchema"
-        name="hugepages"
-        :weight="0"
-        :show-header="false"
-        :label="t('harvester.host.tabs.hugepages')"
-      >
-        <HarvesterHugepages :node="value" />
-      </Tab>
-
       <Tab
         v-if="seederEnabled"
         name="seeder"

pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue

@@ -172,9 +172,6 @@ export default {
             :cpu="cpu"
             :mode="mode"
             :memory="memory"
-            :max-cpu="maxCpu"
-            :max-memory="maxMemory"
-            :enable-hot-plug="cpuMemoryHotplugEnabled"
           />
         </div>
         <div class="row">

pkg/harvester/detail/harvesterhci.io.vmsnapshot/index.vue

@@ -172,9 +172,6 @@ export default {
           :cpu="cpu"
           :mode="mode"
           :memory="memory"
-          :max-cpu="maxCpu"
-          :max-memory="maxMemory"
-          :enable-hot-plug="cpuMemoryHotplugEnabled"
         />
 
         <div class="row mb-10">

pkg/harvester/detail/kubevirt.io.virtualmachine/VirtualMachineTabs/VirtualMachineBasics.vue

@@ -5,7 +5,6 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import HarvesterIpAddress from '../../../formatters/HarvesterIpAddress';
 import VMConsoleBar from '../../../components/VMConsoleBar';
 import { HCI } from '../../../types';
-import { getVmCPUMemoryValues } from '../../../utils/cpuMemory';
 
 const UNDEFINED = 'n/a';
 
@@ -92,9 +91,9 @@ export default {
     },
 
     flavor() {
-      const { cpu, memory } = getVmCPUMemoryValues(this.value);
+      const domain = this.value?.spec?.template?.spec?.domain;
 
-      return `${ cpu } vCPU , ${ memory } ${ this.t('harvester.virtualMachine.input.memory') }`;
+      return `${ domain.cpu?.cores } vCPU , ${ domain.resources?.limits?.memory } ${ this.t('harvester.virtualMachine.input.memory') }`;
     },
 
     kernelRelease() {

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

@@ -139,18 +139,10 @@ export default {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const vmimList = this.$store.getters[`${ inStore }/all`](HCI.VMIM) || [];
 
-      const vmiName = this.vmi?.name || '';
+      const migrationUid = this.vmi?.status?.migrationState?.migrationUid;
+      const vmim = vmimList.find((VMIM) => VMIM?.metadata?.uid === migrationUid);
 
-      // filter the corresponding vmims by vmim.spec.vmiName and find the latest one by creationTimestamp
-      const vmim = vmimList.filter((VMIM) => VMIM?.spec?.vmiName === vmiName).sort((a, b) => {
-        if (a?.metadata?.creationTimestamp > b?.metadata?.creationTimestamp) {
-          return -1;
-        }
-
-        return 1;
-      });
-
-      return vmim.length > 0 && vmim[0] ? vmim[0] : null;
+      return vmim;
     },
 
     migrationEvents() {
@@ -213,7 +205,6 @@ export default {
         const diskRows = this.getDiskRows(neu);
 
         this['diskRows'] = diskRows;
-        this['networkRows'] = this.getNetworkRows(neu, { fromTemplate: false, init: false });
       },
       deep: true
     }
@@ -266,7 +257,6 @@ export default {
         <Network
           v-model:value="networkRows"
           mode="view"
-          :vm="value"
         />
       </Tab>
 

pkg/harvester/dialog/CloneVmDialog.vue

@@ -1,13 +1,12 @@
 <script>
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { mapGetters } from 'vuex';
-import { runStrategies as runStrategyOptions } from '../config/harvester-map';
+
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import { Checkbox } from '@components/Form/Checkbox';
 import AsyncButton from '@shell/components/AsyncButton';
 import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 export default {
   name: 'CloneVMModal',
@@ -15,7 +14,7 @@ export default {
   emits: ['close'],
 
   components: {
-    AsyncButton, Banner, Checkbox, Card, LabeledInput, LabeledSelect
+    AsyncButton, Banner, Checkbox, Card, LabeledInput
   },
 
   props: {
@@ -27,11 +26,9 @@ export default {
 
   data() {
     return {
-      name:        '',
-      cloneData:   true,
-      errors:      [],
-      runStrategy: runStrategyOptions[1],
-      runStrategyOptions
+      name:      '',
+      cloneData: true,
+      errors:    []
     };
   },
 
@@ -41,9 +38,6 @@ export default {
     actionResource() {
       return this.resources[0];
     },
-    vmCloneRunStrategyEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('vmCloneRunStrategy');
-    },
   },
 
   methods: {
@@ -64,8 +58,7 @@ export default {
 
       // deep clone
       try {
-        const payload = this.vmCloneRunStrategyEnabled ? { targetVm: this.name, runStrategy: this.runStrategy } : { targetVm: this.name };
-        const res = await this.actionResource.doAction('clone', payload, {}, false);
+        const res = await this.actionResource.doAction('clone', { targetVm: this.name }, {}, false);
 
         if (res._status === 200 || res._status === 204) {
           this.$store.dispatch('growl/success', {
@@ -113,13 +106,6 @@ export default {
         :label="t('harvester.modal.cloneVM.name')"
         required
       />
-      <LabeledSelect
-        v-if="vmCloneRunStrategyEnabled"
-        v-model:value="runStrategy"
-        label-key="harvester.virtualMachine.runStrategy"
-        :options="runStrategyOptions"
-        :mode="mode"
-      />
       <Banner
         v-for="(err, i) in errors"
         :key="i"

pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue

@@ -32,7 +32,7 @@ export default {
     resources: {
       type:     Array,
       required: true
-    },
+    }
   },
 
   data() {
@@ -43,7 +43,7 @@ export default {
     ...mapState('action-menu', ['modalData']),
 
     title() {
-      return this.modalData?.title || 'dialog.promptRemove.title';
+      return this.modalData.title || 'dialog.promptRemove.title';
     },
 
     formattedType() {
@@ -51,7 +51,7 @@ export default {
     },
 
     warningMessage() {
-      if (this.modalData?.warningMessage) return this.modalData.warningMessage;
+      if (this.modalData.warningMessage) return this.modalData.warningMessage;
 
       const isPlural = this.type.endsWith('s');
       const thisOrThese = isPlural ? 'these' : 'this';
@@ -145,7 +145,6 @@ export default {
       try {
         for (const resource of this.resources) {
           await resource.remove();
-          if (this.modalData?.extraActionAfterRemove) await this.modalData.extraActionAfterRemove();
         }
         buttonDone(true);
         this.close();

pkg/harvester/dialog/DeepCloneVmDialog.vue

@@ -0,0 +1,149 @@
+<script>
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { mapGetters } from 'vuex';
+
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import { Checkbox } from '@components/Form/Checkbox';
+import AsyncButton from '@shell/components/AsyncButton';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
+export default {
+  name: 'CloneVMModal',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton, Banner, Checkbox, Card, LabeledInput
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  data() {
+    return {
+      name:      '',
+      cloneData: true,
+      errors:    []
+    };
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources[0];
+    },
+  },
+
+  methods: {
+    close() {
+      this.name = '';
+      this.$emit('close');
+    },
+
+    async create(buttonCb) {
+      // shadow clone
+      if (!this.cloneData) {
+        this.resources[0].goToClone();
+        buttonCb(false);
+        this.close();
+
+        return;
+      }
+
+      // deep clone
+      try {
+        const res = await this.actionResource.doAction('clone', { targetVm: this.name }, {}, false);
+
+        if (res._status === 200 || res._status === 204) {
+          this.$store.dispatch('growl/success', {
+            title:   this.t('harvester.notification.title.succeed'),
+            message: this.t('harvester.modal.cloneVM.message.success', { name: this.name })
+          }, { root: true });
+
+          this.close();
+          buttonCb(true);
+        } else {
+          const error = [res?.data] || exceptionToErrorsArray(res);
+
+          this['errors'] = error;
+          buttonCb(false);
+        }
+      } catch (err) {
+        const error = err?.data || err;
+        const message = exceptionToErrorsArray(error);
+
+        this['errors'] = message;
+        buttonCb(false);
+      }
+    }
+  },
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <template #title>
+      {{ t('harvester.modal.cloneVM.title') }}
+    </template>
+
+    <template #body>
+      <Checkbox
+        v-model:value="cloneData"
+        class="mb-10"
+        label-key="harvester.modal.cloneVM.type"
+      />
+
+      <LabeledInput
+        v-show="cloneData"
+        v-model:value="name"
+        class="mb-20"
+        :label="t('harvester.modal.cloneVM.name')"
+        required
+      />
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        :label="err"
+        color="error"
+      />
+    </template>
+
+    <template #actions>
+      <div class="actions">
+        <div class="buttons">
+          <button
+            class="btn role-secondary mr-10"
+            @click="close"
+          >
+            {{ t('generic.cancel') }}
+          </button>
+
+          <AsyncButton
+            mode="create"
+            :action-label="cloneData ? t('harvester.modal.cloneVM.action.create') : t('harvester.modal.cloneVM.action.clone')"
+            :disabled="cloneData && !name"
+            @click="create"
+          />
+        </div>
+      </div>
+    </template>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>

pkg/harvester/dialog/HarvesterAddHotplugModal.vue

@@ -11,7 +11,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 export default {
-  name: 'HotplugVolumeModal',
+  name: 'HotplugModal',
 
   emits: ['close'],
 
@@ -62,7 +62,7 @@ export default {
               return false;
             }
 
-            return true;
+            return !pvc.attachVM;
           })
           .map((pvc) => {
             return {
@@ -90,7 +90,7 @@ export default {
           if (res._status === 200 || res._status === 204) {
             this.$store.dispatch('growl/success', {
               title:   this.t('generic.notification.title.succeed'),
-              message: this.t('harvester.modal.hotplugVolume.success', { diskName: this.diskName, vm: this.actionResource.nameDisplay })
+              message: this.t('harvester.modal.hotplug.success', { diskName: this.diskName, vm: this.actionResource.nameDisplay })
             }, { root: true });
 
             this.close();
@@ -122,7 +122,7 @@ export default {
   >
     <template #title>
       <h4
-        v-clean-html="t('harvester.modal.hotplugVolume.title')"
+        v-clean-html="t('harvester.modal.hotplug.title')"
         class="text-default-text"
       />
     </template>

pkg/harvester/dialog/HarvesterAddHotplugNic.vue

@@ -1,212 +0,0 @@
-<script>
-import { exceptionToErrorsArray } from '@shell/utils/error';
-import { mapGetters } from 'vuex';
-import { NETWORK_ATTACHMENT } from '@shell/config/types';
-import { Card } from '@components/Card';
-import { Banner } from '@components/Banner';
-import AsyncButton from '@shell/components/AsyncButton';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
-import { NETWORK_TYPE } from '../config/types';
-
-export default {
-  name: 'AddHotplugNic',
-
-  emits: ['close'],
-
-  components: {
-    AsyncButton,
-    Card,
-    LabeledInput,
-    LabeledSelect,
-    Banner
-  },
-
-  props: {
-    resources: {
-      type:     Array,
-      required: true
-    }
-  },
-
-  async fetch() {
-    try {
-      this.allVMNetworks = await this.$store.dispatch('harvester/findAll', { type: NETWORK_ATTACHMENT });
-    } catch (err) {
-      this.errors = exceptionToErrorsArray(err);
-      this.allVMNetworks = [];
-    }
-  },
-
-  data() {
-    return {
-      interfaceName: '',
-      networkName:   '',
-      macAddress:    '',
-      allVMNetworks: [],
-      errors:        [],
-    };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    actionResource() {
-      return this.resources?.[0];
-    },
-
-    isFormValid() {
-      return this.interfaceName !== '' && this.networkName !== '';
-    },
-
-    vmNetworksOption() {
-      return this.allVMNetworks
-        .filter((network) => {
-          const labels = network.metadata?.labels || {};
-          const type = labels[HCI_ANNOTATIONS.NETWORK_TYPE];
-
-          const isValidType = [
-            NETWORK_TYPE.L2VLAN,
-            NETWORK_TYPE.UNTAGGED,
-            NETWORK_TYPE.L2TRUNK_VLAN,
-          ].includes(type);
-
-          return isValidType && !network.isSystem;
-        })
-        .map((network) => {
-          const label = network.isNotReady ? `${ network.id } (${ this.t('generic.notReady') })` : network.id;
-
-          return ({
-            label,
-            value:    network.id || '',
-            disabled: network.isNotReady,
-          });
-        });
-    }
-  },
-
-  methods: {
-    close() {
-      this.interfaceName = '';
-      this.networkName = '';
-      this.macAddress = '';
-      this.errors = [];
-      this.$emit('close');
-    },
-
-    async save(buttonCb) {
-      if (!this.actionResource) {
-        buttonCb(false);
-
-        return;
-      }
-
-      const payload = {
-        interfaceName: this.interfaceName,
-        networkName:   this.networkName
-      };
-
-      if (this.macAddress) {
-        payload.macAddress = this.macAddress;
-      }
-
-      try {
-        const res = await this.actionResource.doAction('addNic', payload);
-
-        if ([200, 204].includes(res?._status)) {
-          this.$store.dispatch('growl/success', {
-            title:   this.t('generic.notification.title.succeed'),
-            message: this.t('harvester.modal.hotplugNic.success', {
-              interfaceName: this.interfaceName,
-              vm:            this.actionResource.nameDisplay
-            })
-          }, { root: true });
-
-          this.close();
-          buttonCb(true);
-        } else {
-          this.errors = exceptionToErrorsArray(res);
-          buttonCb(false);
-        }
-      } catch (err) {
-        this.errors = exceptionToErrorsArray(err);
-        buttonCb(false);
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <Card
-    ref="modal"
-    name="modal"
-    :show-highlight-border="false"
-  >
-    <template #title>
-      <h4
-        v-clean-html="t('harvester.modal.hotplugNic.title')"
-        class="text-default-text"
-      />
-    </template>
-
-    <template #body>
-      <LabeledInput
-        v-model:value="interfaceName"
-        :label="t('generic.name')"
-        required
-      />
-      <LabeledSelect
-        v-model:value="networkName"
-        class="mt-20"
-        :label="t('harvester.modal.hotplugNic.vmNetwork')"
-        :options="vmNetworksOption"
-        required
-      />
-      <LabeledInput
-        v-model:value="macAddress"
-        class="mt-20"
-        label-key="harvester.modal.hotplugNic.macAddress"
-        :tooltip="t('harvester.modal.hotplugNic.macAddressTooltip', _, true)"
-      />
-      <Banner
-        v-for="(err, i) in errors"
-        :key="i"
-        :label="err"
-        color="error"
-      />
-    </template>
-
-    <template #actions>
-      <div class="actions">
-        <div class="buttons">
-          <button
-            type="button"
-            class="btn role-secondary mr-10"
-            @click="close"
-          >
-            {{ t('generic.cancel') }}
-          </button>
-
-          <AsyncButton
-            mode="apply"
-            :disabled="!isFormValid"
-            @click="save"
-          />
-        </div>
-      </div>
-    </template>
-  </Card>
-</template>
-
-<style lang="scss" scoped>
-.actions {
-  width: 100%;
-}
-.buttons {
-  display: flex;
-  justify-content: flex-end;
-  width: 100%;
-}
-</style>

pkg/harvester/dialog/HarvesterCPUMemoryHotPlugDialog.vue

@@ -1,185 +0,0 @@
-<script>
-import { exceptionToErrorsArray } from '@shell/utils/error';
-import { mapGetters } from 'vuex';
-import { getVmCPUMemoryValues } from '../utils/cpuMemory';
-import UnitInput from '@shell/components/form/UnitInput';
-import { Card } from '@components/Card';
-import { Banner } from '@components/Banner';
-import AsyncButton from '@shell/components/AsyncButton';
-import { GIBIBYTE } from '../utils/unit';
-
-export default {
-  name: 'CPUMemoryHotplugModal',
-
-  emits: ['close'],
-
-  components: {
-    AsyncButton, Card, Banner, UnitInput
-  },
-
-  props: {
-    resources: {
-      type:     Array,
-      required: true
-    }
-  },
-
-  data() {
-    const { cpu, memory } = getVmCPUMemoryValues(this.resources[0] || {});
-
-    return {
-      cpu,
-      memory,
-      errors: [],
-      GIBIBYTE
-    };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    actionResource() {
-      return this.resources[0] || {};
-    },
-    maxResourcesMessage() {
-      const { maxCpu, maxMemory } = getVmCPUMemoryValues(this.actionResource);
-
-      if (maxCpu && maxMemory) {
-        return this.t('harvester.modal.cpuMemoryHotplug.maxResourcesMessage', { maxCpu, maxMemory });
-      }
-
-      return '';
-    }
-  },
-
-  methods: {
-    close() {
-      this.cpu = '';
-      this.memory = '';
-      this.$emit('close');
-    },
-
-    change() {
-      if (parseInt(this.memory, 10) < 1 ) {
-        this.memory = '1Gi';
-      }
-      if (this.cpu < 1) {
-        this.cpu = 1;
-      }
-    },
-
-    async save(buttonCb) {
-      if (this.actionResource) {
-        try {
-          const res = await this.actionResource.doAction('cpuAndMemoryHotplug', { sockets: this.cpu, memory: this.memory });
-
-          if (res._status === 200 || res._status === 204) {
-            this.$store.dispatch('growl/success', {
-              title:   this.t('generic.notification.title.succeed'),
-              message: this.t('harvester.modal.cpuMemoryHotplug.success', { vm: this.actionResource.nameDisplay })
-            }, { root: true });
-
-            this.close();
-            buttonCb(true);
-          } else {
-            const error = [res?.data] || exceptionToErrorsArray(res);
-
-            this['errors'] = error;
-            buttonCb(false);
-          }
-        } catch (err) {
-          const error = err?.data || err;
-          const message = exceptionToErrorsArray(error);
-
-          this['errors'] = message;
-          buttonCb(false);
-        }
-      }
-    },
-  }
-};
-</script>
-
-<template>
-  <Card
-    ref="modal"
-    name="modal"
-    :show-highlight-border="false"
-  >
-    <template #title>
-      <h4
-        v-clean-html="t('harvester.modal.cpuMemoryHotplug.title')"
-        class="text-default-text"
-      />
-    </template>
-
-    <template #body>
-      <Banner
-        v-if="maxResourcesMessage"
-        :label="maxResourcesMessage"
-        color="info"
-      />
-      <UnitInput
-        v-model:value="cpu"
-        :label="t('harvester.virtualMachine.input.cpu')"
-        :delay="0"
-        required
-        suffix="C"
-        class="mb-20"
-        :mode="mode"
-        :min="1"
-        @update:value="change"
-      />
-      <UnitInput
-        v-model:value="memory"
-        :label="t('harvester.virtualMachine.input.memory')"
-        :mode="mode"
-        :input-exponent="3"
-        :delay="0"
-        :min="1"
-        :increment="1024"
-        :output-modifier="true"
-        :disabled="disabled"
-        :suffix="GIBIBYTE"
-        class="mb-20"
-        @update:value="change"
-      />
-      <Banner
-        v-for="(err, i) in errors"
-        :key="i"
-        :label="err"
-        color="error"
-      />
-    </template>
-
-    <template #actions>
-      <div class="actions">
-        <div class="buttons">
-          <button
-            type="button"
-            class="btn role-secondary mr-10"
-            @click="close"
-          >
-            {{ t('generic.cancel') }}
-          </button>
-          <AsyncButton
-            mode="apply"
-            @click="save"
-          />
-        </div>
-      </div>
-    </template>
-  </Card>
-</template>
-
-<style lang="scss" scoped>
-.actions {
-  width: 100%;
-}
-
-.buttons {
-  display: flex;
-  justify-content: flex-end;
-  width: 100%;
-}
-</style>

pkg/harvester/dialog/HarvesterExportImageDialog.vue

@@ -10,7 +10,6 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { NAMESPACE, STORAGE_CLASS } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
-import { isInternalStorageClass } from '../utils/storage-class';
 
 export default {
   name: 'HarvesterExportImageDialog',
@@ -106,17 +105,11 @@ export default {
       }
 
       const options = storages.filter((s) => !s.parameters?.backingImage).map((s) => {
-        let label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
-        const isInternal = isInternalStorageClass(s.metadata?.name);
-
-        if (isInternal) {
-          label += ` (${ this.t('harvester.storage.internal.label') })`;
-        }
+        const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
         return {
           label,
-          value:    s.name,
-          disabled: isInternal,
+          value: s.name,
         };
       }) || [];
 

pkg/harvester/dialog/HarvesterUnplugVolume.vue

@@ -1,12 +1,13 @@
 <script>
 import { mapState, mapGetters } from 'vuex';
+
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import AsyncButton from '@shell/components/AsyncButton';
 
 export default {
-  name: 'HarvesterHotUnplug',
+  name: 'HarvesterHotUnplugModal',
 
   emits: ['close'],
 
@@ -34,25 +35,8 @@ export default {
     actionResource() {
       return this.resources[0];
     },
-
-    name() {
-      return this.modalData.name;
-    },
-
-    isVolume() {
-      return this.modalData.type === 'volume';
-    },
-
-    titleKey() {
-      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.title' : 'harvester.virtualMachine.hotUnplug.detachNIC.title';
-    },
-
-    actionLabelKey() {
-      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel' : 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabel';
-    },
-
-    successMessageKey() {
-      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.success' : 'harvester.virtualMachine.hotUnplug.detachNIC.success';
+    diskName() {
+      return this.modalData.diskName;
     }
   },
 
@@ -63,20 +47,14 @@ export default {
 
     async save(buttonCb) {
       try {
-        let res;
-
-        if (this.isVolume) {
-          res = await this.actionResource.doAction('removeVolume', { diskName: this.name });
-        } else {
-          res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
-        }
+        const res = await this.actionResource.doAction('removeVolume', { diskName: this.diskName });
 
         if (res._status === 200 || res._status === 204) {
           this.$store.dispatch(
             'growl/success',
             {
               title:   this.t('generic.notification.title.succeed'),
-              message: this.t(this.successMessageKey, { name: this.name })
+              message: this.t('harvester.modal.hotunplug.success', { name: this.diskName })
             },
             { root: true }
           );
@@ -86,14 +64,14 @@ export default {
         } else {
           const error = [res?.data] || exceptionToErrorsArray(res);
 
-          this.errors = error;
+          this['errors'] = error;
           buttonCb(false);
         }
       } catch (err) {
         const error = err?.data || err;
         const message = exceptionToErrorsArray(error);
 
-        this.errors = message;
+        this['errors'] = message;
         buttonCb(false);
       }
     }
@@ -109,7 +87,7 @@ export default {
   >
     <template #title>
       <h4
-        v-clean-html="t(titleKey, { name })"
+        v-clean-html="t('harvester.virtualMachine.unplug.title', { name: diskName })"
         class="text-default-text"
       />
       <Banner
@@ -133,9 +111,9 @@ export default {
 
           <AsyncButton
             mode="apply"
-            :action-label="t(actionLabelKey)"
-            :waiting-label="t(actionLabelKey)"
-            :success-label="t(actionLabelKey)"
+            :action-label="t('harvester.virtualMachine.unplug.actionLabel')"
+            :waiting-label="t('harvester.virtualMachine.unplug.actionLabel')"
+            :success-label="t('harvester.virtualMachine.unplug.actionLabel')"
             @click="save"
           />
         </div>
@@ -154,8 +132,4 @@ export default {
   justify-content: flex-end;
   width: 100%;
 }
-
-::v-deep(.card-title) {
-  display: block;
-}
 </style>

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

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

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

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

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

@@ -1,157 +0,0 @@
-<script>
-import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
-import { HCI } from '../../types';
-import { DOC } from '../../config/doc-links';
-
-export const hugepagesTHPEnabledMode = [{
-  label: 'Always',
-  value: 'always',
-}, {
-  label: 'Madvise',
-  value: 'madvise',
-}, {
-  label: 'Never',
-  value: 'never',
-}];
-
-export const hugepagesTHPShmemEnabledMode = [{
-  label: 'Always',
-  value: 'always',
-}, {
-  label: 'Within Size',
-  value: 'within_size',
-}, {
-  label: 'Advise',
-  value: 'advise',
-}, {
-  label: 'Never',
-  value: 'never',
-}, {
-  label: 'Deny',
-  value: 'deny',
-}, {
-  label: 'Force',
-  value: 'force',
-}];
-
-export const hugepagesTHPDefragMode = [{
-  label: 'Always',
-  value: 'always',
-}, {
-  label: 'Defer',
-  value: 'defer',
-}, {
-  label: 'Defer+Madvise',
-  value: 'defer+madvise',
-}, {
-  label: 'Madvise',
-  value: 'madvise',
-}, {
-  label: 'Never',
-  value: 'never'
-}];
-
-export default {
-  name:       'HarvesterHugepages',
-  components: { LabeledSelect },
-
-  props: {
-    node: {
-      type:     Object,
-      required: true,
-    },
-
-    registerBeforeHook: {
-      type:     Function,
-      required: true,
-    },
-  },
-
-  computed: {
-    docsTransparentHugepagesLink() {
-      return DOC.TRANSPARENT_HUGEPAGES;
-    },
-  },
-
-  methods: {
-    async saveHugepages() {
-      this.hugepages['spec'] = this.spec;
-
-      await this.hugepages.save().catch((reason) => {
-        if (reason?.type === 'error') {
-          this.$store.dispatch('growl/error', {
-            title:   this.t('harvester.notification.title.error'),
-            message: reason?.message,
-          }, { root: true });
-
-          return Promise.reject(new Error('saveHugepages error'));
-        }
-      });
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    const hash = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.HUGEPAGES });
-
-    this.hugepages = hash.find((node) => {
-      return node.id === this.node.id;
-    });
-    this.spec = this.hugepages.spec;
-  },
-
-  data() {
-    return {
-      hugepages: {},
-      spec:      { transparent: {} },
-      hugepagesTHPEnabledMode,
-      hugepagesTHPShmemEnabledMode,
-      hugepagesTHPDefragMode,
-    };
-  },
-
-  created() {
-    this.registerBeforeHook(this.saveHugepages, 'saveHugepages');
-  },
-};
-</script>
-
-<template>
-  <div>
-    <div>
-      <hr class="divider" />
-      <h3>
-        <t
-          k="harvester.host.hugepages.transparent.title"
-          :raw="true"
-          :url="docsTransparentHugepagesLink"
-        />
-      </h3>
-
-      <div class="row mb-20">
-        <div class="col span-4">
-          <LabeledSelect
-            v-model:value="spec.transparent.enabled"
-            :label="t('harvester.host.hugepages.transparent.enabled')"
-            :options="hugepagesTHPEnabledMode"
-          />
-        </div>
-        <div class="col span-4">
-          <LabeledSelect
-            v-model:value="spec.transparent.shmemEnabled"
-            :label="t('harvester.host.hugepages.transparent.shmemEnabled')"
-            :options="hugepagesTHPShmemEnabledMode"
-          />
-        </div>
-        <div class="col span-4">
-          <LabeledSelect
-            v-model:value="spec.transparent.defrag"
-            :label="t('harvester.host.hugepages.transparent.defrag')"
-            :options="hugepagesTHPDefragMode"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>

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

@@ -7,8 +7,6 @@ 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',
@@ -66,13 +64,11 @@ 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,
@@ -103,11 +99,6 @@ 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

@@ -28,7 +28,6 @@ import { HCI } from '../../types';
 import HarvesterDisk from './HarvesterDisk';
 import HarvesterSeeder from './HarvesterSeeder';
 import HarvesterKsmtuned from './HarvesterKsmtuned';
-import HarvesterHugepages from './HarvesterHugepages';
 import Tags from '../../components/DiskTags';
 import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
 import isEqual from 'lodash/isEqual';
@@ -51,7 +50,6 @@ export default {
     ArrayListGrouped,
     HarvesterDisk,
     HarvesterKsmtuned,
-    HarvesterHugepages,
     ButtonDropdown,
     KeyValue,
     Banner,
@@ -227,12 +225,6 @@ export default {
       return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.KSTUNED);
     },
 
-    hasHugepagesSchema() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.HUGEPAGES);
-    },
-
     hasBlockDevicesSchema() {
       const inStore = this.$store.getters['currentProduct'].inStore;
 
@@ -535,6 +527,7 @@ export default {
               id:   this.longhornNode.id,
               opt:  { force: true },
             });
+
             await new Promise((resolve) => setTimeout(resolve, '5000'));
             await retrySave();
           } else {
@@ -655,17 +648,6 @@ export default {
             </template>
           </ArrayListGrouped>
         </Tab>
-        <Tab
-          v-if="hasHugepagesSchema"
-          name="Hugepages"
-          :weight="70"
-          :label="t('harvester.host.tabs.hugepages')"
-        >
-          <HarvesterHugepages
-            :node="value"
-            :register-before-hook="registerBeforeHook"
-          />
-        </Tab>
         <Tab
           v-if="hasKsmtunedSchema"
           name="Ksmtuned"

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

@@ -6,17 +6,14 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+
 import { HCI as HCI_LABELS_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { allHash } from '@shell/utils/promise';
 import { HCI } from '../types';
-import { NETWORK_TYPE, L2VLAN_MODE } from '../config/types';
-import { removeObject } from '@shell/utils/array';
+import { NETWORK_TYPE } from '../config/types';
 
-const {
-  L2VLAN, UNTAGGED, OVERLAY, L2TRUNK_VLAN
-} = NETWORK_TYPE;
-const { ACCESS, TRUNK } = L2VLAN_MODE;
+const { L2VLAN, UNTAGGED } = NETWORK_TYPE;
 
 const AUTO = 'auto';
 const MANUAL = 'manual';
@@ -47,17 +44,18 @@ export default {
 
   data() {
     const config = JSON.parse(this.value.spec.config);
-
     const annotations = this.value?.metadata?.annotations || {};
     const layer3Network = JSON.parse(annotations[HCI_LABELS_ANNOTATIONS.NETWORK_ROUTE] || '{}');
 
+    if ((config.bridge || '').endsWith('-br')) {
+      config.bridge = config.bridge.slice(0, -3);
+    }
+
     const type = this.value.vlanType || L2VLAN ;
 
     return {
       config,
       type,
-      l2VlanMode:    this.value.vlanType === L2TRUNK_VLAN ? TRUNK : ACCESS,
-      vlanTrunk:     this.parseVlanTrunk(config),
       layer3Network: {
         mode:         layer3Network.mode || AUTO,
         serverIPAddr: layer3Network.serverIPAddr || '',
@@ -80,30 +78,6 @@ export default {
   },
 
   computed: {
-    clusterBridge: {
-      get() {
-        if (!this.config.bridge) {
-          return '';
-        }
-
-        // remove -br suffix if exists
-        return this.config?.bridge?.endsWith('-br') ? this.config.bridge.slice(0, -3) : '';
-      },
-
-      set(neu) {
-        if (neu === '') {
-          this.config.bridge = '';
-
-          return;
-        }
-
-        if (!neu.endsWith('-br')) {
-          this.config.bridge = `${ neu }-br`;
-        } else {
-          this.config.bridge = neu;
-        }
-      }
-    },
     modeOptions() {
       return [{
         label: this.t('harvester.network.layer3Network.mode.auto'),
@@ -114,18 +88,6 @@ export default {
       }];
     },
 
-    l2VlanTrunkModeFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('l2VlanTrunkMode');
-    },
-
-    kubeovnVpcSubnetSupport() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('kubeovnVpcSubnet');
-    },
-
-    longhornV2LVMSupport() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('longhornV2LVMSupport');
-    },
-
     clusterNetworkOptions() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
@@ -141,56 +103,8 @@ export default {
       });
     },
 
-    l2VlanModeOptions() {
-      return [{
-        label: this.t('harvester.vlanStatus.vlanConfig.l2VlanMode.access'),
-        value: ACCESS,
-      }, {
-        label: this.t('harvester.vlanStatus.vlanConfig.l2VlanMode.trunk'),
-        value: TRUNK,
-      }];
-    },
-
-    networkTypes() {
-      const types = [L2VLAN, UNTAGGED];
-
-      if (this.kubeovnVpcSubnetSupport) {
-        types.push(OVERLAY);
-      }
-
-      return types;
-    },
-
-    isL2VlanNetwork() {
-      if (this.isView) {
-        return this.value.vlanType === L2VLAN;
-      }
-
-      return this.type === L2VLAN;
-    },
-
-    isL2VlanTrunkMode() {
-      if (this.isView) {
-        return this.value.vlanType === L2TRUNK_VLAN && this.l2VlanMode === TRUNK;
-      }
-
-      return this.type === L2TRUNK_VLAN || (this.l2VlanMode === TRUNK && this.type === L2VLAN);
-    },
-
-    isL2VlanAccessMode() {
-      if (this.isView) {
-        return this.value.vlanType === L2VLAN && this.l2VlanMode === ACCESS;
-      }
-
-      return this.type === L2VLAN && this.l2VlanMode === ACCESS;
-    },
-
-    isOverlayNetwork() {
-      if (this.isView) {
-        return this.value.vlanType === OVERLAY;
-      }
-
-      return this.type === OVERLAY;
+    networkType() {
+      return [L2VLAN, UNTAGGED];
     },
 
     isUntaggedNetwork() {
@@ -202,102 +116,39 @@ export default {
     }
   },
 
-  watch: {
-    type(newType) {
-      if (newType === OVERLAY) { // overlay network configuration
-        this.config.type = 'kube-ovn';
-        this.config.provider = `${ this.value.metadata.name }.${ this.value.metadata.namespace }.ovn`;
-        this.config.server_socket = '/run/openvswitch/kube-ovn-daemon.sock';
-      } else { // l2vlan or untagged network configuration
-        this.config.type = 'bridge';
-        this.config.promiscMode = true;
-        this.config.ipam = {};
-        this.config.bridge = '';
-        delete this.config.provider;
-        delete this.config.server_socket;
-      }
-    },
-    l2VlanMode(newAccessMode) {
-      if (this.type !== L2VLAN) {
-        return;
-      }
-
-      if (newAccessMode === TRUNK) { // trunk mode
-        this.config.vlan = 0;
-        this.config.vlanTrunk = this.vlanTrunk;
-      } else { // access mode
-        delete this.config.vlanTrunk;
-        this.config.vlan = '';
-      }
-    },
-  },
-
   methods: {
     async saveNetwork(buttonCb) {
       const errors = [];
 
-      if (this.isL2VlanNetwork || this.isUntaggedNetwork) {
-        if (this.isL2VlanTrunkMode && this.vlanTrunk.some((trunk) => trunk.minID === '')) {
-          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.vlanStatus.vlanConfig.vlanTrunk.minId') }));
-        }
-
-        if (this.isL2VlanTrunkMode && this.vlanTrunk.some((trunk) => trunk.maxID === '')) {
-          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.vlanStatus.vlanConfig.vlanTrunk.maxId') }));
-        }
-
-        if (this.isL2VlanAccessMode && !this.config.vlan && !this.isUntaggedNetwork) {
-          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('tableHeaders.networkVlan') }));
-        }
-
-        if (!this.config.bridge) {
-          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.clusterNetwork.label') }));
-        }
-
-        if (this.layer3Network.mode === MANUAL) {
-          if (!this.layer3Network.gateway) {
-            errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.layer3Network.gateway.label') }));
-          }
-          if (!this.layer3Network.cidr) {
-            errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.layer3Network.cidr.label') }));
-          }
-        }
-
-        if (errors.length > 0) {
-          buttonCb(false);
-          this.errors = errors;
-
-          return false;
-        }
-        this.value.setAnnotation(HCI_LABELS_ANNOTATIONS.NETWORK_ROUTE, JSON.stringify(this.layer3Network));
+      if (!this.config.vlan && !this.isUntaggedNetwork) {
+        errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('tableHeaders.networkVlan') }));
       }
 
+      if (!this.config.bridge) {
+        errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.clusterNetwork.label') }));
+      }
+
+      if (this.layer3Network.mode === MANUAL) {
+        if (!this.layer3Network.gateway) {
+          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.layer3Network.gateway.label') }));
+        }
+        if (!this.layer3Network.cidr) {
+          errors.push(this.$store.getters['i18n/t']('validation.required', { key: this.t('harvester.network.layer3Network.cidr.label') }));
+        }
+      }
+
+      if (errors.length > 0) {
+        buttonCb(false);
+        this.errors = errors;
+
+        return false;
+      }
+
+      this.value.setAnnotation(HCI_LABELS_ANNOTATIONS.NETWORK_ROUTE, JSON.stringify(this.layer3Network));
+
       await this.save(buttonCb);
     },
 
-    parseVlanTrunk(config) {
-      if (config?.vlanTrunk && config?.vlanTrunk?.length > 0) {
-        return config.vlanTrunk;
-      }
-
-      return [{ minID: '', maxID: '' }];
-    },
-
-    removeVlanTrunk(trunk) {
-      removeObject(this.vlanTrunk, trunk);
-    },
-
-    addVlanTrunk() {
-      if (!this.config.vlanTrunk) {
-        this.config.vlanTrunk = [];
-      }
-      this.vlanTrunk.push({ minID: this.minId, maxID: this.maxId });
-      this.config.vlanTrunk = this.vlanTrunk;
-    },
-
-    vlanTrunkChange() {
-      this.config.vlanTrunk = this.vlanTrunk;
-    },
-
     input(neu) {
       if (neu === '') {
         this.config.vlan = '';
@@ -318,19 +169,14 @@ export default {
     updateBeforeSave() {
       this.config.name = this.value.metadata.name;
 
-      if (this.isOverlayNetwork) {
-        this.config.provider = `${ this.value.metadata.name }.${ this.value.metadata.namespace }.ovn`;
-        delete this.config.bridge;
-        delete this.config.promiscMode;
-        delete this.config.vlan;
-        delete this.config.ipam;
-      }
-
       if (this.isUntaggedNetwork) {
         delete this.config.vlan;
       }
 
-      this.value.spec.config = JSON.stringify({ ...this.config });
+      this.value.spec.config = JSON.stringify({
+        ...this.config,
+        bridge: `${ this.config.bridge }-br`,
+      });
     },
   }
 };
@@ -366,83 +212,14 @@ export default {
         <LabeledSelect
           v-model:value="type"
           class="mb-20"
-          :options="networkTypes"
+          :options="networkType"
           :mode="mode"
-          :disabled="isEdit"
           :label="t('harvester.fields.type')"
           required
         />
 
-        <LabeledSelect
-          v-if="isL2VlanNetwork && l2VlanTrunkModeFeatureEnabled"
-          v-model:value="l2VlanMode"
-          class="mb-20"
-          :options="l2VlanModeOptions"
-          :mode="mode"
-          :disabled="isEdit"
-          :label="t('harvester.vlanStatus.vlanConfig.l2VlanMode.label')"
-          required
-        />
-        <div v-if="isL2VlanTrunkMode && l2VlanTrunkModeFeatureEnabled">
-          <div
-            v-for="(trunk, i) in vlanTrunk"
-            :key="i"
-          >
-            <div class="row mt-10">
-              <div class="col trunk-span">
-                <LabeledInput
-                  v-model:value.number="trunk.minID"
-                  class="mb-20"
-                  required
-                  placeholder="e.g. 1-4094"
-                  :min="1"
-                  :max="4094"
-                  type="number"
-                  :label="t('harvester.vlanStatus.vlanConfig.vlanTrunk.minId')"
-                  :mode="mode"
-                  @update:value="vlanTrunkChange"
-                />
-              </div>
-              <div class="col trunk-span">
-                <LabeledInput
-                  v-model:value.number="trunk.maxID"
-                  class="mb-20"
-                  :max="4094"
-                  :min="1"
-                  placeholder="e.g. 1-4094"
-                  required
-                  type="number"
-                  :label="t('harvester.vlanStatus.vlanConfig.vlanTrunk.maxId')"
-                  :mode="mode"
-                  @update:value="vlanTrunkChange"
-                />
-              </div>
-              <div class="col remove-btn mb-20">
-                <button
-                  type="button"
-                  :disabled="isView || vlanTrunk.length <= 1"
-                  :aria-label="t('generic.ariaLabel.remove', {index: i+1})"
-                  role="button"
-                  class="btn role-link"
-                  @click="removeVlanTrunk(trunk)"
-                >
-                  {{ t('harvester.fields.remove') }}
-                </button>
-              </div>
-            </div>
-          </div>
-          <button
-            v-if="isL2VlanTrunkMode"
-            type="button"
-            class="btn btn-sm bg-primary mb-20"
-            :disabled="isView"
-            @click="addVlanTrunk"
-          >
-            {{ t('harvester.vlanStatus.vlanConfig.vlanTrunk.add') }}
-          </button>
-        </div>
         <LabeledInput
-          v-if="isL2VlanAccessMode"
+          v-if="!isUntaggedNetwork"
           v-model:value.number="config.vlan"
           class="mb-20"
           required
@@ -452,20 +229,25 @@ export default {
           :mode="mode"
           @update:value="input"
         />
-        <LabeledSelect
-          v-if="!isOverlayNetwork"
-          v-model:value="clusterBridge"
-          class="mb-20"
-          :label="t('harvester.network.clusterNetwork.label')"
-          required
-          :disabled="isEdit"
-          :options="clusterNetworkOptions"
-          :mode="mode"
-          :placeholder="t('harvester.network.clusterNetwork.selectPlaceholder')"
-        />
+
+        <div class="row">
+          <div
+            class="col span-12"
+          >
+            <LabeledSelect
+              v-model:value="config.bridge"
+              class="mb-20"
+              :label="t('harvester.network.clusterNetwork.label')"
+              required
+              :options="clusterNetworkOptions"
+              :mode="mode"
+              :placeholder="t('harvester.network.clusterNetwork.selectPlaceholder')"
+            />
+          </div>
+        </div>
       </Tab>
       <Tab
-        v-if="isL2VlanAccessMode"
+        v-if="!isUntaggedNetwork"
         name="layer3Network"
         :label="t('harvester.network.tabs.layer3Network')"
         :weight="98"
@@ -524,12 +306,3 @@ export default {
     </Tabbed>
   </CruResource>
 </template>
-
-<style lang="scss" scoped>
- .remove-btn {
-  align-self: center;
-}
-.trunk-span{
-  flex: 5;
-}
-</style>

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

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

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

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

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

@@ -1,319 +0,0 @@
-<script>
-import { VOLUME_MODE } from '@pkg/harvester/config/types';
-import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
-import ArrayList from '@shell/components/form/ArrayList';
-import { Checkbox } from '@components/Form/Checkbox';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { VOLUME_SNAPSHOT_CLASS, HCI } from '../../types';
-import { HCI_SETTING } from '../../config/settings';
-import { allHash } from '@shell/utils/promise';
-import { _EDIT, _CREATE } from '@shell/config/query-params';
-
-export default {
-  name: 'CDISettings',
-
-  props: {
-    value:    {
-      type:     Object,
-      required: true
-    },
-    mode:        {
-      type:     String,
-      required: true
-    },
-    provisioner: {
-      type:     String,
-      required: true
-    },
-  },
-
-  components: {
-    ArrayList,
-    Checkbox,
-    LabeledInput,
-    LabeledSelect,
-  },
-
-  emits: ['update:cdiSettings'],
-
-  async fetch() {
-    const hash = {
-      volumeSnapshotClasses:  this.$store.dispatch(`${ this.inStore }/findAll`, { type: VOLUME_SNAPSHOT_CLASS }),
-      csiDriverConfigSetting: this.$store.dispatch(`${ this.inStore }/find`, { type: HCI.SETTING, id: HCI_SETTING.CSI_DRIVER_CONFIG }),
-    };
-
-    await allHash(hash);
-
-    if (this.mode === _CREATE ) {
-      this.setDefaultVolumeSnapshotClass();
-    } else {
-      this.initCDISettingsFromAnnotations();
-    }
-  },
-
-  data() {
-    return {
-      cdiSettings: {
-        volumeModeAccessModes: [],
-        volumeSnapshotClass:   null,
-        cloneStrategy:         null,
-        filesystemOverhead:    null,
-      },
-      defaultAddValue: { volumeMode: null, accessModes: [] },
-      noneOption:      { label: 'None', value: '' },
-    };
-  },
-
-  computed: {
-    inStore() {
-      return this.$store.getters['currentProduct'].inStore;
-    },
-
-    allVolumeModeOptions() {
-      return Object.values(VOLUME_MODE).map((mode) => ({ label: mode, value: mode }));
-    },
-
-    selectedVolumeModes() {
-      return this.cdiSettings.volumeModeAccessModes
-        .map((item) => item.volumeMode)
-        .filter(Boolean);
-    },
-
-    volumeModeOptions() {
-      return [this.noneOption, ...this.allVolumeModeOptions].filter( (option) => !this.selectedVolumeModes.includes(option.value) );
-    },
-
-    allVolumeModesSelected() {
-      return this.selectedVolumeModes.length === this.allVolumeModeOptions.length;
-    },
-
-    accessModeOptions() {
-      return [
-        { label: 'ReadWriteOnce', value: 'ReadWriteOnce' },
-        { label: 'ReadOnlyMany', value: 'ReadOnlyMany' },
-        { label: 'ReadWriteMany', value: 'ReadWriteMany' },
-        { label: 'ReadWriteOncePod', value: 'ReadWriteOncePod' },
-      ];
-    },
-
-    cloneStrategyOptions() {
-      return [
-        this.noneOption,
-        { label: this.t('harvester.storage.cdiSettings.cloneStrategy.copy'), value: 'copy' },
-        { label: this.t('harvester.storage.cdiSettings.cloneStrategy.snapshot'), value: 'snapshot' },
-        { label: this.t('harvester.storage.cdiSettings.cloneStrategy.csiClone'), value: 'csi-clone' },
-      ];
-    },
-
-    volumeSnapshotClassOptions() {
-      const allClasses = this.$store.getters[`${ this.inStore }/all`](VOLUME_SNAPSHOT_CLASS) || [];
-      const filtered = allClasses.filter((c) => c.driver === this.provisioner);
-
-      return [this.noneOption, ...filtered.map((c) => ({ label: c.name, value: c.name }))];
-    },
-
-    isFilesystemOverheadValid() {
-      const val = this.cdiSettings.filesystemOverhead;
-
-      if (val === null || val === '') return true;
-      const regex = /^(0(\.\d{1,3})?|1(\.0{1,3})?)$/;
-
-      return regex.test(val);
-    },
-
-    isCustomClass() {
-      return this.mode === _CREATE || this.mode === _EDIT;
-    }
-  },
-
-  watch: {
-    provisioner() {
-      this.resetCdiSettings();
-      this.$nextTick(this.setDefaultVolumeSnapshotClass);
-    },
-
-    cdiSettings: {
-      handler(val) {
-        this.$emit('update:cdiSettings', val);
-      },
-      deep:      true,
-      immediate: true,
-    }
-  },
-
-  methods: {
-    setDefaultVolumeSnapshotClass() {
-      try {
-        const setting = this.$store.getters[`${ this.inStore }/byId`](HCI.SETTING, HCI_SETTING.CSI_DRIVER_CONFIG);
-        const config = JSON.parse(setting?.value || setting?.default || '{}');
-        const defaultClass = config?.[this.provisioner]?.volumeSnapshotClassName || null;
-
-        const allClasses = this.$store.getters[`${ this.inStore }/all`](VOLUME_SNAPSHOT_CLASS) || [];
-        const matched = allClasses.find((cls) => cls.name === defaultClass && cls.driver === this.provisioner);
-
-        this.cdiSettings.volumeSnapshotClass = matched?.name || null;
-      } catch (e) {
-        console.error('Failed to parse CSI config:', e); // eslint-disable-line no-console
-        this.cdiSettings.volumeSnapshotClass = null;
-      }
-    },
-
-    initCDISettingsFromAnnotations() {
-      const annotations = this.value?.metadata?.annotations || {};
-
-      let volumeModeAccessModes = [];
-      const rawVolumeMode = annotations[HCI_ANNOTATIONS.VOLUME_MODE_ACCESS_MODES];
-
-      if (rawVolumeMode) {
-        try {
-          const parsed = JSON.parse(rawVolumeMode);
-
-          volumeModeAccessModes = Object.entries(parsed).map(([volumeMode, accessModes]) => ({
-            volumeMode,
-            accessModes: Array.isArray(accessModes) ? accessModes : [],
-          }));
-        } catch (e) {
-          console.error('Failed to parse annotation:', e); // eslint-disable-line no-console
-        }
-      }
-
-      if (volumeModeAccessModes.length) {
-        this.cdiSettings.volumeModeAccessModes = volumeModeAccessModes;
-      }
-      if (annotations[HCI_ANNOTATIONS.VOLUME_SNAPSHOT_CLASS]) {
-        this.cdiSettings.volumeSnapshotClass = annotations[HCI_ANNOTATIONS.VOLUME_SNAPSHOT_CLASS];
-      }
-      if (annotations[HCI_ANNOTATIONS.CLONE_STRATEGY]) {
-        this.cdiSettings.cloneStrategy = annotations[HCI_ANNOTATIONS.CLONE_STRATEGY];
-      }
-      if (annotations[HCI_ANNOTATIONS.FILESYSTEM_OVERHEAD]) {
-        this.cdiSettings.filesystemOverhead = annotations[HCI_ANNOTATIONS.FILESYSTEM_OVERHEAD];
-      }
-    },
-
-    resetCdiSettings() {
-      this.cdiSettings.volumeModeAccessModes = [this.defaultAddValue];
-      this.cdiSettings.volumeSnapshotClass = null;
-      this.cdiSettings.cloneStrategy = null;
-      this.cdiSettings.filesystemOverhead = null;
-    },
-
-    validateFilesystemOverhead(e) {
-      const val = e.target.value;
-
-      this.cdiSettings.filesystemOverhead = val;
-    }
-  }
-};
-</script>
-
-<template>
-  <ArrayList
-    v-model:value="cdiSettings.volumeModeAccessModes"
-    :initial-empty-row="true"
-    :show-header="true"
-    :mode="mode"
-    :title="t('harvester.storage.cdiSettings.volumeModeAccessModes.label')"
-    :add-label="t('harvester.storage.cdiSettings.volumeModeAccessModes.add')"
-    :default-add-value="defaultAddValue"
-    :protip="t('harvester.storage.cdiSettings.volumeModeAccessModes.tooltip')"
-    :add-disabled="allVolumeModesSelected"
-  >
-    <template #column-headers>
-      <div class="column-headers">
-        <div
-          class="row"
-          :class="{ custom: isCustomClass }"
-        >
-          <label
-            class="col span-3 value text-label mb-10"
-            for="volumeMode"
-          >
-            {{ t('harvester.storage.cdiSettings.volumeModeAccessModes.volumeMode') }}
-          </label>
-          <label
-            class="col span-9 value text-label mb-10"
-            for="accessModes"
-          >
-            {{ t('harvester.storage.cdiSettings.volumeModeAccessModes.accessModes.label') }}
-          </label>
-        </div>
-      </div>
-    </template>
-
-    <template #columns="{ row }">
-      <div class="row">
-        <div class="col span-3">
-          <LabeledSelect
-            id="volumeMode"
-            v-model:value="row.value.volumeMode"
-            :mode="mode"
-            :options="volumeModeOptions"
-          />
-        </div>
-        <div
-          id="accessModes"
-          class="col span-9"
-        >
-          <Checkbox
-            v-for="opt in accessModeOptions"
-            :key="opt.value"
-            v-model:value="row.value.accessModes"
-            :value-when-true="opt.value"
-            :label="opt.label"
-            type="checkbox"
-            :mode="mode"
-          />
-        </div>
-      </div>
-    </template>
-  </ArrayList>
-
-  <LabeledSelect
-    v-model:value="cdiSettings.volumeSnapshotClass"
-    class="select mt-20 mb-20"
-    :label="t('harvester.storage.cdiSettings.volumeSnapshotClass.label')"
-    :tooltip="t('harvester.storage.cdiSettings.volumeSnapshotClass.tooltip')"
-    :mode="mode"
-    :options="volumeSnapshotClassOptions"
-  />
-
-  <LabeledSelect
-    v-model:value="cdiSettings.cloneStrategy"
-    class="select mb-20"
-    :label="t('harvester.storage.cdiSettings.cloneStrategy.label')"
-    :tooltip="t('harvester.storage.cdiSettings.cloneStrategy.tooltip')"
-    :mode="mode"
-    :options="cloneStrategyOptions"
-  />
-
-  <LabeledInput
-    v-model:value="cdiSettings.filesystemOverhead"
-    class="select mb-20"
-    :label="t('harvester.storage.cdiSettings.fileSystemOverhead.label')"
-    :tooltip="t('harvester.storage.cdiSettings.fileSystemOverhead.tooltip')"
-    :mode="mode"
-    type="number"
-    :min="0"
-    :max="1"
-    :step="0.001"
-    :placeholder="t('harvester.storage.cdiSettings.fileSystemOverhead.placeholder')"
-    :status="isFilesystemOverheadValid ? null : 'error'"
-    @input="validateFilesystemOverhead"
-  />
-</template>
-
-<style scoped lang="scss">
-  .column-headers .row.custom {
-    max-width: calc(100% - 75px);
-  }
-
-  .row {
-    align-items: center;
-  }
-
-  .select {
-    max-width: 480px;
-  }
-</style>

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

@@ -1,5 +1,4 @@
 <script>
-import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
@@ -7,9 +6,11 @@ import ArrayList from '@shell/components/form/ArrayList';
 import Tab from '@shell/components/Tabbed/Tab';
 import Tabbed from '@shell/components/Tabbed';
 import { RadioGroup } from '@components/Form/Radio';
-import { LabeledInput } from '@components/Form/LabeledInput';
+
+import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import Loading from '@shell/components/Loading';
+
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { mapFeature, UNSUPPORTED_STORAGE_DRIVERS } from '@shell/store/features';
 import {
@@ -21,7 +22,6 @@ import { CSI_DRIVER } from '../../types';
 import Tags from '../../components/DiskTags';
 import { DATA_ENGINE_V1, DATA_ENGINE_V2 } from '../../models/harvester/persistentvolumeclaim';
 import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
-import CDISettings from './CDISettings';
 
 export const LVM_TOPOLOGY_LABEL = 'topology.lvm.csi/node';
 
@@ -45,7 +45,6 @@ export default {
     Tabbed,
     Loading,
     Tags,
-    CDISettings,
   },
 
   mixins: [CreateEditView],
@@ -118,7 +117,6 @@ export default {
         key:    '',
         values: [],
       },
-      cdiSettings: {},
     };
   },
 
@@ -126,10 +124,10 @@ export default {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
     const hash = {
-      namespaces:    this.$store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE }),
-      storages:      this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
-      longhornNodes: this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
-      csiDrivers:    this.$store.dispatch(`${ inStore }/findAll`, { type: CSI_DRIVER }),
+      namespaces:           this.$store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE }),
+      storages:             this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
+      longhornNodes:        this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
+      csiDrivers:           this.$store.dispatch(`${ inStore }/findAll`, { type: CSI_DRIVER })
     };
 
     if (this.value.longhornV2LVMSupport) {
@@ -199,14 +197,6 @@ export default {
 
       return v2DataEngine.value === 'true' ? DATA_ENGINE_V2 : DATA_ENGINE_V1;
     },
-
-    isCDISettingsFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('cdiSettings');
-    },
-
-    shouldShowCDISettingsTab() {
-      return this.isCDISettingsFeatureEnabled && this.provisioner !== `${ LONGHORN_DRIVER }_${ DATA_ENGINE_V1 }`;
-    },
   },
 
   watch: {
@@ -259,10 +249,6 @@ export default {
       });
 
       this.formatAllowedTopoloties();
-
-      if (this.shouldShowCDISettingsTab) {
-        this.formatCDISettings();
-      }
     },
 
     formatAllowedTopoloties() {
@@ -284,42 +270,6 @@ export default {
       if (matchLabelExpressions.length > 0) {
         this.value.allowedTopologies = [{ matchLabelExpressions: [...matchLabelExpressions, ...lvmMatchExpression] }];
       }
-    },
-    formatCDISettings() {
-      const annotations = this.value.metadata.annotations || {};
-      const volumeModeAccessModes = {};
-
-      this.cdiSettings.volumeModeAccessModes.forEach((setting) => {
-        if (setting.volumeMode && Array.isArray(setting.accessModes) && setting.accessModes.length > 0) {
-          volumeModeAccessModes[setting.volumeMode] = setting.accessModes;
-        }
-      });
-
-      if (Object.keys(volumeModeAccessModes).length > 0) {
-        annotations[HCI_ANNOTATIONS.VOLUME_MODE_ACCESS_MODES] = JSON.stringify(volumeModeAccessModes);
-      } else {
-        delete annotations[HCI_ANNOTATIONS.VOLUME_MODE_ACCESS_MODES];
-      }
-
-      if (this.cdiSettings.volumeSnapshotClass) {
-        annotations[HCI_ANNOTATIONS.VOLUME_SNAPSHOT_CLASS] = this.cdiSettings.volumeSnapshotClass;
-      } else {
-        delete annotations[HCI_ANNOTATIONS.VOLUME_SNAPSHOT_CLASS];
-      }
-
-      if (this.cdiSettings.cloneStrategy) {
-        annotations[HCI_ANNOTATIONS.CLONE_STRATEGY] = this.cdiSettings.cloneStrategy;
-      } else {
-        delete annotations[HCI_ANNOTATIONS.CLONE_STRATEGY];
-      }
-
-      if (this.cdiSettings.filesystemOverhead) {
-        annotations[HCI_ANNOTATIONS.FILESYSTEM_OVERHEAD] = this.cdiSettings.filesystemOverhead;
-      } else {
-        delete annotations[HCI_ANNOTATIONS.FILESYSTEM_OVERHEAD];
-      }
-
-      this.value.metadata.annotations = annotations;
     }
   }
 };
@@ -454,19 +404,6 @@ export default {
           </template>
         </ArrayList>
       </Tab>
-      <Tab
-        v-if="shouldShowCDISettingsTab"
-        name="cdiSettings"
-        :label="t('harvester.storage.cdiSettings.label')"
-        :weight="-2"
-      >
-        <CDISettings
-          v-model:cdi-settings="cdiSettings"
-          :value="value"
-          :mode="mode"
-          :provisioner="value.provisioner"
-        />
-      </Tab>
     </Tabbed>
   </CruResource>
 </template>

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

@@ -17,7 +17,6 @@ import { VM_IMAGE_FILE_FORMAT } from '../validators/vm-image';
 import { OS } from '../mixins/harvester-vm';
 import { HCI } from '../types';
 import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
-import { isInternalStorageClass } from '../utils/storage-class';
 
 const ENCRYPT = 'encrypt';
 const DECRYPT = 'decrypt';
@@ -169,18 +168,11 @@ export default {
 
       return filteredStorages
         .map((s) => {
-          let label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
-          let disabled = false;
-
-          if (isInternalStorageClass(s.name)) {
-            label += ` (${ this.t('harvester.storage.internal.label') })`;
-            disabled = true;
-          }
+          const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
           return {
             label,
             value: s.name,
-            disabled
           };
         }) || [];
     },

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

@@ -257,12 +257,8 @@ export default {
         :label="t('harvester.vmTemplate.tabs.basics')"
       >
         <CpuMemory
-          class="mb-20"
           :cpu="cpu"
           :memory="memory"
-          :max-cpu="maxCpu"
-          :max-memory="maxMemory"
-          :enable-hot-plug="cpuMemoryHotplugEnabled"
           :disabled="isConfig"
           @updateCpuMemory="updateCpuMemory"
         />

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

@@ -7,7 +7,6 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
-import Conditions from '@shell/components/form/Conditions';
 import { Banner } from '@components/Banner';
 import { allHash } from '@shell/utils/promise';
 import { get } from '@shell/utils/object';
@@ -24,7 +23,6 @@ import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
 import { DATA_ENGINE_V2 } from '../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../utils/unit';
 import { VOLUME_MODE } from '@pkg/harvester/config/types';
-import { isInternalStorageClass } from '../utils/storage-class';
 
 export default {
   name: 'HarvesterVolume',
@@ -41,7 +39,6 @@ export default {
     LabeledSelect,
     LabeledInput,
     NameNsDescription,
-    Conditions
   },
 
   mixins: [CreateEditView],
@@ -209,18 +206,11 @@ export default {
 
     storageClassOptions() {
       return this.storageClasses.filter((s) => !s.parameters?.backingImage).map((s) => {
-        let label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
-        let disabled = false;
-
-        if (isInternalStorageClass(s.name)) {
-          label += ` (${ this.t('harvester.storage.internal.label') })`;
-          disabled = true;
-        }
+        const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
         return {
           label,
           value: s.name,
-          disabled
         };
       }) || [];
     },
@@ -269,19 +259,7 @@ export default {
 
     rebuildStatus() {
       return this.value.longhornEngine?.status?.rebuildStatus;
-    },
-
-    isLHV2VolExpansionFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
-    },
-
-    isResizeDisabled() {
-      return (
-        !this.isLHV2VolExpansionFeatureEnabled &&
-      this.value?.isLonghornV2 &&
-      this.isEdit
-      );
-    },
+    }
   },
 
   watch: {
@@ -477,7 +455,7 @@ export default {
           :output-modifier="true"
           :increment="1024"
           :mode="mode"
-          :disabled="isResizeDisabled"
+          :disabled="value?.isLonghornV2 && isEdit"
           required
           class="mb-20"
           :suffix="GIBIBYTE"
@@ -485,7 +463,7 @@ export default {
         />
 
         <Banner
-          v-if="isResizeDisabled"
+          v-if="value?.isLonghornV2 && isEdit"
           color="warning"
         >
           <span>{{ t('harvester.volume.longhorn.disableResize') }}</span>
@@ -595,15 +573,6 @@ export default {
           :label="t('nameNsDescription.name.label')"
         />
       </Tab>
-      <Tab
-        v-if="!isCreate"
-        name="conditions"
-        :label="t('harvester.volume.tabs.conditions')"
-        class="bordered-table"
-        :mode="mode"
-      >
-        <Conditions :value="value" />
-      </Tab>
     </ResourceTabs>
   </CruResource>
 </template>

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

@@ -1,196 +0,0 @@
-<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

@@ -1,399 +0,0 @@
-<script>
-import CruResource from '@shell/components/CruResource';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import Tab from '@shell/components/Tabbed/Tab';
-import { NETWORK_ATTACHMENT } from '@shell/config/types';
-import Loading from '@shell/components/Loading';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import { RadioGroup } from '@components/Form/Radio';
-import { NETWORK_PROTOCOL, NETWORK_TYPE } from '@pkg/harvester/config/types';
-import { set } from '@shell/utils/object';
-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',
-
-  emits: ['update:value'],
-
-  components: {
-    Banner,
-    CruResource,
-    LabeledInput,
-    LabeledSelect,
-    NameNsDescription,
-    Tab,
-    RadioGroup,
-    ArrayList,
-    ResourceTabs,
-    Loading,
-    AccessControlList
-  },
-
-  mixins: [CreateEditView],
-
-  inheritAttrs: false,
-
-  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,
-      provider:   '',
-      vpc,
-      gatewayIP:  '',
-      excludeIps: [],
-      private:    false,
-      enableDHCP,
-      acls:       []
-    });
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    const hash = {
-      vpc: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VPC }),
-      nad: this.$store.dispatch(`${ inStore }/findAll`, { type: NETWORK_ATTACHMENT }),
-    };
-
-    await allHash(hash);
-  },
-
-  computed: {
-    showAllowSubnets() {
-      return this.value?.spec?.private === true;
-    },
-
-    doneLocationOverride() {
-      return this.value.doneOverride;
-    },
-
-    allowSubnetTooltip() {
-      return this.t('harvester.subnet.allowSubnet.tooltip', null, true);
-    },
-
-    excludeIPsTooltip() {
-      return this.t('harvester.subnet.excludeIPs.tooltip', null, true);
-    },
-
-    protocolOptions() {
-      return Object.values(NETWORK_PROTOCOL);
-    },
-    provider: {
-      get() {
-        const raw = this.value.spec.provider;
-
-        if (!raw) {
-          return '';
-        }
-        const vmNet = raw.split('.')[0] || '';
-        const ns = raw.split('.')[1] || '';
-
-        return `${ ns }/${ vmNet }`;
-      },
-
-      set(value) {
-        const ns = value.split('/')[0] || '';
-        const vmNet = value.split('/')[1] || '';
-        const provider = `${ vmNet }.${ ns }.ovn`;
-
-        set(this.value, 'spec.provider', provider);
-      }
-    },
-
-    providerOptions() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const vmNets = this.$store.getters[`${ inStore }/all`](NETWORK_ATTACHMENT) || [];
-
-      return vmNets.filter((net) => net.vlanType === NETWORK_TYPE.OVERLAY).map((n) => ({
-        label: n.id,
-        value: n.id,
-      }));
-    },
-
-    vpcOptions() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const vpcs = this.$store.getters[`${ inStore }/all`](HCI.VPC) || [];
-
-      return vpcs.map((n) => ({
-        label: n.id,
-        value: n.id,
-      }));
-    }
-  },
-
-  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) {
-          errors.push(this.t('validation.required', { key: this.t('generic.name') }, true));
-        } else if (!this.value?.spec?.cidrBlock) {
-          errors.push(this.t('validation.required', { key: this.t('harvester.subnet.cidrBlock.label') }, true));
-        } else if (!this.value?.spec?.provider) {
-          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) {
-          buttonCb(false);
-          this.errors = errors;
-
-          return false;
-        }
-        await this.value.save();
-        buttonCb(true);
-        this.done();
-      } catch (e) {
-        this.errors = [e];
-        buttonCb(false);
-      }
-    },
-  },
-};
-
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <CruResource
-    v-else
-    :done-route="doneRoute"
-    :resource="value"
-    :mode="mode"
-    :apply-hooks="applyHooks"
-    :errors="errors"
-    @finish="saveSubnet"
-    @error="e=>errors=e"
-  >
-    <NameNsDescription
-      :value="value"
-      :mode="mode"
-      :namespaced="false"
-      @update:value="$emit('update:value', $event)"
-    />
-    <ResourceTabs
-      class="mt-15"
-      :need-events="false"
-      :need-related="false"
-      :mode="mode"
-      :side-tabs="true"
-    >
-      <Tab
-        name="Basic"
-        :label="t('generic.basic')"
-        :weight="-1"
-        class="bordered-table"
-      >
-        <div class="row mt-10">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.cidrBlock"
-              class="mb-20"
-              required
-              :placeholder="t('harvester.subnet.cidrBlock.placeholder')"
-              :label="t('harvester.subnet.cidrBlock.label')"
-              :mode="mode"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="value.spec.protocol"
-              :label="t('harvester.subnet.protocol.label')"
-              :options="protocolOptions"
-              required
-              :mode="mode"
-            />
-          </div>
-        </div>
-        <div class="row mt-10">
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="provider"
-              :label="t('harvester.subnet.provider.label')"
-              :options="providerOptions"
-              :tooltip="t('harvester.subnet.provider.tooltip')"
-              required
-              :mode="mode"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="value.spec.vpc"
-              :label="t('harvester.subnet.vpc.label')"
-              :options="vpcOptions"
-              required
-              :disabled="true"
-              :mode="mode"
-            />
-          </div>
-        </div>
-        <div class="row mt-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.gateway"
-              class="mb-20"
-              :placeholder="t('harvester.subnet.gateway.placeholder')"
-              :label="t('harvester.subnet.gateway.label')"
-              :mode="mode"
-            />
-          </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
-              v-model:value="value.spec.private"
-              name="enabled"
-              :options="[true, false]"
-              :label="t('harvester.subnet.private.label')"
-              :labels="[t('generic.enabled'), t('generic.disabled')]"
-              :mode="mode"
-              tooltip-key="harvester.subnet.private.tooltip"
-            />
-          </div>
-        </div>
-        <ArrayList
-          v-if="showAllowSubnets"
-          v-model:value="value.spec.allowSubnets"
-          :show-header="true"
-          class="mt-20"
-          :mode="mode"
-          :add-label="t('harvester.subnet.allowSubnet.addSubnet')"
-        >
-          <template #column-headers>
-            <div class="box">
-              <h3 class="key">
-                {{ t('harvester.subnet.allowSubnet.label') }}
-                <i
-                  v-clean-tooltip="{content: allowSubnetTooltip, triggers: ['hover', 'touch', 'focus'] }"
-                  v-stripped-aria-label="allowSubnetTooltip"
-                  class="icon icon-info"
-                  tabindex="0"
-                />
-              </h3>
-            </div>
-          </template>
-          <template #columns="scope">
-            <div class="key">
-              <input
-                v-model="scope.row.value"
-                :placeholder="t('harvester.subnet.allowSubnet.placeholder')"
-              />
-            </div>
-          </template>
-        </ArrayList>
-        <ArrayList
-          v-model:value="value.spec.excludeIps"
-          :show-header="true"
-          class="mt-20"
-          :mode="mode"
-          :add-label="t('harvester.setting.storageNetwork.exclude.addIp')"
-        >
-          <template #column-headers>
-            <div class="box">
-              <h3 class="key">
-                {{ t('harvester.setting.storageNetwork.exclude.label') }}
-                <i
-                  v-clean-tooltip="{content: excludeIPsTooltip, triggers: ['hover', 'touch', 'focus'] }"
-                  v-stripped-aria-label="excludeIPsTooltip"
-                  class="icon icon-info"
-                  tabindex="0"
-                />
-              </h3>
-            </div>
-          </template>
-          <template #columns="scope">
-            <div class="key">
-              <input
-                v-model="scope.row.value"
-                :placeholder="t('harvester.subnet.excludeIPs.placeholder')"
-              />
-            </div>
-          </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

@@ -1,180 +0,0 @@
-<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 { DOC } from '../../config/doc-links';
-import { docLink } from '../../utils/feature-flags';
-
-export default {
-  name: 'StaticRoutes',
-
-  emits: ['update:value'],
-
-  components: { Banner },
-
-  props: {
-    value: {
-      type:    Array,
-      default: null,
-    },
-    mode: {
-      type:    String,
-      default: _EDIT,
-    },
-  },
-
-  data() {
-    const rows = (this.value || []).map((row) => {
-      return {
-        cidr:      row.cidr || '',
-        nextHopIP: row.nextHopIP || '',
-      };
-    });
-
-    return { rows };
-  },
-
-  computed: {
-    isView() {
-      return this.mode === _VIEW;
-    },
-
-    showAdd() {
-      return !this.isView;
-    },
-
-    showRemove() {
-      return !this.isView;
-    },
-    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() {
-    this.queueUpdate = debounce(this.update, 100);
-  },
-
-  methods: {
-    add() {
-      this.rows.push({
-        cidr:      '',
-        nextHopIP: '',
-      });
-      this.queueUpdate();
-    },
-
-    remove(idx) {
-      removeAt(this.rows, idx);
-      this.queueUpdate();
-    },
-
-    update() {
-      if (this.isView) {
-        return;
-      }
-
-      this.$emit('update:value', this.rows);
-    }
-  },
-};
-</script>
-
-<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"
-    >
-      <div
-        v-for="(row, idx) in rows"
-        :key="idx"
-      >
-        <div class="pool-headers cidr">
-          <span class="pool-cidr">
-            <t k="harvester.vpc.staticRoutes.cidr.label" />
-          </span>
-          <span class="pool-nextHopIP">
-            <t k="harvester.vpc.staticRoutes.nextHopIP.label" />
-            <i
-              v-clean-tooltip="{content: nextHopIPTooltip, triggers: ['hover', 'touch', 'focus'] }"
-              v-stripped-aria-label="nextHopIPTooltip"
-              class="icon icon-info"
-              tabindex="0"
-            />
-          </span>
-        </div>
-        <div class="pool-row cidr">
-          <div class="pool-cidr">
-            <span v-if="isView">
-              {{ row.cidr }}
-            </span>
-            <input
-              v-else
-              v-model="row.cidr"
-              type="text"
-              :placeholder="t('harvester.vpc.staticRoutes.cidr.placeholder')"
-              @input="queueUpdate"
-            />
-          </div>
-          <div class="pool-nextHopIP">
-            <span v-if="isView">
-              {{ row.nextHopIP }}
-            </span>
-            <input
-              v-else
-              v-model="row.nextHopIP"
-              type="text"
-              :placeholder="t('harvester.vpc.staticRoutes.nextHopIP.placeholder')"
-              @input="queueUpdate"
-            />
-          </div>
-          <button
-            v-if="showRemove"
-            type="button"
-            class="btn role-link pl-0"
-            @click="remove(idx)"
-          >
-            <t k="generic.remove" />
-          </button>
-        </div>
-      </div>
-    </div>
-    <button
-      v-if="showAdd"
-      type="button"
-      class="btn role-tertiary add"
-      @click="add()"
-    >
-      <t k="generic.add" />
-    </button>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-  .pool-headers, .pool-row {
-    display: grid;
-    grid-column-gap: $column-gutter;
-    margin-bottom: 10px;
-    align-items: center;
-
-    &.cidr {
-      grid-template-columns: 40%+$column-gutter 40%+$column-gutter 15%;
-    }
-  }
-
-</style>

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

@@ -1,187 +0,0 @@
-<script>
-import debounce from 'lodash/debounce';
-import { _EDIT, _VIEW } from '@shell/config/query-params';
-import { removeAt } from '@shell/utils/array';
-import { HCI } from '../../types';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-
-export default {
-  name: 'VpcPeerings',
-
-  emits: ['update:value'],
-
-  components: { LabeledSelect },
-
-  props: {
-    value: {
-      type:    Array,
-      default: null,
-    },
-    mode: {
-      type:    String,
-      default: _EDIT,
-    },
-    vpc: {
-      type:    Object,
-      default: () => ({}),
-    },
-  },
-
-  async fetch() {
-    await this.$store.dispatch('harvester/findAll', { type: HCI.VPC });
-  },
-
-  data() {
-    const rows = (this.value || []).map((row) => {
-      return {
-        localConnectIP:      row.localConnectIP || '',
-        remoteVpc:      row.remoteVpc || '',
-      };
-    });
-
-    return { rows };
-  },
-
-  computed: {
-    isView() {
-      return this.mode === _VIEW;
-    },
-
-    isEdit() {
-      return this.mode === _EDIT;
-    },
-
-    showAdd() {
-      return !this.isView;
-    },
-
-    showRemove() {
-      return !this.isView;
-    },
-
-    remoteVpcOptions() {
-      const allVpcs = this.$store.getters['harvester/all'](HCI.VPC) || [];
-
-      // filter self vpc if editing
-      const vpcs = this.isEdit ? allVpcs.filter((v) => v.id !== this.vpc.id) : allVpcs;
-
-      return vpcs.map((n) => ({
-        label: n.id,
-        value: n.id,
-      }));
-    },
-    localConnectIPTooltip() {
-      return this.t('harvester.vpc.vpcPeerings.localConnectIP.tooltip');
-    },
-  },
-
-  created() {
-    this.queueUpdate = debounce(this.update, 100);
-  },
-
-  methods: {
-    add() {
-      this.rows.push({
-        localConnectIP:  '',
-        remoteVpc:      '',
-      });
-      this.queueUpdate();
-    },
-
-    remove(idx) {
-      removeAt(this.rows, idx);
-      this.queueUpdate();
-    },
-
-    update() {
-      if (this.isView) {
-        return;
-      }
-      this.$emit('update:value', this.rows);
-    }
-  },
-};
-</script>
-
-<template>
-  <div>
-    <div
-      v-if="rows.length"
-      class="static-route-row"
-    >
-      <div
-        v-for="(row, idx) in rows"
-        :key="idx"
-      >
-        <div class="pool-headers localConnectIP">
-          <span class="pool-localConnectIP">
-            <t k="harvester.vpc.vpcPeerings.localConnectIP.label" />
-            <i
-              v-clean-tooltip="{content: localConnectIPTooltip, triggers: ['hover', 'touch', 'focus'] }"
-              v-stripped-aria-label="localConnectPTooltip"
-              class="icon icon-info"
-              tabindex="0"
-            />
-          </span>
-          <span class="pool-remoteVpc">
-            <t k="harvester.vpc.vpcPeerings.remoteVpc.label" />
-          </span>
-        </div>
-        <div class="pool-row localConnectIP">
-          <div class="pool-localConnectIP">
-            <span v-if="isView">
-              {{ row.localConnectIP }}
-            </span>
-            <input
-              v-else
-              v-model="row.localConnectIP"
-              type="text"
-              :placeholder="t('harvester.vpc.vpcPeerings.localConnectIP.placeholder')"
-              @input="queueUpdate"
-            />
-          </div>
-          <div class="pool-remoteVpc">
-            <span v-if="isView">
-              {{ row.remoteVpc }}
-            </span>
-            <LabeledSelect
-              v-model:value="row.remoteVpc"
-              :options="remoteVpcOptions"
-              :mode="mode"
-              @update:value="queueUpdate"
-            />
-          </div>
-          <button
-            v-if="showRemove"
-            type="button"
-            class="btn role-link pl-0"
-            @click="remove(idx)"
-          >
-            <t k="generic.remove" />
-          </button>
-        </div>
-      </div>
-    </div>
-    <button
-      v-if="showAdd"
-      type="button"
-      class="btn role-tertiary add"
-      @click="add()"
-    >
-      <t k="generic.add" />
-    </button>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-  .pool-headers, .pool-row {
-    display: grid;
-    grid-column-gap: $column-gutter;
-    margin-bottom: 10px;
-    align-items: center;
-
-    &.localConnectIP {
-      grid-template-columns: 40%+$column-gutter 40%+$column-gutter 15%;
-    }
-  }
-</style>

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

@@ -1,120 +0,0 @@
-<script>
-import CruResource from '@shell/components/CruResource';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import Tab from '@shell/components/Tabbed/Tab';
-import Loading from '@shell/components/Loading';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import ResourceTabs from '@shell/components/form/ResourceTabs/index';
-import StaticRoutes from './StaticRoutes';
-import VpcPeerings from './VpcPeerings';
-import { set } from '@shell/utils/object';
-
-export default {
-  name: 'EditVPC',
-
-  emits: ['update:value'],
-
-  components: {
-    CruResource,
-    NameNsDescription,
-    Tab,
-    StaticRoutes,
-    ResourceTabs,
-    Loading,
-    VpcPeerings
-  },
-
-  mixins: [CreateEditView],
-
-  inheritAttrs: false,
-
-  data() {
-    set(this.value, 'spec', this.value.spec || {
-      staticRoutes: [],
-      vpcPeerings:  [],
-    });
-
-    return { staticRoutes: [] };
-  },
-
-  methods: {
-    async saveVpc(buttonCb) {
-      const errors = [];
-
-      try {
-        const name = this.value?.metadata?.name;
-
-        if (!name) {
-          errors.push(this.t('validation.required', { key: this.t('generic.name') }, true));
-        }
-
-        if (errors.length > 0) {
-          buttonCb(false);
-          this.errors = errors;
-
-          return false;
-        }
-        await this.value.save();
-        buttonCb(true);
-        this.done();
-      } catch (e) {
-        this.errors = [e];
-        buttonCb(false);
-      }
-    },
-  },
-};
-
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <CruResource
-    v-else
-    :done-route="doneRoute"
-    :resource="value"
-    :mode="mode"
-    :apply-hooks="applyHooks"
-    :errors="errors"
-    @finish="saveVpc"
-    @error="e=>errors=e"
-  >
-    <NameNsDescription
-      :value="value"
-      :mode="mode"
-      :namespaced="false"
-      @update:value="$emit('update:value', $event)"
-    />
-    <ResourceTabs
-      class="mt-15"
-      :mode="mode"
-      :side-tabs="true"
-    >
-      <Tab
-        name="staticRoutes"
-        :label="t('harvester.vpc.staticRoutes.label')"
-        :weight="-1"
-        class="bordered-table"
-      >
-        <StaticRoutes
-          v-model:value="value.spec.staticRoutes"
-          class="col span-12"
-          :mode="mode"
-        />
-      </Tab>
-      <Tab
-        name="vpcPeerings"
-        :label="t('harvester.vpc.vpcPeerings.label')"
-        :weight="-2"
-        class="bordered-table"
-      >
-        <VpcPeerings
-          v-model:value="value.spec.vpcPeerings"
-          class="col span-12"
-          :mode="mode"
-          :vpc="value"
-        />
-      </Tab>
-    </ResourceTabs>
-  </CruResource>
-</template>

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

@@ -2,44 +2,23 @@
 import UnitInput from '@shell/components/form/UnitInput';
 import InputOrDisplay from '@shell/components/InputOrDisplay';
 import { GIBIBYTE } from '../../utils/unit';
-import { Checkbox } from '@components/Form/Checkbox';
-import { _VIEW } from '@shell/config/query-params';
-import { HCI } from '../../types';
-import { allHash } from '@shell/utils/promise';
-import { HCI_SETTING } from '../../config/settings';
-
-const DEFAULT_HOT_PLUG_TIMES = 4;
 
 export default {
   name: 'HarvesterEditCpuMemory',
 
   emits: ['updateCpuMemory'],
 
-  components: {
-    UnitInput, InputOrDisplay, Checkbox
-  },
+  components: { UnitInput, InputOrDisplay },
 
   props: {
     cpu: {
       type:    Number,
       default: null
     },
-    maxCpu: {
-      type:    Number,
-      default: null
-    },
     memory: {
       type:    String,
       default: null
     },
-    maxMemory: {
-      type:    String,
-      default: null
-    },
-    enableHotPlug: {
-      type:    Boolean,
-      default: false
-    },
     mode: {
       type:    String,
       default: 'create',
@@ -50,59 +29,21 @@ export default {
     }
   },
 
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    const res = await allHash({ settings: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SETTING }) });
-
-    this.settings = res.settings || [];
-  },
-
   data() {
     return {
       GIBIBYTE,
-      localCpu:           this.cpu,
-      localMemory:        this.memory,
-      maxLocalCpu:        this.maxCpu,
-      maxLocalMemory:     this.maxMemory,
-      localEnableHotPlug: this.enableHotPlug,
-      settings:           []
+      localCpu:    this.cpu,
+      localMemory: this.memory
     };
   },
 
   computed: {
-    isView() {
-      return this.mode === _VIEW;
-    },
-    cpuDisplay() {
+    cupDisplay() {
       return `${ this.localCpu } C`;
     },
 
-    maxCpuDisplay() {
-      return `${ this.maxLocalCpu } C`;
-    },
-
     memoryDisplay() {
       return `${ this.localMemory }`;
-    },
-
-    maxMemoryDisplay() {
-      return `${ this.maxLocalMemory }`;
-    },
-
-    cpuMemoryHotplugTooltip() {
-      return this.t('harvester.virtualMachine.hotplug.tooltip', { hotPlugTimes: this.maxHotplugRatio });
-    },
-
-    isCPUMemoryHotPlugFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('cpuMemoryHotplug');
-    },
-
-    maxHotplugRatio() {
-      const maxHotPlugRatioSetting = this.settings.find((s) => s.id === HCI_SETTING.MAX_HOTPLUG_RATIO);
-      const maxPlugRatio = maxHotPlugRatioSetting?.value ? parseInt(maxHotPlugRatioSetting.value, 10) : DEFAULT_HOT_PLUG_TIMES;
-
-      return maxPlugRatio;
     }
   },
 
@@ -114,161 +55,71 @@ export default {
       if (neu && !neu.includes('null')) {
         this.localMemory = neu;
       }
-    },
-    maxCpu(neu) {
-      this.maxLocalCpu = neu;
-    },
-    maxMemory(neu) {
-      if (neu && !neu.includes('null')) {
-        this.maxLocalMemory = neu;
-      }
-    },
-    enableHotPlug(neu) {
-      this.localEnableHotPlug = neu;
-    },
-
+    }
   },
 
   methods: {
-    hotPlugChanged(neu) {
-      // If hot plug is enabled, we need to update the maxCpu and maxMemory values
-      if (neu) {
-        this.maxLocalCpu = this.localCpu ? this.localCpu * this.maxHotplugRatio : null;
-        this.maxLocalMemory = this.localMemory ? `${ parseInt(this.localMemory, 10) * this.maxHotplugRatio }${ GIBIBYTE }` : null;
-        this.$emit('updateCpuMemory', this.localCpu, this.localMemory, this.maxLocalCpu, this.maxLocalMemory, neu);
+    change() {
+      let memory = '';
+
+      if (String(this.localMemory).includes('Gi')) {
+        memory = this.localMemory;
       } else {
-        this.$emit('updateCpuMemory', this.localCpu, this.localMemory, '', null, neu);
+        memory = `${ this.localMemory }${ GIBIBYTE }`;
       }
-    },
-    changeMemory() {
-      if (this.localEnableHotPlug) {
-        this.maxLocalMemory = this.localMemory ? `${ parseInt(this.localMemory, 10) * this.maxHotplugRatio }${ GIBIBYTE }` : null;
+      if (memory.includes('null')) {
+        memory = null;
       }
-      this.$emit('updateCpuMemory', this.localCpu, this.localMemory, this.maxLocalCpu, this.maxLocalMemory, this.localEnableHotPlug);
-    },
-    changeCPU() {
-      if (this.localEnableHotPlug) {
-        this.maxLocalCpu = this.localCpu ? this.localCpu * this.maxHotplugRatio : null;
-      }
-      this.$emit('updateCpuMemory', this.localCpu, this.localMemory, this.maxLocalCpu, this.maxLocalMemory, this.localEnableHotPlug);
-    },
-    changeMaxCPUMemory() {
-      this.$emit('updateCpuMemory', this.localCpu, this.localMemory, this.maxLocalCpu, this.maxLocalMemory, this.localEnableHotPlug);
+      this.$emit('updateCpuMemory', this.localCpu, memory);
     },
+
   }
 };
 </script>
 
 <template>
-  <div>
-    <div class="row">
-      <div class="col span-6 mb-10">
-        <InputOrDisplay
-          name="CPU"
-          :value="cpuDisplay"
+  <div class="row">
+    <div class="col span-6 mb-10">
+      <InputOrDisplay
+        name="CPU"
+        :value="cupDisplay"
+        :mode="mode"
+      >
+        <UnitInput
+          v-model:value="localCpu"
+          label="CPU"
+          suffix="C"
+          :delay="0"
+          required
+          :disabled="disabled"
           :mode="mode"
-          class="mb-10"
-        >
-          <UnitInput
-            v-model:value="localCpu"
-            label="CPU"
-            suffix="C"
-            :delay="0"
-            required
-            :disabled="disabled"
-            :mode="mode"
-            class="mb-20"
-            @update:value="changeCPU"
-          />
-        </InputOrDisplay>
-      </div>
-      <div class="col span-6 mb-10">
-        <InputOrDisplay
-          :name="t('harvester.virtualMachine.input.memory')"
-          :value="memoryDisplay"
-          :mode="mode"
-        >
-          <UnitInput
-            v-model:value="localMemory"
-            :label="t('harvester.virtualMachine.input.memory')"
-            :mode="mode"
-            :input-exponent="3"
-            :delay="0"
-            :increment="1024"
-            :output-modifier="true"
-            :disabled="disabled"
-            required
-            :suffix="GIBIBYTE"
-            class="mb-20"
-            @update:value="changeMemory"
-          />
-        </InputOrDisplay>
-      </div>
+          class="mb-20"
+          @update:value="change"
+        />
+      </InputOrDisplay>
     </div>
-    <div
-      v-if="isCPUMemoryHotPlugFeatureEnabled"
-      class="row"
-    >
-      <Checkbox
-        v-model:value="localEnableHotPlug"
-        class="check"
-        type="checkbox"
-        :label="t('harvester.virtualMachine.hotplug.title')"
-        :disabled="isView"
-        @update:value="hotPlugChanged"
-      />
-      <i
-        v-clean-tooltip="{content: cpuMemoryHotplugTooltip, triggers: ['hover', 'touch', 'focus'] }"
-        v-stripped-aria-label="cpuMemoryHotplugTooltip"
-        class="icon icon-info"
-        tabindex="0"
-      />
-    </div>
-    <div
-      v-if="localEnableHotPlug && isCPUMemoryHotPlugFeatureEnabled"
-      class="row"
-    >
-      <div class="col span-6 mb-10">
-        <InputOrDisplay
-          :name="t('harvester.virtualMachine.input.maxCpu')"
-          :value="maxCpuDisplay"
+
+    <div class="col span-6 mb-10">
+      <InputOrDisplay
+        :name="t('harvester.virtualMachine.input.memory')"
+        :value="memoryDisplay"
+        :mode="mode"
+      >
+        <UnitInput
+          v-model:value="localMemory"
+          :label="t('harvester.virtualMachine.input.memory')"
           :mode="mode"
-          class="mt-20"
-        >
-          <UnitInput
-            v-model:value="maxLocalCpu"
-            :label="t('harvester.virtualMachine.input.maxCpu')"
-            suffix="C"
-            :delay="0"
-            :disabled="disabled"
-            :mode="mode"
-            class="mt-20"
-            @update:value="changeMaxCPUMemory"
-          />
-        </InputOrDisplay>
-      </div>
-      <div class="col span-6 mb-10">
-        <InputOrDisplay
-          :name="t('harvester.virtualMachine.input.maxMemory')"
-          :value="maxMemoryDisplay"
-          :mode="mode"
-          class="mt-20"
-        >
-          <UnitInput
-            v-model:value="maxLocalMemory"
-            :label="t('harvester.virtualMachine.input.maxMemory')"
-            :mode="mode"
-            :input-exponent="3"
-            :delay="0"
-            :increment="1024"
-            :output-modifier="true"
-            :disabled="disabled"
-            :suffix="GIBIBYTE"
-            class="mt-20"
-            @update:value="changeMaxCPUMemory"
-          />
-        </InputOrDisplay>
-      </div>
+          :input-exponent="3"
+          :delay="0"
+          :increment="1024"
+          :output-modifier="true"
+          :disabled="disabled"
+          required
+          :suffix="GIBIBYTE"
+          class="mb-20"
+          @update:value="change"
+        />
+      </InputOrDisplay>
     </div>
   </div>
 </template>

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

@@ -1,5 +1,6 @@
 <script>
 import InfoBox from '@shell/components/InfoBox';
+
 import { NETWORK_ATTACHMENT } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { clone } from '@shell/utils/object';
@@ -13,13 +14,6 @@ export default {
   components: { InfoBox, Base },
 
   props: {
-    vm: {
-      type:    Object,
-      default: () => {
-        return {};
-      }
-    },
-
     mode: {
       type:    String,
       default: 'create'
@@ -38,15 +32,10 @@ export default {
     }
   },
 
-  async fetch() {
-    await this.fetchHotunplugData();
-  },
-
   data() {
     return {
-      nameIdx:            1,
-      rows:               this.addKeyId(clone(this.value)),
-      hotunpluggableNics: new Set(),
+      rows:    this.addKeyId(clone(this.value)),
+      nameIdx: 1
     };
   },
 
@@ -75,57 +64,15 @@ export default {
 
       return out;
     },
-
-    canCheckHotunplug() {
-      return !!this.vm?.actions?.findHotunpluggableNics;
-    },
-
-    vmState() {
-      return this.vm?.stateDisplay;
-    }
   },
 
   watch: {
     value(neu) {
-      this.rows = this.mergeHotplugData(clone(neu));
+      this.rows = neu;
     },
-
-    vmState(newState, oldState) {
-      if (newState !== oldState) {
-        this.fetchHotunplugData();
-      }
-    }
   },
 
   methods: {
-    async fetchHotunplugData() {
-      if (!this.canCheckHotunplug) {
-        this.rows = this.mergeHotplugData(clone(this.value));
-
-        return;
-      }
-
-      try {
-        const resp = await this.vm.doAction('findHotunpluggableNics');
-
-        this.hotunpluggableNics = new Set(resp?.interfaces || []);
-      } catch (e) {
-        // eslint-disable-next-line no-console
-        console.error('Failed to fetch hot-unpluggable NICs:', e);
-        this.hotunpluggableNics = new Set();
-      }
-
-      this.rows = this.mergeHotplugData(clone(this.value));
-    },
-
-    mergeHotplugData(networks) {
-      return (networks || []).map((network) => ({
-        ...network,
-        isHotunpluggable: this.hotunpluggableNics.has(network.name),
-        rowKeyId:         network.rowKeyId || randomStr(10)
-      }));
-    },
-
     add(type) {
       const name = this.generateName();
 
@@ -171,11 +118,7 @@ export default {
 
     update() {
       this.$emit('update:value', this.rows);
-    },
-
-    unplugNIC(network) {
-      this.vm.unplugNIC(network.name);
-    },
+    }
   }
 };
 </script>
@@ -186,28 +129,17 @@ export default {
       v-for="(row, i) in rows"
       :key="i"
     >
-      <div class="box-title mb-10">
-        <h3>
-          {{ t('harvester.virtualMachine.network.title') }}
-        </h3>
-        <button
-          v-if="!isView"
-          type="button"
-          class="role-link btn btn-sm remove"
-          @click="remove(row)"
-        >
-          <i class="icon icon-x" />
-        </button>
-        <button
-          v-if="vm.hotplugNicFeatureEnabled && row.isHotunpluggable && isView"
-          type="button"
-          class="role-link btn btn-sm remove"
-          :disabled="!canCheckHotunplug"
-          @click="unplugNIC(row)"
-        >
-          {{ t('harvester.virtualMachine.hotUnplug.detachNIC.actionLabel') }}
-        </button>
-      </div>
+      <button
+        v-if="!isView"
+        type="button"
+        class="role-link remove-vol"
+        @click="remove(row)"
+      >
+        <i class="icon icon-x" />
+      </button>
+
+      <h3> {{ t('harvester.virtualMachine.network.title') }} </h3>
+
       <Base
         v-model:value="rows[i]"
         :rows="rows"
@@ -230,13 +162,16 @@ export default {
 </template>
 
 <style lang='scss' scoped>
-.box-title{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+.infoBox{
+  position: relative;
+}
 
-  h3 {
-    margin-bottom: 0;
-  }
+.remove-vol {
+  position: absolute;
+  top: 10px;
+  right: 16px;
+  padding:0px;
+  max-height: 28px;
+  min-height: 28px;
 }
 </style>

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

@@ -17,7 +17,6 @@ import { SOURCE_TYPE } from '../../../config/harvester-map';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
 import { HCI } from '../../../types';
 import { VOLUME_MODE } from '@pkg/harvester/config/types';
-import { OFF } from '../../../models/kubevirt.io.virtualmachine';
 
 export default {
   emits: ['update:value'],
@@ -136,10 +135,6 @@ export default {
     pvcs() {
       return this.$store.getters['harvester/all'](PVC) || [];
     },
-
-    isLHV2VolExpansionFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
-    },
   },
 
   watch: {
@@ -271,17 +266,7 @@ export default {
 
     isLonghornV2(volume) {
       return volume?.pvc?.isLonghornV2 || volume?.pvc?.storageClass?.isLonghornV2;
-    },
-
-    isResizeDisabled(volume) {
-      if (this.isLHV2VolExpansionFeatureEnabled) return false;
-      if (this.isCreate || volume.newCreateId) return false;
-
-      const isStopped = this.vm.stateDisplay === OFF;
-      const isLonghornV2 = this.isLonghornV2(volume);
-
-      return !isStopped || isLonghornV2;
-    },
+    }
   },
 };
 </script>
@@ -303,57 +288,55 @@ export default {
         v-for="(volume, i) in rows"
         :key="volume.id"
       >
-        <InfoBox>
-          <div class="box-title mb-10">
-            <h3>
-              <span
-                v-if="volume.to && isVirtualType"
-                class="title"
+        <InfoBox class="box">
+          <button
+            v-if="!isView"
+            type="button"
+            class="role-link btn btn-sm remove"
+            @click="removeVolume(volume)"
+          >
+            <i class="icon icon-x" />
+          </button>
+          <button
+            v-if="volume.hotpluggable && isView"
+            type="button"
+            class="role-link btn remove"
+            @click="unplugVolume(volume)"
+          >
+            {{ t('harvester.virtualMachine.unplug.detachVolume') }}
+          </button>
+          <h3>
+            <span
+              v-if="volume.to && isVirtualType"
+              class="title"
+            >
+              <router-link :to="volume.to">
+                {{ t('harvester.virtualMachine.volume.edit') }} {{ headerFor(volume.source) }}
+              </router-link>
+
+              <BadgeStateFormatter
+                v-if="volume.pvc"
+                class="ml-10 state"
+                :arbitrary="true"
+                :row="volume.pvc"
+                :value="volume.pvc.state"
+              />
+              <a
+                v-if="dev && !!volume.pvc && !!volume.pvc.resourceExternalLink"
+                v-clean-tooltip="t(volume.pvc.resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
+                class="ml-5 resource-external"
+                rel="nofollow noopener noreferrer"
+                target="_blank"
+                :href="volume.pvc.resourceExternalLink.url"
               >
-                <router-link :to="volume.to">
-                  {{ t('harvester.virtualMachine.volume.edit') }} {{ headerFor(volume.source) }}
-                </router-link>
+                <i class="icon icon-external-link" />
+              </a>
+            </span>
 
-                <BadgeStateFormatter
-                  v-if="volume.pvc"
-                  class="ml-10 state"
-                  :arbitrary="true"
-                  :row="volume.pvc"
-                  :value="volume.pvc.state"
-                />
-                <a
-                  v-if="dev && !!volume.pvc && !!volume.pvc.resourceExternalLink"
-                  v-clean-tooltip="t(volume.pvc.resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
-                  class="ml-5 resource-external"
-                  rel="nofollow noopener noreferrer"
-                  target="_blank"
-                  :href="volume.pvc.resourceExternalLink.url"
-                >
-                  <i class="icon icon-external-link" />
-                </a>
-              </span>
-
-              <span v-else>
-                {{ headerFor(volume.source, !!volume?.volumeBackups) }}
-              </span>
-            </h3>
-            <button
-              v-if="!isView"
-              type="button"
-              class="role-link btn btn-sm remove"
-              @click="removeVolume(volume)"
-            >
-              <i class="icon icon-x" />
-            </button>
-            <button
-              v-if="volume.hotpluggable && isView"
-              type="button"
-              class="role-link btn btn-sm remove"
-              @click="unplugVolume(volume)"
-            >
-              {{ t('harvester.virtualMachine.hotUnplug.detachVolume.actionLabel') }}
-            </button>
-          </div>
+            <span v-else>
+              {{ headerFor(volume.source, !!volume?.volumeBackups) }}
+            </span>
+          </h3>
           <div>
             <component
               :is="componentFor(volume.source)"
@@ -364,7 +347,6 @@ export default {
               :is-edit="isEdit"
               :is-view="isView"
               :is-virtual-type="isVirtualType"
-              :is-resize-disabled="isResizeDisabled(rows[i])"
               :mode="mode"
               :idx="i"
               :validate-required="validateRequired"
@@ -412,7 +394,7 @@ export default {
               :label="ucFirst(value.volumeBackups.error.message)"
             />
             <Banner
-              v-if="!isLHV2VolExpansionFeatureEnabled && isLonghornV2(volume) && !isView"
+              v-if="isLonghornV2(volume) && !isView"
               color="warning"
               :label="t('harvester.volume.longhorn.disableResize')"
             />
@@ -497,24 +479,25 @@ export default {
 </template>
 
 <style lang='scss' scoped>
-  .box-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    h3 {
-      margin-bottom: 0;
-    }
+  .box {
+    position: relative;
   }
 
   .title {
     display: flex;
-    align-items: center;
 
     .state {
       font-size: 16px;
     }
   }
+
+  .remove {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    padding: 0px;
+  }
+
   .bootOrder {
     display: flex;
     align-items: center;

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

@@ -99,6 +99,7 @@ export default {
         this.allPVCs
           .filter( (pvc) => {
             let isAvailable = true;
+            let isBeingUsed = false;
 
             this.rows.forEach( (O) => {
               if (O.volumeName === pvc.metadata.name) {
@@ -110,16 +111,17 @@ export default {
               return false;
             }
 
-            // already used as image volume
-            if (this.idx > 0 && pvc.metadata?.annotations?.[HCI_ANNOTATIONS.IMAGE_ID]) {
-              return false;
-            }
-
             if (pvc.isGoldenImageVolume) {
               return false;
             }
 
-            return isAvailable && pvc.isAvailable;
+            if (pvc.attachVM && isAvailable && pvc.attachVM?.id === this.vm?.id && this.isEdit) {
+              isBeingUsed = false;
+            } else if (pvc.attachVM) {
+              isBeingUsed = true;
+            }
+
+            return isAvailable && !isBeingUsed && pvc.isAvailable;
           })
           .map((pvc) => {
             return {

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

@@ -64,12 +64,7 @@ export default {
     isVirtualType: {
       type:    Boolean,
       default: true
-    },
-
-    isResizeDisabled: {
-      type:    Boolean,
-      default: false
-    },
+    }
   },
 
   data() {
@@ -140,6 +135,10 @@ export default {
       return this.$store.getters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
     },
 
+    isLonghornV2() {
+      return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
+    },
+
     selectedImage() {
       return this.$store.getters['harvester/all'](HCI.IMAGE)?.find( (I) => this.value.image === I.id);
     },
@@ -351,7 +350,7 @@ export default {
             :label="t('harvester.fields.size')"
             :mode="mode"
             :required="validateRequired"
-            :disabled="isResizeDisabled"
+            :disable="isLonghornV2"
             :suffix="GIBIBYTE"
             @update:value="update"
           />

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

@@ -13,7 +13,6 @@ import { ucFirst } from '@shell/utils/string';
 import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storageclass';
 import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../../../../utils/unit';
-import { isInternalStorageClass } from '../../../../utils/storage-class';
 import { VOLUME_MODE } from '@pkg/harvester/config/types';
 
 export default {
@@ -56,12 +55,7 @@ export default {
     isVirtualType: {
       type:    Boolean,
       default: true
-    },
-
-    isResizeDisabled: {
-      type:    Boolean,
-      default: false
-    },
+    }
   },
 
   data() {
@@ -124,22 +118,19 @@ export default {
 
     storageClassOptions() {
       return this.storageClasses.filter((s) => !s.parameters?.backingImage).map((s) => {
-        let label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
-        let disabled = false;
-
-        if (isInternalStorageClass(s.name)) {
-          label += ` (${ this.t('harvester.storage.internal.label') })`;
-          disabled = true;
-        }
+        const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
         return {
           label,
           value: s.name,
-          disabled
         };
       }) || [];
     },
 
+    isLonghornV2() {
+      return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
+    },
+
     isLonghornStorageClass() {
       const selectedSC = this.storageClasses.find((sc) => sc.name === this.value?.storageClassName) || {};
 
@@ -311,7 +302,7 @@ export default {
             :mode="mode"
             :required="validateRequired"
             :label="t('harvester.fields.size')"
-            :disabled="isResizeDisabled"
+            :disabled="isLonghornV2"
             :suffix="GIBIBYTE"
             @update:value="update"
           />

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

@@ -2,7 +2,7 @@
 import { isEqual } from 'lodash';
 import { mapGetters } from 'vuex';
 import Tabbed from '@shell/components/Tabbed';
-import { clone } from '@shell/utils/object';
+import { clone, set } from '@shell/utils/object';
 import Tab from '@shell/components/Tabbed/Tab';
 import { Checkbox } from '@components/Form/Checkbox';
 import CruResource from '@shell/components/CruResource';
@@ -96,6 +96,7 @@ export default {
       templateVersionId: '',
       namePrefix:        '',
       isSingle:          true,
+      useTemplate:       false,
       isOpen:            false,
       hostname,
       isRestartImmediately,
@@ -236,9 +237,6 @@ export default {
         }
         const versions = await this.$store.dispatch('harvester/findAll', { type: HCI.VM_VERSION });
         const curVersion = versions.find( (V) => V.id === id);
-
-        if (!curVersion?.spec?.vm) return;
-
         const cloneVersionVM = clone(curVersion.spec.vm);
 
         delete cloneVersionVM.spec?.template?.spec?.accessCredentials;
@@ -246,6 +244,7 @@ export default {
         delete cloneVersionVM.spec?.template?.metadata?.annotations?.[HCI_ANNOTATIONS.DYNAMIC_SSHKEYS_USERS];
 
         const claimTemplate = parseVolumeClaimTemplates(cloneVersionVM);
+
         const deleteDataSource = claimTemplate.map((volume) => {
           if (volume?.spec?.dataSource) {
             delete volume.spec.dataSource;
@@ -254,19 +253,12 @@ export default {
           return volume;
         });
 
-        delete cloneVersionVM.metadata.annotations[HCI_ANNOTATIONS.MAC_ADDRESS];
         cloneVersionVM.metadata.annotations[HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE] = JSON.stringify(deleteDataSource);
 
-        // Update instance labels, labels and annotations
-        this.value.spec.template.metadata.labels = cloneVersionVM.spec.template.metadata.labels || {};
-        this.value.metadata.labels = {
-          ...(curVersion.metadata?.labels || {}),
-          ...(cloneVersionVM.metadata?.labels || {})
-        };
-        this.value.metadata.annotations = {
-          ...(curVersion.metadata?.annotations || {}),
-          ...(cloneVersionVM.metadata?.annotations || {})
-        };
+        // Update labels, instance labels and annotations
+        this.value.metadata.labels = cloneVersionVM.metadata.labels;
+        this.value.spec.template.metadata.labels = cloneVersionVM.spec.template.metadata.labels;
+        this.value.metadata.annotations = cloneVersionVM.metadata.annotations;
 
         this.getInitConfig({
           value: cloneVersionVM, existUserData: true, fromTemplate: true
@@ -338,15 +330,6 @@ 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 {
@@ -354,18 +337,6 @@ 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;
@@ -434,44 +405,38 @@ export default {
       }
     },
 
-    _compareDisksIgnoreStorage(disksA = [], disksB = []) {
-      if (disksA.length !== disksB.length) return false;
+    restartVM() {
+      if (this.mode !== 'edit') {
+        return;
+      }
+      if (!this.value.isRunning) {
+        return;
+      }
+      const cloneDeepNewVM = clone(this.value);
 
-      const sortedA = [...disksA].sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
-      const sortedB = [...disksB].sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
+      // new VM
+      delete cloneDeepNewVM?.metadata;
+      delete cloneDeepNewVM?.__clone;
 
-      for (let i = 0; i < sortedA.length; i++) {
-        const cloneA = clone(sortedA[i]);
-        const cloneB = clone(sortedB[i]);
+      // old VM
+      delete this.cloneVM?.metadata;
+      delete this.cloneVM?.__clone;
 
-        // remove the storage field before comparison
-        delete cloneA?.spec?.resources?.requests?.storage;
-        delete cloneB?.spec?.resources?.requests?.storage;
+      // add empty hostDevices to old VM as CRD does not have it.
+      const devicesObj = this.cloneVM?.spec?.template?.spec?.domain?.devices;
 
-        if (!isEqual(cloneA, cloneB)) return false;
+      if (devicesObj && devicesObj.hostDevices === undefined) {
+        set(devicesObj, 'hostDevices', []);
       }
 
-      return true;
-    },
+      const oldVM = JSON.parse(JSON.stringify(this.cloneVM));
+      const newVM = JSON.parse(JSON.stringify(cloneDeepNewVM));
 
-    _shouldPromptRestart(oldVM, newVM) {
-      const specChanged = !isEqual(oldVM?.spec, newVM?.spec);
-
-      // check if the disk defined in annotations has changed, ignoring storage size
-      const oldDisks = parseVolumeClaimTemplates(oldVM);
-      const newDisks = parseVolumeClaimTemplates(newVM);
-      const diskChanged = !this._compareDisksIgnoreStorage(oldDisks, newDisks);
-
-      return specChanged || diskChanged;
-    },
-
-    restartVM() {
-      if (this.mode !== 'edit' || !this.value.isRunning) return;
-
-      const needsRestart = this._shouldPromptRestart(this.cloneVM, this.value);
-
-      // if no restart is needed (either no changes or only size changed)
-      if (!needsRestart) return;
+      // we won't show restart dialog in yaml page as we don't have a way to detect change in yaml editor.
+      // only check VM is changed in form page.
+      if (isEqual(oldVM, newVM)) {
+        return;
+      }
 
       return new Promise((resolve) => {
         this.isOpen = true;
@@ -490,7 +455,6 @@ export default {
       if (this.isSingle) {
         if (!this.value.spec.template.spec.hostname) {
           this.value.spec.template.spec['hostname'] = this.value.metadata.name;
-          this.spec.template.spec['hostname'] = this.value.metadata.name;
         }
       }
 
@@ -631,13 +595,9 @@ export default {
         :label="t('harvester.virtualMachine.detail.tabs.basics')"
       >
         <CpuMemory
-          class="mb-20"
           :cpu="cpu"
-          :max-cpu="maxCpu"
           :memory="memory"
-          :max-memory="maxMemory"
           :mode="mode"
-          :enable-hot-plug="cpuMemoryHotplugEnabled"
           @updateCpuMemory="updateCpuMemory"
         />
 
@@ -899,10 +859,7 @@ export default {
               />
             </div>
 
-            <div
-              v-if="!value.vmMachineTypeAutoFeatureEnabled"
-              class="col span-6"
-            >
+            <div class="col span-6">
               <LabeledSelect
                 v-model:value="machineType"
                 label-key="harvester.virtualMachine.input.MachineType"

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

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

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

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

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

@@ -1,42 +0,0 @@
-<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

@@ -154,19 +154,11 @@ harvester:
       nodeTimeout:
         label: Node Collection Timeout
         tooltip: Minutes allowed for collecting logs/configurations on nodes.<br/>See docs support-bundle-node-collection-timeout for detail.
-    hotplugVolume:
+    hotplug:
       success: 'Volume { diskName } is mounted to the virtual machine { vm }.'
       title: Add Volume
-    hotplugNic:
-      success: 'The settings have been saved, but the network interface {interfaceName} will be attached only after the virtual machine is migrated.'
-      title: Add Network Interface
-      vmNetwork: Virtual Machine Network
-      macAddress: MAC Address
-      macAddressTooltip: If left blank, the MAC address will be automatically generated.
-    cpuMemoryHotplug:
-      success: 'CPU and Memory are updated to the virtual machine { vm }.'
-      title: Edit CPU and Memory
-      maxResourcesMessage: 'You can increase the CPU to maximum { maxCpu }C and memory to maximum { maxMemory }.'
+    hotunplug:
+      success: 'Volume { name } is detached successfully.'
     snapshot:
       title: Take Snapshot
       name: Name
@@ -221,7 +213,6 @@ harvester:
     suspendSchedule: Suspend
     restoreExistingVM: Replace Existing
     migrate: Migrate
-    cpuAndMemoryHotplug: Edit CPU and Memory
     abortMigration: Abort Migration
     createTemplate: Generate Template
     enableMaintenance: Enable Maintenance Mode
@@ -230,8 +221,7 @@ harvester:
     disableCPUManager: Disable CPU Manager
     cordon: Cordon
     uncordon: Uncordon
-    addHotplugVolume: Add Volume
-    addHotplugNic: Hotplug Network Interface
+    addHotplug: Add Volume
     exportImage: Export Image
     viewlogs: View Logs
     cancelExpand: Cancel Expand
@@ -241,7 +231,6 @@ harvester:
     shutdown: Shut Down
     powerOn: Power On
     reboot: Reboot
-    reconnect: Reconnect
     forceStop: Force Stop
   formatters:
     hardwareResourceGauge:
@@ -277,7 +266,6 @@ harvester:
     cronExpression: Cron Expression
     retain: Retain
     scheduleType: Type
-    configuredProfiles: Configured Profiles
     maxFailure: Max Failure
     sourceVm: Source Virtual Machine
     vmSchedule: Virtual Machine Schedule
@@ -408,9 +396,7 @@ harvester:
       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.'
     hash:
       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}"
@@ -447,7 +433,6 @@ harvester:
       storage: Storage
       labels: Labels
       ksmtuned: Ksmtuned
-      hugepages: Hugepages
       seeder: Out-of-band Access
     detail:
       kvm:
@@ -520,20 +505,6 @@ harvester:
         fullScans: Full Scans
         stableNodeChains: Stable Node Chains
         stableNodeDups: Stable Node Dups
-    hugepages:
-      meminfo: Meminfo
-      transparent:
-        title: Transparent Hugepages <a href="{url}" target="_blank"><i class="icon icon-info" /></a>
-        enabled: Enabled
-        shmemEnabled: Shared Memory Enabled
-        defrag: Defragmentation
-      status:
-        anon: Anonymous Hugepages (bytes)
-        size: Default Hugepage Size (bytes)
-        total: Total Hugepages
-        free: Free Hugepages
-        rsvd: Reserved Hugepages
-        surp: Surplus Hugepages
     disk:
       add: Add Disk
       path:
@@ -598,20 +569,6 @@ harvester:
   virtualMachine:
     label: Virtual Machines
     osType: OS Type
-    hotplug:
-      title: Enable CPU and memory hotplug
-      tooltip: The default maximum CPU and maximum memory are {hotPlugTimes} times based on CPU and memory.
-      restartVMMessage: Restart action is required for the virtual machine configuration change to take effect
-    hotUnplug:
-      actionLabel: Detach
-      detachVolume:
-        title: 'Are you sure that you want to detach volume {name}?'
-        actionLabel: Detach Volume
-        success: 'Volume { name } is detached successfully.'
-      detachNIC:
-        title: 'Are you sure that you want to detach network interface {name}?'
-        actionLabel: Detach Network Interface
-        success: 'The settings have been saved, but the network interface {name} will be detached only after the virtual machine is migrated.'
     instance:
       singleInstance:
       multipleInstance:
@@ -643,6 +600,11 @@ harvester:
       title: 'Select the volume you want to delete:'
       deleteAll: Delete All
       tips: "Warn: The snapshots of the virtual machine will be deleted with virtual machine and the snapshots of volume will be deleted with volume."
+    unplug:
+      title: 'Are you sure that you want to detach volume {name} ?'
+      actionLabel: Detach
+      detachVolume:
+        Detach Volume
     restartTip: |-
       {restart, select,
         true {Restart}
@@ -752,9 +714,6 @@ harvester:
       invalidUser: Invalid Username.
     input:
       name: Name
-      cpu: CPU
-      maxCpu: Maximum CPU
-      maxMemory: Maximum Memory
       memory: Memory
       image: Image
       sshKey: SSHKey
@@ -863,7 +822,6 @@ harvester:
       snapshots: Snapshots
       datasource: Data Source
       details: Details
-      conditions: Conditions
     size: Size
     volumeMode: Volume Mode
     source: Source
@@ -922,8 +880,6 @@ harvester:
     checksumTip: Validate the image using the SHA512 checksum, if specified.
     tooltip:
       imported: Created automatically by the vm-import-controller
-    errors:
-      unsupportedBackend: 'Unsupported backend type: {backend}'
 
   vmTemplate:
     label: Templates
@@ -1059,87 +1015,6 @@ harvester:
         progress: Restore in progress
         complete: Restore completed
 
-  subnet:
-    cidrBlock:
-      tooltip: The subnet range in CIDR notation. Note that the CIDR blocks of different Subnets' within the same VPC cannot overlap.
-      label: CIDR Block
-      placeholder: e.g. 172.20.0.0/16
-    protocol:
-      label: Protocol
-    provider:
-      tooltip: Network provider for this Subnet. Must be one of the Virtual Machine Networks in OverlayNetwork type.
-      label: Provider
-    vpc:
-      label: Virtual Private Cloud
-    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.
-    allowSubnet:
-      label: Allow Subnets
-      tooltip: You can specify certain subnets which can communicate with this subnet.
-      addSubnet: Add Allow Subnet
-      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.
-      placeholder: single IP or 192.168.0.100..192.168.0.200
-
-    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
-      middle: here
-      suffix: to enable the add-on to successfully create VPC and subnet.
-    label: Virtual Private Cloud
-    noChild: There is no subnet defined in this Virtual Private Cloud.
-    createSubnet: Create Subnet
-    staticRoutes:
-      label: Static Routes
-      cidr:
-        label: CIDR
-        placeholder: e.g. 172.16.0.0/16
-      nextHopIP:
-        tooltip: The localConnectIP on the other end of the peering VPC.
-        label: Next Hop IP
-        placeholder: e.g. 169.254.0.2
-    vpcPeerings:
-      label: VPC Peerings
-      localConnectIP:
-        tooltip:  The designated IP address in CIDR notation of the VPC peering endpoint. Note that both IP addresses (for the VPC and the other VPC) should belong to the same subnet range and should not conflict with the cidrBlock in any existing subnets.
-        label: Local Connect IP
-        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:
@@ -1196,9 +1071,6 @@ harvester:
       publicCertificate: Public Certificate
       privateKey: Private Key
       ca: CA
-    rancherCluster:
-      kubeConfig: Rancher KubeConfig
-      removeUpstreamClusterWhenNamespaceIsDeleted: Remove Upstream Cluster When Namespace Is Deleted
     storageNetwork:
       range:
         placeholder: e.g. 172.16.0.0/24
@@ -1207,28 +1079,14 @@ harvester:
       clusterNetwork: Cluster Network
       vlan: VLAN ID
       exclude:
-        label: Exclude IPs
-        placeholder: CIDR format, e.g. 172.16.0.10/32
+        label: Exclude
+        placeholder: e.g. 172.16.0.1/32
         invalid: '"Exclude list" is invalid.'
         addIp: Add Exclude IP
       warning: 'WARNING: <br/> Any change to storage-network requires shutting down all 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>.'
     vmForceDeletionPolicy:
       period: Period
-    vmMigrationNetwork:
-      parseError: "Failed to parse existing configuration."
-      fetchError: "Failed to load required network resources: {error}. Please refresh the page or try again later."
-      clusterNetwork: Cluster Network
-      vlan: VLAN ID
-      range:
-        placeholder: e.g. 172.16.0.0/24
-        label: IP Range
-        invalid: '"Range" is invalid.'
-      exclude:
-        label: Excluded IPs
-        placeholder: e.g. 172.16.0.1/32
-        invalid: '"Exclude list" is invalid.'
-        addButton: Add Exclude IP
     ratio : Ratio
     autoRotateRKE2Certs:
       expiringInHours: Expiring in
@@ -1242,11 +1100,6 @@ harvester:
       provisioner: Provisioner
       volumeSnapshotClassName: Volume Snapshot Class Name
       backupVolumeSnapshotClassName: Backup Volume Snapshot Class Name
-    csiOnlineExpandValidation:
-      provisioner: Provisioner
-      value: Value
-      invalidJsonFormat: "Configuration value is not a valid JSON format: {error}"
-      failedToLoadDrivers: "Failed to load CSI drivers. Error: {error}"
     containerdRegistry:
       mirrors:
         mirrors: Mirrors
@@ -1294,31 +1147,10 @@ harvester:
         retention: How long to retain metrics
         retentionSize: Maximum size of metrics
     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
-        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.
-    kubevirtMigration:
-      parseError: "Failed to parse configuration: {error}"
-      parallelMigrationsPerCluster: "Parallel Migrations Per Cluster"
-      parallelOutboundMigrationsPerNode: "Parallel Outbound Migrations Per Node"
-      bandwidthPerMigration: "Bandwidth Per Migration"
-      bandwidthPerMigrationTooltip: '0 is KubeVirt default, representing unlimited bandwidth'
-      completionTimeoutPerGiB: "Completion Timeout Per GiB"
-      progressTimeout: "Progress Timeout"
-      allowAutoConverge: "Allow Auto Converge"
-      allowPostCopy: "Allow Post Copy"
-      unsafeMigrationOverride: "Unsafe Migration Override"
-      allowWorkloadDisruption: "Allow Workload Disruption"
-      disableTLS: "Disable TLS"
-      matchSELinuxLevelOnMigration: "Match SELinux Level On Migration"
-
   cloudTemplate:
     label: Cloud Configuration Templates
     templateType: Template Type
@@ -1463,32 +1295,6 @@ harvester:
     allowedTopologies:
       title: Allowed Topologies
       tooltip: Allowed Topologies helps scheduling virtual machines on hosts which match all of below expressions.
-    internal:
-      label: Internal Storage Class
-      cannotDeleteTooltip: Internal storage class volumes cannot be deleted
-      cannotDeleteOrDefaultTooltip: Internal storage classes cannot be deleted or set as default
-    cdiSettings:
-      label: CDI Settings
-      volumeModeAccessModes:
-        label: Volume Mode / Access Modes
-        tooltip: Specifies the default volume mode and access modes.
-        add: Add
-        volumeMode: Volume Mode
-        accessModes:
-          label: Access Modes
-      volumeSnapshotClass:
-        label: Volume Snapshot Class
-        tooltip: Sets the Volume Snapshot Class name to be used when taking snapshots of PVCs under this StorageClass.
-      cloneStrategy:
-        label: Clone Strategy
-        tooltip: Defines the clone strategy to use for volumes created with this StorageClass.
-        copy: Copy
-        snapshot: Snapshot
-        csiClone: CSI Clone
-      fileSystemOverhead:
-        label: File System Overhead
-        tooltip: Specifies the percentage of filesystem overhead to consider when calculating PVC size.
-        placeholder: e.g. 0.05 (up to 3 decimal places, between 0 and 1)
 
   vlanConfig:
     title: Network Configuration
@@ -1534,14 +1340,6 @@ harvester:
   vlanStatus:
     vlanConfig:
       label: Network Configuration
-      l2VlanMode:
-        access: Access
-        trunk: Trunk
-        label: Mode
-      vlanTrunk:
-        minId: Minimum VLAN ID
-        maxId: Maximum VLAN ID
-        add: Add VLAN Trunk
 
   clusterNetwork:
     title: Cluster Network Configuration
@@ -1569,7 +1367,6 @@ harvester:
       'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
       'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
       'harvester-csi-driver-lvm': harvester-csi-driver-lvm is an add-on allowing users to create PVC through the LVM with local devices.
-      'descheduler': 'The virtual machine auto balance optimizes workload scheduling by evicting pods that are not optimally placed according to administrator-defined policies.'
     vmImport:
       titles:
         basic: Basic
@@ -1716,26 +1513,6 @@ harvester:
       middle: here
       suffix: to enable it to manage your SR-IOV GPU devices.
 
-  migconfiguration:
-    label: vGPU MIG Configurations
-    infoBanner: To configure the MIG configuration, please disable it first and re-enable after editing the configuration.
-    profileSpec: Profile Specs
-    profileStatus: Profile Status
-    tableHeaders:
-      profileName: Profile Name
-      total: Total
-      vGPUID: vGPU ID
-      available: Available
-      requested: Requested
-    requested: Requested
-    available: Available
-    total: Total
-    vGPUID: vGPU ID
-    goSriovGPU:
-      prefix: Please enable the supported GPU devices in
-      middle: SR-IOV GPU Devices
-      suffix: page to manage the vGPU MIG configurations.
-
   vgpu:
     label: vGPU Devices
     noPermission: Please contact system administrator to add Harvester add-ons first.
@@ -1822,14 +1599,14 @@ advancedSettings:
     'harv-backup-target': Custom backup target to store virtual machine backups.
     'branding': Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos, and color scheme.
     'harv-csi-driver-config': Configure additional information for CSI drivers.
-    'harv-csi-online-expand-validation': Allow online volume expansion for specific CSI drivers.
     'harv-containerd-registry': Containerd Registry Configuration to connect private registries.
     'harv-log-level': Configure Harvester server log level. Defaults to Info.
     '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. 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-source': Configure how to load the UI source.
     'harv-ui-index': 'HTML index location for the UI.'
+    'harv-ui-plugin-index': 'JS index location for the Harvester plugin UI.'
     'harv-cluster-registration-url': Registration URL for multi-cluster management.
     'harv-http-proxy': 'HTTP proxy for Harvester to access external services.'
     'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
@@ -1851,10 +1628,6 @@ advancedSettings:
     'harv-longhorn-v2-data-engine-enabled': 'Enable the Longhorn V2 data engine. Default is false. <ul><li>Changing this setting will restart RKE2 on all nodes. This will not affect running VM workloads.</li><li>If you see "not enough hugepages-2Mi capacity" errors when enabling this setting, wait a minute for the error to clear. If the error remains, reboot the affected node.</li></ul>'
     'harv-additional-guest-memory-overhead-ratio': 'The ratio for kubevirt to adjust the VM overhead memory. The value could be zero, empty value or floating number between 1.0 and 10.0, default to 1.5.'
     'harv-upgrade-config': 'Configure image preloading and VM restore options for upgrades. See related fields in <a href="{url}" target="_blank" rel="noopener">settings/upgrade-config</a>'
-    'harv-vm-migration-network': 'Segregated network for VM migration traffic.'
-    'harv-rancher-cluster': 'Configure Rancher cluster integration settings for guest cluster management.'
-    'harv-max-hotplug-ratio': 'The ratio for kubevirt to limit the maximum CPU and memory that can be hotplugged to a VM. The value could be an integer between 1 and 20, default to 4.'
-    'harv-kubevirt-migration': 'Configure cluster-wide KubeVirt live migration parameters.'
 
 typeLabel:
   kubevirt.io.virtualmachine: |-
@@ -1912,16 +1685,6 @@ typeLabel:
       one { Virtual Machine Backup }
       other { Virtual Machine Backups }
     }
-  kubeovn.io.vpc: |-
-    {count, plural,
-      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 }
@@ -2010,12 +1773,6 @@ typeLabel:
       other { vGPU Devices }
     }
 
-  devices.harvesterhci.io.migconfiguration: |-
-    {count, plural,
-      one { vGPU MIG Configuration }
-      other { vGPU  MIG Configurations }
-    }
-
   harvesterhci.io.secret: |-
     {count, plural,
       one { Secret }

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

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

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

@@ -83,34 +83,6 @@ export default {
       :rows="rows"
       :schema="schema"
       :headers="headers"
-    >
-      <template #cell:name="{ row }">
-        <td>
-          <div>
-            <router-link
-              v-if="row?.detailLocation"
-              :to="row.detailLocation"
-            >
-              {{ row.nameDisplay }}
-              <i
-                v-if="row.isInternalStorageClass && typeof row.isInternalStorageClass === 'function' ? row.isInternalStorageClass() : false"
-                v-clean-tooltip="t('harvester.storage.internal.cannotDeleteOrDefaultTooltip')"
-                class="icon icon-info text-info"
-                style="margin-left: 0.4em;"
-              />
-            </router-link>
-            <span v-else>
-              {{ row.nameDisplay }}
-              <i
-                v-if="row.isInternalStorageClass && typeof row.isInternalStorageClass === 'function' ? row.isInternalStorageClass() : false"
-                v-clean-tooltip="t('harvester.storage.internal.cannotDeleteOrDefaultTooltip')"
-                class="icon icon-info text-info"
-                style="margin-left: 0.4em;"
-              />
-            </span>
-          </div>
-        </td>
-      </template>
-    </ResourceTable>
+    />
   </div>
 </template>

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

@@ -4,7 +4,7 @@ import Loading from '@shell/components/Loading';
 import MessageLink from '@shell/components/MessageLink';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import ResourceTable from '@shell/components/ResourceTable';
-import { isBackupTargetSettingEmpty } from '../utils/setting';
+
 import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 import FilterVMSchedule from '../components/FilterVMSchedule';
 import { HCI } from '../types';
@@ -39,7 +39,7 @@ export default {
     this.settings = hash.settings;
     if (this.$store.getters[`${ inStore }/schemaFor`](HCI.SETTING)) {
       const backupTargetResource = hash.settings.find( (O) => O.id === 'backup-target');
-      const isEmpty = isBackupTargetSettingEmpty(backupTargetResource);
+      const isEmpty = this.getBackupTargetValueIsEmpty(backupTargetResource);
 
       if (backupTargetResource && !isEmpty) {
         this.testConnect();
@@ -78,6 +78,20 @@ 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;
     },
@@ -169,9 +183,11 @@ export default {
     backupTargetResource() {
       return this.settings.find((O) => O.id === 'backup-target');
     },
+
     isEmptyValue() {
-      return isBackupTargetSettingEmpty(this.backupTargetResource);
+      return this.getBackupTargetValueIsEmpty(this.backupTargetResource);
     },
+
     canUpdate() {
       return this?.backupTargetResource?.canUpdate;
     },

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

@@ -3,8 +3,6 @@ import ResourceTable from '@shell/components/ResourceTable';
 import { Banner } from '@components/Banner';
 import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
 import FilterLabel from '../components/FilterLabel';
-import { HCI as HCI_ANNOTATIONS } from '../config/labels-annotations';
-import { isInternalStorageClass } from '../utils/storage-class';
 
 export default {
   name: 'ListHarvesterImage',
@@ -55,13 +53,6 @@ export default {
 
       return base;
     },
-
-    isInternalStorageClass(row) {
-      const name = row?.spec?.targetStorageClassName ||
-                   row?.metadata?.annotations?.[HCI_ANNOTATIONS.STORAGE_CLASS];
-
-      return isInternalStorageClass(name);
-    },
   }
 };
 </script>

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

@@ -8,7 +8,6 @@ import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 import HarvesterVolumeState from '../formatters/HarvesterVolumeState';
 import { allSettled } from '../utils/promise';
 import { HCI, VOLUME_SNAPSHOT } from '../types';
-import { INTERNAL_STORAGE_CLASS } from '../config/types';
 
 const schema = {
   id:         HCI.VOLUME,
@@ -131,10 +130,6 @@ export default {
 
     getVMName(row) {
       return row.attachVM?.metadata?.name || '';
-    },
-
-    isInternalStorageClass(storageClassName) {
-      return this.$store.getters['type-map/labelFor'](INTERNAL_STORAGE_CLASS, storageClassName);
     }
   },
 
@@ -175,7 +170,7 @@ export default {
         </router-link>
       </div>
     </template>
-    <template #col:name="{ row }">
+    <template #col:name="{row}">
       <td>
         <span>
           <router-link

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

@@ -1,285 +0,0 @@
-<script>
-import Loading from '@shell/components/Loading';
-import ResourceTable from '@shell/components/ResourceTable';
-import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
-import { NAME, AGE, NAMESPACE, STATE } from '@shell/config/table-headers';
-import { PROVIDER, PROTOCOL, CIDR_BLOCK } from '@pkg/harvester/config/table-headers';
-import { HCI } from '../types';
-import { VPC } from '../config/query-params';
-import { ADD_ONS } from '../config/harvester-map';
-import { allHash } from '@shell/utils/promise';
-import MessageLink from '@shell/components/MessageLink';
-import Banner from '@components/Banner/Banner.vue';
-
-export default {
-  name: 'HarvesterVPC',
-
-  components: {
-    ResourceTable,
-    Loading,
-    MessageLink,
-    Banner
-  },
-
-  inheritAttrs: false,
-
-  props: {
-    schema: {
-      type:     Object,
-      required: true,
-    }
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-    const hash = await allHash({ addons: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }) });
-
-    this.enabledKubeOvnAddon = hash.addons.find((addon) => addon.name === ADD_ONS.KUBEOVN_OPERATOR)?.spec?.enabled === true;
-
-    if (this.enabledKubeOvnAddon) {
-      try {
-        await allHash({
-          rows: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SUBNET }),
-          vpcs: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VPC }),
-        });
-        this.$store.dispatch('type-map/configureType', { match: HCI.SUBNET, isCreatable: this.enabledKubeOvnAddon });
-      } catch (e) {
-        // eslint-disable-next-line no-console
-        console.error('Error fetching VPC and Subnet data:', e);
-      }
-    }
-  },
-
-  data() {
-    return {
-      HCI,
-      hasBothSchema:       false,
-      enabledKubeOvnAddon: false,
-      to:                  `${ HCI.ADD_ONS }/kube-system/${ ADD_ONS.KUBEOVN_OPERATOR }?mode=edit`
-    };
-  },
-
-  computed: {
-    headers() {
-      return [
-        STATE,
-        NAME,
-        NAMESPACE,
-        CIDR_BLOCK,
-        PROTOCOL,
-        PROVIDER,
-        AGE
-      ];
-    },
-
-    rows() {
-      return this.$store.getters[`harvester/all`](HCI.SUBNET) || [];
-    },
-
-    vpcWithoutSubnets() {
-      const vpcs = this.$store.getters[`harvester/all`](HCI.VPC) || [];
-
-      const out = vpcs.map((v) => {
-        const hasChild = v.status?.subnets?.length > 0 || false;
-
-        return {
-          ...v,
-          hasChild
-        };
-      });
-
-      return out;
-    },
-
-    isSubnetCreatable() {
-      return (this.subnetSchema?.collectionMethods || []).includes('POST');
-    },
-
-    rowsWithFakeVpcs() {
-      const fakeRows = this.vpcWithoutSubnets.map((vpc) => {
-        return {
-          groupByLabel:          vpc.id,
-          isFake:                true,
-          mainRowKey:            vpc.id,
-          nameDisplay:           vpc.id,
-          groupByVpc:            vpc.id,
-          availableActions:      []
-        };
-      });
-
-      return [...this.rows, ...fakeRows];
-    },
-
-    createVPCLocation() {
-      const location = {
-        name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
-        params: {
-          product:  HARVESTER_PRODUCT,
-          resource: HCI.VPC,
-        },
-      };
-
-      return location;
-    },
-
-    vpcSchema() {
-      return this.$store.getters[`harvester/schemaFor`](HCI.VPC);
-    },
-
-    subnetSchema() {
-      return this.$store.getters[`harvester/schemaFor`](HCI.SUBNET);
-    },
-  },
-  methods: {
-    groupLabel(group) {
-      return `${ this.t('harvester.vpc.label') }: ${ group.key }`;
-    },
-
-    slotName(vpc) {
-      return `main-row:${ vpc }`;
-    },
-
-    createSubnetLocation(group) {
-      const vpc = group.key;
-
-      const location = {
-        name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
-        params: {
-          product:  HARVESTER_PRODUCT,
-          resource: HCI.SUBNET,
-        },
-      };
-
-      location.query = { [VPC]: vpc };
-
-      return location;
-    },
-
-    showVpcAction(event, group) {
-      const vpc = group.key;
-
-      const resource = this.$store.getters[`harvester/byId`](HCI.VPC, vpc);
-
-      this.$store.commit(`action-menu/show`, {
-        resources: [resource],
-        elem:      event.target
-      });
-    },
-  },
-
-  typeDisplay() {
-    return this.t('harvester.vpc.label');
-  }
-};
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <div v-else-if="!enabledKubeOvnAddon">
-    <Banner color="warning">
-      <MessageLink
-        :to="to"
-        prefix-label="harvester.vpc.noAddonEnabled.prefix"
-        middle-label="harvester.vpc.noAddonEnabled.middle"
-        suffix-label="harvester.vpc.noAddonEnabled.suffix"
-      />
-    </Banner>
-  </div>
-  <div v-else>
-    <Masthead
-      :schema="vpcSchema"
-      :type-display="t('harvester.vpc.label')"
-      :resource="HCI.VPC"
-      :create-location="createVPCLocation"
-      :create-button-label="t('harvester.clusterNetwork.create.button.label')"
-    />
-    <ResourceTable
-      :rows="rowsWithFakeVpcs"
-      :headers="headers"
-      :schema="subnetSchema"
-      :groupable="true"
-      group-by="groupByVpc"
-    >
-      <template #header-middle>
-        <div />
-      </template>
-      <template #group-by="{group}">
-        <div class="group-bar">
-          <div class="group-tab">
-            <span>
-              {{ groupLabel(group) }}
-            </span>
-          </div>
-          <div class="right">
-            <router-link
-              v-if="isSubnetCreatable"
-              class="btn btn-sm role-secondary mr-5"
-              :to="createSubnetLocation(group)"
-            >
-              {{ t('harvester.vpc.createSubnet') }}
-            </router-link>
-            <button
-              type="button"
-              class="btn btn-sm role-multi-action actions mr-10"
-              @click="showVpcAction($event, group)"
-            >
-              <i class="icon icon-actions" />
-            </button>
-          </div>
-        </div>
-      </template>
-      <template
-        v-for="(vpc) in vpcWithoutSubnets"
-        :key="vpc.id"
-        v-slot:[slotName(vpc.id)]
-      >
-        <tr
-          v-show="!vpc.hasChild"
-          class="main-row"
-        >
-          <td
-            class="empty text-center"
-            colspan="12"
-          >
-            {{ t('harvester.vpc.noChild') }}
-          </td>
-        </tr>
-      </template>
-    </ResourceTable>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.state {
-  display: flex;
-  justify-content: space-between;
-
-  .icon-warning {
-    margin-top: 2px;
-  }
-}
-.group-bar {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-
-  .right {
-    margin-top: 5px;
-    margin-bottom: 3px;
-  }
-
-  .group-tab {
-    &, &::after {
-        height: 50px;
-    }
-
-    &::after {
-        right: -20px;
-    }
-
-    SPAN {
-      color: var(--body-text) !important;
-    }
-  }
-}
-</style>

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

@@ -22,8 +22,8 @@ export const VM_HEADERS = [
   {
     name:        'CPU',
     label:       'CPU',
-    sort:        ['displayCPU'],
-    value:       'displayCPU',
+    sort:        ['spec.template.spec.domain.cpu.cores'],
+    value:       'spec.template.spec.domain.cpu.cores',
     align:       'center',
     dashIfEmpty: true,
   },
@@ -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, opt: { force: true } }),
+      vms:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
       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/list/network.harvesterhci.io.clusternetwork.vue

@@ -2,10 +2,12 @@
 import Loading from '@shell/components/Loading';
 import ResourceTable from '@shell/components/ResourceTable';
 import Masthead from '@shell/components/ResourceList/Masthead';
+
 import { allHash } from '@shell/utils/promise';
 import { STATE, AGE, NAME } from '@shell/config/table-headers';
 import { mapPref, GROUP_RESOURCES } from '@shell/store/prefs';
 import { NODE } from '@shell/config/types';
+
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
 import { CLUSTER_NETWORK } from '../config/query-params';
 import { HCI } from '../types';
@@ -36,6 +38,7 @@ export default {
 
   computed: {
     groupPreference: mapPref(GROUP_RESOURCES),
+
     headers() {
       return [
         STATE,
@@ -206,6 +209,7 @@ export default {
                 {{ groupLabel(group) }}
               </span>
             </div>
+
             <div class="right">
               <router-link
                 v-if="isClusterNetworkCreatable && group.key !== 'mgmt'"

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

@@ -3,9 +3,10 @@ import jsyaml from 'js-yaml';
 import isEqual from 'lodash/isEqual';
 import isEmpty from 'lodash/isEmpty';
 import difference from 'lodash/difference';
+
 import { sortBy } from '@shell/utils/sort';
 import { set } from '@shell/utils/object';
-import { getVmCPUMemoryValues } from '../../utils/cpuMemory';
+
 import { allHash } from '@shell/utils/promise';
 import { randomStr } from '@shell/utils/string';
 import { base64Decode } from '@shell/utils/crypto';
@@ -142,7 +143,6 @@ export default {
       showYaml:                      false,
       spec:                          null,
       osType:                        'linux',
-      useTemplate:                   false,
       sshKey:                        [],
       maintenanceStrategies,
       maintenanceStrategy:           'Migrate',
@@ -164,9 +164,6 @@ export default {
       deleteAgent:                   true,
       memory:                        null,
       cpu:                           '',
-      maxMemory:                     null,
-      maxCpu:                        '',
-      cpuMemoryHotplugEnabled:       false,
       reservedMemory:                null,
       accessCredentials:             [],
       efiEnabled:                    false,
@@ -274,7 +271,7 @@ export default {
 
     needNewSecret() {
       // When creating a template it is always necessary to create a new secret.
-      return this.isCreate || this.showYaml ? false : this.resourceType === HCI.VM_VERSION;
+      return this.showYaml ? false : this.resourceType === HCI.VM_VERSION || this.isCreate;
     },
 
     defaultTerminationSetting() {
@@ -300,11 +297,9 @@ export default {
   async created() {
     await this.$store.dispatch(`${ this.inStore }/findAll`, { type: SECRET });
 
-    if (!this.value.vmMachineTypeAutoFeatureEnabled) {
+    if (this.value.vmMachineTypesFeatureEnabled) {
       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;
@@ -353,11 +348,8 @@ export default {
       const runStrategy = spec.runStrategy || 'RerunOnFailure';
       const machineType = spec.template.spec.domain?.machine?.type || this.machineTypes[0];
 
-      const {
-        cpu, memory, maxCpu, maxMemory, isHotplugEnabled
-      } = getVmCPUMemoryValues(vm);
-      const cpuMemoryHotplugEnabled = isHotplugEnabled;
-
+      const cpu = spec.template.spec.domain?.cpu?.cores;
+      const memory = spec.template.spec.domain.resources.limits.memory;
       const reservedMemory = vm.metadata?.annotations?.[HCI_ANNOTATIONS.VM_RESERVED_MEMORY];
       const terminationGracePeriodSeconds = spec.template.spec?.terminationGracePeriodSeconds || this.defaultTerminationSetting;
 
@@ -417,9 +409,6 @@ export default {
 
       this['cpu'] = cpu;
       this['memory'] = memory;
-      this['maxCpu'] = maxCpu;
-      this['maxMemory'] = maxMemory;
-      this['cpuMemoryHotplugEnabled'] = cpuMemoryHotplugEnabled;
       this['reservedMemory'] = reservedMemory;
       this['machineType'] = machineType;
       this['terminationGracePeriodSeconds'] = terminationGracePeriodSeconds;
@@ -644,26 +633,20 @@ export default {
         this.spec.template.spec.domain.machine['type'] = this.machineType;
       }
 
-      this.setCPUAndMemory();
-      // update terminationGracePeriodSeconds
+      this.spec.template.spec.domain.cpu.cores = this.cpu;
+      this.spec.template.spec.domain.resources.limits.cpu = this.cpu ? this.cpu.toString() : this.cpu;
+      this.spec.template.spec.domain.resources.limits.memory = this.memory;
       this.spec.template.spec.terminationGracePeriodSeconds = this.terminationGracePeriodSeconds;
 
+      // parse reserved memory
       const vm = this.resourceType === HCI.VM ? this.value : this.value.spec.vm;
 
-      // parse reserved memory
       if (!this.reservedMemory) {
         delete vm.metadata.annotations[HCI_ANNOTATIONS.VM_RESERVED_MEMORY];
       } else {
         vm.metadata.annotations[HCI_ANNOTATIONS.VM_RESERVED_MEMORY] = this.reservedMemory;
       }
 
-      // add or remove cpu memory hotplug annotation
-      if (this.cpuMemoryHotplugEnabled) {
-        vm.metadata.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] = this.cpuMemoryHotplugEnabled.toString();
-      } else {
-        delete vm.metadata.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG];
-      }
-
       if (this.maintenanceStrategy === 'Migrate') {
         delete vm.metadata.labels[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY];
       } else {
@@ -671,45 +654,24 @@ export default {
       }
     },
 
-    setCPUAndMemory() {
-      if (this.cpuMemoryHotplugEnabled) {
-        // set CPU
-        this.spec.template.spec.domain.cpu.sockets = this.cpu;
-        this.spec.template.spec.domain.cpu.cores = 1;
-
-        // set max CPU
-        set(this.spec.template.spec, 'domain.cpu.maxSockets', this.maxCpu);
-        // domain.resources.limits.cpu and memory are defined by k8s which requires string values
-        // see https://kubernetes.io/docs/tasks/configure-pod-container/assign-cpu-resource/
-        set(this.spec.template.spec, 'domain.resources.limits.cpu', this.maxCpu?.toString());
-
-        // set memory
-        set(this.spec.template.spec, 'domain.memory.guest', this.memory);
-
-        // set max memory
-        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.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?.memory?.maxGuest) {
-          delete this.spec.template.spec.domain.memory.maxGuest;
-        }
-      }
-    },
-
     parseDiskRows(disk) {
       const disks = [];
       const volumes = [];
-      const diskNameLabels = [];
+      const diskNameLables = [];
       const volumeClaimTemplates = [];
 
       disk.forEach( (R, index) => {
         const prefixName = this.value.metadata?.name || '';
-        const dataVolumeName = this.parseDataVolumeName(R, prefixName);
+
+        let dataVolumeName = '';
+
+        if (R.source === SOURCE_TYPE.ATTACH_VOLUME) {
+          dataVolumeName = R.volumeName;
+        } else if (this.isClone || !this.hasCreateVolumes.includes(R.realName)) {
+          dataVolumeName = `${ prefixName }-${ R.name }-${ randomStr(5).toLowerCase() }`;
+        } else {
+          dataVolumeName = R.realName;
+        }
 
         const _disk = this.parseDisk(R, index);
         const _volume = this.parseVolume(R, dataVolumeName);
@@ -717,7 +679,7 @@ export default {
 
         disks.push(_disk);
         volumes.push(_volume);
-        diskNameLabels.push(dataVolumeName);
+        diskNameLables.push(dataVolumeName);
 
         if (R.source !== SOURCE_TYPE.CONTAINER) {
           volumeClaimTemplates.push(_dataVolumeTemplate);
@@ -758,9 +720,6 @@ export default {
         }
       }
 
-      const specDisks = this.spec?.template?.spec?.domain?.devices?.disks;
-      const mergedDisks = this.mergeDeviceList(specDisks, disks);
-
       let spec = {
         ...this.spec,
         runStrategy: this.runStrategy,
@@ -783,7 +742,7 @@ export default {
               ...this.spec.template?.spec?.domain,
               devices: {
                 ...this.spec.template?.spec?.domain?.devices,
-                disks: mergedDisks,
+                disks,
               },
             },
             volumes,
@@ -882,16 +841,13 @@ 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: mergedInterfaces,
+            interfaces,
           },
         },
         networks
@@ -996,26 +952,9 @@ export default {
       this['sshKey'] = neu;
     },
 
-    updateCpuMemory(cpu, memory, maxCpu = '', maxMemory = null, cpuMemoryHotplugEnabled = false) {
+    updateCpuMemory(cpu, memory) {
       this['cpu'] = cpu;
       this['memory'] = memory;
-      this['maxCpu'] = maxCpu;
-      this['maxMemory'] = maxMemory;
-      this['cpuMemoryHotplugEnabled'] = cpuMemoryHotplugEnabled;
-    },
-
-    parseDataVolumeName(R, prefixName) {
-      let dataVolumeName = '';
-
-      if (R.source === SOURCE_TYPE.ATTACH_VOLUME) {
-        dataVolumeName = R.volumeName;
-      } else if (this.isClone || !this.hasCreateVolumes.includes(R.realName)) {
-        dataVolumeName = `${ prefixName }-${ R.name }-${ randomStr(5).toLowerCase() }`;
-      } else {
-        dataVolumeName = R.realName;
-      }
-
-      return dataVolumeName;
     },
 
     parseDisk(R, index) {
@@ -1048,9 +987,7 @@ export default {
     },
 
     parseVolumeClaimTemplate(R, dataVolumeName) {
-      const sizeString = String(R.size);
-
-      if (!(sizeString.includes('Gi') || sizeString.includes('Ti')) && R.size) {
+      if (!String(R.size).includes('Gi') && R.size) {
         R.size = `${ R.size }${ GIBIBYTE }`;
       }
 
@@ -1541,49 +1478,6 @@ 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();
@@ -1643,8 +1537,7 @@ export default {
 
     secretRef: {
       handler(secret) {
-        // we should not inherit the secret if it's from VM template.
-        if (secret && this.resourceType !== HCI.BACKUP && !this.useTemplate) {
+        if (secret && this.resourceType !== HCI.BACKUP) {
           this.secretName = secret?.metadata.name;
         }
       },

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

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

pkg/harvester/models/harvester.js

@@ -1,19 +1,17 @@
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { VIEW_IN_API, DEV } from '@shell/store/prefs';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
-import { HARVESTER_CRD_MAP } from '../config/harvester-map';
 
 export default class HarvesterResource extends SteveModel {
   get listLocation() {
     const name = this.harvesterResourcesInExplorer ? 'c-cluster-product-resource' : `${ HARVESTER_PRODUCT }-c-cluster-resource`;
-    const resource = HARVESTER_CRD_MAP[this.type] || this.type;
 
     return this.$rootGetters['type-map/optionsFor'](this.type).customRoute || {
       name,
       params: {
         product:  this.$rootGetters['productId'],
         cluster:  this.$rootGetters['clusterId'],
-        resource
+        resource: this.type,
       },
     };
   }

pkg/harvester/models/harvester/configmap.js

@@ -1,4 +1,3 @@
-// This file is Cloud Configuration Templates page model
 import { clone } from '@shell/utils/object';
 import { HCI } from '../../types';
 import HarvesterResource from '../harvester';

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

@@ -12,7 +12,7 @@ export default class HarvesterNetworkAttachmentDef extends NetworkAttachmentDef
       params: {
         product:  HARVESTER_PRODUCT,
         cluster:  this.$rootGetters['clusterId'],
-        resource: HCI.NETWORK_ATTACHMENT,
+        resource: this.type,
       },
     };
   }

pkg/harvester/models/harvester/logging.banzaicloud.io.clusterflow.js

@@ -9,19 +9,6 @@ export default class HciClusterflow extends HarvesterFlow {
     return this.$rootGetters['harvester/all'](LOGGING.CLUSTER_OUTPUT) || [];
   }
 
-  get listLocation() {
-    const listLocation = clone(super.listLocation);
-
-    listLocation.name = this.harvesterResourcesInExplorer ? 'c-cluster-product-resource' : `${ HARVESTER_PRODUCT }-c-cluster-resource`;
-    listLocation.params.resource = HCI.CLUSTER_FLOW;
-
-    return listLocation;
-  }
-
-  get harvesterResourcesInExplorer() {
-    return this.$rootGetters['productId'] !== HARVESTER_PRODUCT;
-  }
-
   get _detailLocation() {
     const schema = this.$getters['schemaFor'](this.type);
 

pkg/harvester/models/harvester/logging.banzaicloud.io.clusteroutput.js

@@ -21,19 +21,6 @@ export default class HciClusteroutput extends LogOutput {
     };
   }
 
-  get listLocation() {
-    const listLocation = clone(super.listLocation);
-
-    listLocation.name = this.harvesterResourcesInExplorer ? 'c-cluster-product-resource' : `${ HARVESTER_PRODUCT }-c-cluster-resource`;
-    listLocation.params.resource = HCI.CLUSTER_OUTPUT;
-
-    return listLocation;
-  }
-
-  get harvesterResourcesInExplorer() {
-    return this.$rootGetters['productId'] !== HARVESTER_PRODUCT;
-  }
-
   get detailLocation() {
     const detailLocation = clone(this._detailLocation);
 

pkg/harvester/models/harvester/logging.banzaicloud.io.flow.js

@@ -14,19 +14,6 @@ export default class HarvesterLogFlow extends Flow {
     return this.$rootGetters['harvester/all'](LOGGING.CLUSTER_OUTPUT) || [];
   }
 
-  get listLocation() {
-    const listLocation = clone(super.listLocation);
-
-    listLocation.name = this.harvesterResourcesInExplorer ? 'c-cluster-product-resource' : `${ HARVESTER_PRODUCT }-c-cluster-resource`;
-    listLocation.params.resource = HCI.FLOW;
-
-    return listLocation;
-  }
-
-  get harvesterResourcesInExplorer() {
-    return this.$rootGetters['productId'] !== HARVESTER_PRODUCT;
-  }
-
   get _detailLocation() {
     const schema = this.$getters['schemaFor'](this.type);