deps: update dependency helm to v3.22.0

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/actions/setup/action.yaml

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

.github/renovate.json

@@ -7,8 +7,7 @@
   ],
   "baseBranches": [
     "main",
-    "release-harvester-v1.7",
-    "release-harvester-v1.8"
+    "/^release-harvester-v\\d+\\.\\d+$/"
   ],
   "automergeMajor": false,
   "semanticCommits": "enabled",
@@ -34,12 +33,14 @@
     {
       "matchUpdateTypes": ["minor"],
       "groupName": "minor dependencies",
+      "minimumReleaseAge": "7 days",
       "labels": ["minor-update"],
       "reviewers": ["a110605", "houhoucoop"]
     },
     {
       "matchUpdateTypes": ["patch", "digest"],
       "automerge": true,
+      "minimumReleaseAge": "7 days",
       "groupName": "patch digest dependencies",
       "labels": ["patch-update", "automerge"]
     }

.github/workflows/auto-assign-reviewer.yaml

@@ -12,6 +12,6 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: rancher/gh-issue-mgr/auto-assign-action@main
+      - uses: rancher/gh-issue-mgr/auto-assign-action@b70f0bdf12a03e5e3f33e4f92ccb6c89deb3ebd9 # main
         with:
-          configuration-path: .github/auto-assign-config.yaml
+          configuration-path: .github/auto-assign-config.yaml

.github/workflows/backport-label.yaml

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

.github/workflows/backport-request.yaml

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

.github/workflows/build-and-publish-catalog-on-release.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Check package version
         env:

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

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

.github/workflows/build-extension-catalog.yml

@@ -27,14 +27,14 @@ jobs:
       build-status: ${{ job.status }}
     steps:
       - name: Read Secrets
-        uses: rancher-eio/read-vault-secrets@main
+        uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
         with:
           secrets: |
             secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials username | DOCKER_USERNAME ;
             secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD ;
       
       - name: Checkout repository (normal flow)
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Enable Corepack
         run: corepack enable
@@ -45,18 +45,18 @@ jobs:
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
         with:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
 
       - name: Setup Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
         with:
-          version: v3.8.0
+          version: v3.22.0
 
       - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: '20'
           cache: yarn
@@ -67,4 +67,4 @@ jobs:
       - name: Build and push UI image
         run: |
           publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}"
-          $publish
+          $publish

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

@@ -13,7 +13,7 @@ jobs:
       target_branch: ${{ steps.get-version.outputs.target_branch }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Determine target branch
         id: get-version
@@ -44,7 +44,7 @@ jobs:
       version: ${{ steps.get_version.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Extract version from package.json
         id: get_version
@@ -62,7 +62,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup environment
         run: |
@@ -70,16 +70,16 @@ jobs:
           yarn install --frozen-lockfile
 
       - name: Setup Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
         with:
-          version: v3.8.0
+          version: v3.22.0
 
       - name: Build Helm charts
         run: |
           yarn publish-pkgs -s ${{ github.repository }} -b ${{ needs.setup-target-branch.outputs.target_branch }} -t harvester-${{ needs.extract-version.outputs.version }}
 
       - name: Upload charts artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: charts
           path: tmp
@@ -94,7 +94,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout release branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           ref: '${{ github.ref_name }}'
 
@@ -105,7 +105,7 @@ jobs:
           echo "LAST_COMMIT=${LAST_COMMIT}" >> $GITHUB_ENV
 
       - name: Checkout target branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           ref: '${{ needs.setup-target-branch.outputs.target_branch }}'
 
@@ -121,7 +121,7 @@ jobs:
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: charts
 
@@ -132,7 +132,7 @@ jobs:
           git push origin ${{ needs.setup-target-branch.outputs.target_branch }}
 
       - name: Run Helm chart releaser
-        uses: helm/chart-releaser-action@v1.7.0
+        uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0
         with:
           charts_dir: ./charts
         env:

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

@@ -17,7 +17,7 @@ jobs:
       release_tag: ${{ steps.determine_tag.outputs.release_tag }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Determine release tag
         id: determine_tag
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       - name: Check package version
         env:
           TAG_VERSION: ${{ github.event.release.tag_name }}
@@ -43,12 +43,10 @@ jobs:
     needs:
       - setup-release-tag
       - check-version
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@9bf23dff6650116673346447bcf0b088e0edb27f # creators-pkg-v3.0.12
     permissions:
-      actions: write
       contents: write
-      deployments: write
-      pages: write
+      pull-requests: write
     with:
       target_branch: gh-pages
       tagged_release: '${{ needs.setup-release-tag.outputs.release_tag }}'

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

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       - name: Check package version
         env:
           TAG_VERSION: ${{github.ref_name}}

.github/workflows/fossa.yml

@@ -20,13 +20,13 @@ jobs:
     # The FOSSA token is shared between all repos in Harvester's GH org. It can
     # be used directly and there is no need to request specific access to EIO.
     - name: Read FOSSA token
-      uses: rancher-eio/read-vault-secrets@main
+      uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
       with:
         secrets: |
           secret/data/github/org/harvester/fossa/credentials token | FOSSA_API_KEY_PUSH_ONLY
 
     - name: FOSSA scan
-      uses: fossas/fossa-action@main
+      uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
       with:
         api-key: ${{ env.FOSSA_API_KEY_PUSH_ONLY }}
         # Only runs the scan and do not provide/returns any results back to the

.github/workflows/release-label.yaml

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

.github/workflows/run-lint.yaml

@@ -16,7 +16,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 0  # Need full history for commit-lint
 

README.md

@@ -163,7 +163,7 @@ If you want to contribute, start by reading this document, then visit our [Getti
 
 ## License
 
-Copyright (c) 2014-2026 [SUSE, LLC.](https://www.suse.com/)
+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.

package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.8.0-dev",
+  "version": "1.7.3",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@babel/plugin-transform-class-static-block": "7.28.6",
-    "@rancher/shell": "3.0.9-rc.1",
+    "@babel/plugin-transform-class-static-block": "7.29.7",
+    "@rancher/shell": "3.0.8-rc.8",
     "cache-loader": "^4.1.0",
     "color": "4.2.3",
     "ip": "2.0.1",
@@ -20,17 +20,17 @@
     "cronstrue": "2.59.0",
     "d3-color": "3.1.0",
     "ejs": "3.1.10",
-    "follow-redirects": "1.15.11",
+    "follow-redirects": "1.16.0",
     "glob": "7.2.3",
     "glob-parent": "6.0.2",
     "json5": "2.2.3",
-    "@types/lodash": "4.17.23",
+    "@types/lodash": "4.17.25",
     "merge": "2.1.1",
-    "node-forge": "1.3.3",
+    "node-forge": "1.4.0",
     "nth-check": "2.1.1",
-    "qs": "6.14.2",
-    "roarr": "7.21.4",
-    "semver": "7.7.4",
+    "qs": "6.16.0",
+    "roarr": "7.21.7",
+    "semver": "7.8.5",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "scripts": {

pkg/harvester/README.md

@@ -163,7 +163,7 @@ If you want to contribute, start by reading this document, then visit our [Getti
 
 ## License
 
-Copyright (c) 2014-2026 [SUSE, LLC.](https://www.suse.com/)
+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.

pkg/harvester/components/HarvesterUpgradeProgressBarList.vue

@@ -1,8 +1,6 @@
 <script>
 import Collapse from '@shell/components/Collapse';
 import PercentageBar from '@shell/components/PercentageBar';
-import { HCI } from '../types';
-import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 
 export default {
   name:       'HarvesterUpgradeProgressList',
@@ -27,45 +25,13 @@ export default {
     }
   },
 
-  async fetch() {
-    await this.$store.dispatch('harvester/findAll', { type: HCI.UPGRADE });
-  },
-
   data() {
     return { open: true };
   },
 
-  computed: {
-    showResumeButton() {
-      return this.title === 'Upgrading Node';
-    },
-    latestUpgradeCR() {
-      return this.$store.getters['harvester/all'](HCI.UPGRADE).find( (U) => U.isLatestUpgrade);
-    },
-    resumeUpgradePausedNodeEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('resumeUpgradePausedNode');
-    },
-  },
   methods: {
     handleSwitch() {
       this.open = !this.open;
-    },
-    async resumeNodeUpgrade(nodeName) {
-      if (!this.latestUpgradeCR || !nodeName) return;
-
-      try {
-        const upgradePauseMapString = this.latestUpgradeCR.metadata.annotations[HCI_ANNOTATIONS.NODE_UPGRADE_PAUSE_MAP] || '{}';
-        const upgradePauseMap = JSON.parse(upgradePauseMapString);
-
-        // update the upgrade CR annotation harvesterhci.io/node-upgrade-pause-map to unpause the node upgrade process
-        upgradePauseMap[`${ nodeName }`] = 'unpause';
-        this.latestUpgradeCR.setAnnotation(HCI_ANNOTATIONS.NODE_UPGRADE_PAUSE_MAP, JSON.stringify(upgradePauseMap));
-        await this.latestUpgradeCR.save();
-      } catch (e) {
-        console.error(`unable to update harvester upgrade CR annotations: ${ this.latestUpgradeCR.id }.`, e); // eslint-disable-line no-console
-
-        return false;
-      }
     }
   }
 };
@@ -97,28 +63,12 @@ export default {
               v-for="(item, i) in list"
               :key="i"
             >
-              <div class="upgrade-node-header">
-                <div class="upgrade-node-title">
-                  <p>
-                    {{ item.name }}
-                  </p>
-                  <span
-                    class="status"
-                    :class="{ [item.state]: true }"
-                  >
-                    {{ item.state }}
-                  </span>
-                </div>
-                <button
-                  v-if="showResumeButton && resumeUpgradePausedNodeEnabled && item.state === 'Node-upgrade paused'"
-                  type="button"
-                  class="btn bg-info btn-sm"
-                  data-testid="add-item"
-                  @click="resumeNodeUpgrade(item.name)"
-                >
-                  {{ t('action.resume') }}
-                </button>
-              </div>
+              <p>
+                {{ item.name }} <span
+                  class="status"
+                  :class="{ [item.state]: true }"
+                >{{ item.state }}</span>
+              </p>
               <PercentageBar
                 :model-value="item.percent"
                 preferred-direction="MORE"
@@ -152,21 +102,10 @@ export default {
     }
   }
   .custom-content {
-    .upgrade-node-title {
-      flex: 1 0 80%;
-      margin-right: 10px;
-      display: flex;
-      justify-content: space-between;
-    }
-    .upgrade-node-header {
-      display:flex;
-      justify-content: space-between;
-      align-items: center;
+    margin-bottom: 14px;
+    p {
       margin-bottom: 4px;
     }
-
-    margin-bottom: 14px;
-
     .status {
       float: right;
     }
@@ -178,8 +117,6 @@ export default {
     }
     .warning {
       color: var(--error);
-      margin-bottom: 8px;
-      margin-top: 4px;
     }
   }
 }

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

@@ -0,0 +1,123 @@
+<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/upgrade-config.vue

@@ -4,8 +4,6 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { RadioGroup } from '@components/Form/Radio';
 import { mapGetters } from 'vuex';
-import { allHash } from '@shell/utils/promise';
-import { NODE } from '@shell/config/types';
 
 export default {
   name: 'HarvesterUpgradeConfig',
@@ -17,13 +15,6 @@ export default {
   },
   mixins: [CreateEditView],
 
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-    const hash = { nodes: this.$store.dispatch(`${ inStore }/findAll`, { type: NODE }) };
-
-    await allHash(hash);
-  },
-
   data() {
     let parseDefaultValue = {};
 
@@ -48,25 +39,7 @@ export default {
         { value: 'skip', label: 'skip' },
         { value: 'parallel', label: 'parallel' }
       ];
-    },
-    nodeUpgradeOptions() {
-      return [
-        { value: 'auto', label: 'auto' },
-        { value: 'manual', label: 'manual' }
-      ];
-    },
-    nodesOptions() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const nodes = this.$store.getters[`${ inStore }/all`](NODE);
-
-      return nodes.map((node) => ({ value: node.id, label: node.name }));
-    },
-    showPauseNodes() {
-      return this.parseDefaultValue.nodeUpgradeOption?.strategy?.mode === 'manual';
-    },
-    resumeUpgradePausedNodeEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('resumeUpgradePausedNode');
-    },
+    }
   },
 
   created() {
@@ -75,18 +48,6 @@ export default {
 
   methods: {
     normalizeValue(obj) {
-      // handle nodeUpgradeOption.strategy
-      if (obj?.nodeUpgradeOption?.strategy?.mode === 'auto') {
-        delete obj.nodeUpgradeOption.strategy.pauseNodes;
-      }
-
-      if (obj?.nodeUpgradeOption?.strategy?.mode === 'manual') {
-        if (!Array.isArray(obj.nodeUpgradeOption.strategy.pauseNodes)) {
-          obj.nodeUpgradeOption.strategy.pauseNodes = this.nodesOptions.map((node) => node.value);
-        }
-      }
-
-      // handle imagePreloadOption.strategy
       if (!obj.imagePreloadOption) {
         obj.imagePreloadOption = { strategy: { type: 'sequential' } };
       }
@@ -144,8 +105,8 @@ export default {
         this.update();
       },
       deep: true
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -183,28 +144,6 @@ export default {
           :labels="[t('generic.enabled'), t('generic.disabled')]"
           @update:value="update"
         />
-        <div v-if="resumeUpgradePausedNodeEnabled">
-          <label class="mb-5"><b>{{ t('harvester.setting.upgrade.nodeUpgradeOption') }}</b></label>
-          <LabeledSelect
-            v-model:value="parseDefaultValue.nodeUpgradeOption.strategy.mode"
-            class="mb-20 label-select"
-            :mode="mode"
-            :label="t('harvester.setting.upgrade.strategy')"
-            :options="nodeUpgradeOptions"
-            @update:value="update"
-          />
-          <LabeledSelect
-            v-if="showPauseNodes"
-            v-model:value="parseDefaultValue.nodeUpgradeOption.strategy.pauseNodes"
-            class="mb-20 label-select"
-            :clearable="true"
-            :multiple="true"
-            :mode="mode"
-            :label="t('harvester.setting.upgrade.pauseNodes')"
-            :options="nodesOptions"
-            @update:value="update"
-          />
-        </div>
         <div
           v-if="errors.length"
           class="error"

pkg/harvester/config/feature-flags.js

@@ -54,12 +54,11 @@ const FEATURE_FLAGS = {
     'lhV2VolExpansion',
     'l2VlanTrunkMode',
     'kubevirtMigration',
-    'hotplugNic',
-    'resumeUpgradePausedNode',
+    'hotplugNic'
   ],
   'v1.7.1': [],
-  'v1.8.0': [
-    'hotplugCdRom',
+  'v1.7.2': [
+    'clusterRegistrationTLSVerify'
   ],
 };
 

pkg/harvester/config/harvester-cluster.js

@@ -35,21 +35,8 @@ import {
   SNAPSHOT_TARGET_VOLUME,
   IMAGE_VIRTUAL_SIZE,
   IMAGE_STORAGE_CLASS,
-  HARVESTER_DESCRIPTION,
-  VM_IMPORT_SOURCE_VM,
-  VM_IMPORT_SOURCE_CLUSTER,
-  VM_IMPORT_STATUS,
-  VM_IMPORT_SOURCE_V_DC,
-  VM_IMPORT_SOURCE_V_ENDPOINT,
-  VM_IMPORT_SOURCE_V_STATUS,
-  VM_IMPORT_SOURCE_O_REGION,
-  VM_IMPORT_SOURCE_O_ENDPOINT,
-  VM_IMPORT_SOURCE_O_STATUS,
-  VM_IMPORT_SOURCE_OVA_URL,
-  VM_IMPORT_SOURCE_OVA_STATUS,
+  HARVESTER_DESCRIPTION
 } from './table-headers';
-import { ADD_ONS } from './harvester-map';
-import { registerAddonSideNav } from '../utils/dynamic-nav';
 
 const TEMPLATE = HCI.VM_VERSION;
 const MONITORING_GROUP = 'Monitoring & Logging::Monitoring';
@@ -208,142 +195,6 @@ export function init($plugin, store) {
     exact: false
   });
 
-  // ===========================================================================
-  // VM Import Controller UI Flow
-  // ===========================================================================
-  // Define group (Hidden by default)
-  weightGroup('vmimport', 0, false);
-
-  // VirtualMachineImport
-  headers(HCI.VMIMPORT, [
-    STATE,
-    NAME_COL,
-    NAMESPACE_COL,
-    VM_IMPORT_SOURCE_VM,
-    VM_IMPORT_SOURCE_CLUSTER,
-    VM_IMPORT_STATUS,
-    AGE
-  ]);
-  configureType(HCI.VMIMPORT, {
-    resource:       HCI.VMIMPORT,
-    resourceDetail: HCI.VMIMPORT,
-    resourceEdit:   HCI.VMIMPORT,
-    location:       {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT }
-    }
-  });
-  virtualType({ // needed to avoid 404 on refresh when combined with registerAddonSideNav()
-    name:       HCI.VMIMPORT,
-    labelKey:   'harvester.addons.vmImport.labels.vmimport',
-    group:      'vmimport',
-    namespaced: true,
-    route:      {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT }
-    }
-  });
-
-  // Source: VMware
-  headers(HCI.VMIMPORT_SOURCE_V, [
-    STATE,
-    NAME_COL,
-    VM_IMPORT_SOURCE_V_ENDPOINT,
-    VM_IMPORT_SOURCE_V_DC,
-    VM_IMPORT_SOURCE_V_STATUS,
-    AGE
-  ]);
-  configureType(HCI.VMIMPORT_SOURCE_V, {
-    resource:       HCI.VMIMPORT_SOURCE_V,
-    resourceDetail: HCI.VMIMPORT_SOURCE_V,
-    resourceEdit:   HCI.VMIMPORT_SOURCE_V,
-    location:       {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT_SOURCE_V }
-    }
-  });
-  virtualType({ // needed to avoid 404 on refresh when combined with registerAddonSideNav()
-    name:       HCI.VMIMPORT_SOURCE_V,
-    labelKey:   'harvester.addons.vmImport.labels.vmimportSourceVMWare',
-    group:      'vmimport',
-    namespaced: true,
-    route:      {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT_SOURCE_V }
-    }
-  });
-
-  // Source: OpenStack
-  headers(HCI.VMIMPORT_SOURCE_O, [
-    STATE,
-    NAME_COL,
-    VM_IMPORT_SOURCE_O_ENDPOINT,
-    VM_IMPORT_SOURCE_O_REGION,
-    VM_IMPORT_SOURCE_O_STATUS,
-    AGE
-  ]);
-  configureType(HCI.VMIMPORT_SOURCE_O, {
-    resource:       HCI.VMIMPORT_SOURCE_O,
-    resourceDetail: HCI.VMIMPORT_SOURCE_O,
-    resourceEdit:   HCI.VMIMPORT_SOURCE_O,
-    location:       {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT_SOURCE_O }
-    }
-  });
-  virtualType({ // needed to avoid 404 on refresh when combined with registerAddonSideNav()
-    name:       HCI.VMIMPORT_SOURCE_O,
-    labelKey:   'harvester.addons.vmImport.labels.vmimportSourceOpenStack',
-    group:      'vmimport',
-    namespaced: true,
-    route:      {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT_SOURCE_O }
-    }
-  });
-
-  // Source: OVA
-  headers(HCI.VMIMPORT_SOURCE_OVA, [
-    STATE,
-    NAME_COL,
-    VM_IMPORT_SOURCE_OVA_URL,
-    VM_IMPORT_SOURCE_OVA_STATUS,
-    AGE
-  ]);
-  configureType(HCI.VMIMPORT_SOURCE_OVA, {
-    resource:       HCI.VMIMPORT_SOURCE_OVA,
-    resourceDetail: HCI.VMIMPORT_SOURCE_OVA,
-    resourceEdit:   HCI.VMIMPORT_SOURCE_OVA,
-    location:       {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT_SOURCE_OVA }
-    }
-  });
-  virtualType({ // needed to avoid 404 on refresh when combined with registerAddonSideNav()
-    name:       HCI.VMIMPORT_SOURCE_OVA,
-    labelKey:   'harvester.addons.vmImport.labels.vmimportSourceOVA',
-    group:      'vmimport',
-    namespaced: true,
-    route:      {
-      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
-      params: { resource: HCI.VMIMPORT_SOURCE_OVA }
-    }
-  });
-
-  // Enable SideNav based on Addon Status
-  registerAddonSideNav(store, PRODUCT_NAME, {
-    addonName:    ADD_ONS.VM_IMPORT_CONTROLLER,
-    resourceType: HCI.ADD_ONS,
-    navGroup:     'vmimport',
-    types:        [
-      HCI.VMIMPORT_SOURCE_V,
-      HCI.VMIMPORT_SOURCE_O,
-      HCI.VMIMPORT_SOURCE_OVA,
-      HCI.VMIMPORT
-    ]
-  });
-  // ===========================================================================
-
   basicType([HCI.VOLUME]);
   configureType(HCI.VOLUME, {
     location: {

pkg/harvester/config/harvester-map.js

@@ -39,12 +39,6 @@ export const VOLUME_TYPE = [{
   value: 'cd-rom'
 }];
 
-export const VOLUME_HOTPLUG_ACTION = {
-  INSERT_CDROM_IMAGE: 'INSERT_CDROM_IMAGE',
-  EJECT_CDROM_IMAGE:  'EJECT_CDROM_IMAGE',
-  DETACH_DISK:        'DETACH_DISK'
-};
-
 export const ACCESS_CREDENTIALS = {
   RESET_PWD:  'userPassword',
   INJECT_SSH: 'sshPublicKey'

pkg/harvester/config/labels-annotations.js

@@ -78,5 +78,4 @@ export const HCI = {
   VOLUME_MODE_ACCESS_MODES:         'cdi.harvesterhci.io/storageProfileVolumeModeAccessModes',
   VOLUME_SNAPSHOT_CLASS:            'cdi.harvesterhci.io/storageProfileVolumeSnapshotClass',
   MAC_ADDRESS:                      'harvesterhci.io/mac-address',
-  NODE_UPGRADE_PAUSE_MAP:           'harvesterhci.io/node-upgrade-pause-map',
 };

pkg/harvester/config/settings.ts

@@ -123,7 +123,8 @@ export const HCI_ALLOWED_SETTINGS = {
 
 export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
   [HCI_SETTING.CLUSTER_REGISTRATION_URL]: {
-    kind:     'url',
+    kind:     'custom',
+    from:     'import',
     canReset: true,
   },
   [HCI_SETTING.UI_PL]: {

pkg/harvester/config/table-headers.js

@@ -131,102 +131,3 @@ export const PROVIDER = {
   value:    'spec.provider',
   align:    'left',
 };
-
-// Source VM column in migration.harvesterhci.io.virtualmachineimport list page
-export const VM_IMPORT_SOURCE_VM = {
-  name:     'sourceVm',
-  labelKey: 'harvester.tableHeaders.vmImportSourceVm',
-  value:    'spec.virtualMachineName',
-  sort:     'spec.virtualMachineName',
-  align:    'left',
-};
-
-// Source Cluster column in migration.harvesterhci.io.virtualmachineimport list page
-export const VM_IMPORT_SOURCE_CLUSTER = {
-  name:     'sourceCluster',
-  labelKey: 'harvester.tableHeaders.vmImportSourceCluster',
-  value:    'spec.sourceCluster.name',
-  sort:     'spec.sourceCluster.name',
-  align:    'left',
-};
-
-// Import Status column in migration.harvesterhci.io.virtualmachineimport list page
-export const VM_IMPORT_STATUS = {
-  name:     'importStatus',
-  labelKey: 'harvester.tableHeaders.vmImportStatus',
-  value:    'status.importStatus',
-  sort:     'status.importStatus',
-  align:    'left',
-};
-
-// Datacenter column in migration.harvesterhci.io.vmwaresource list page
-export const VM_IMPORT_SOURCE_V_DC = {
-  name:     'datacenter',
-  labelKey: 'harvester.tableHeaders.vmImportSourceVDatacenter',
-  value:    'spec.dc',
-  sort:     'spec.dc',
-  align:    'left',
-};
-
-// Endpoint column in migration.harvesterhci.io.vmwaresource list page
-export const VM_IMPORT_SOURCE_V_ENDPOINT = {
-  name:     'endpoint',
-  labelKey: 'harvester.tableHeaders.vmImportSourceVEndpoint',
-  value:    'spec.endpoint',
-  sort:     'spec.endpoint',
-  align:    'left',
-};
-
-// Cluster Status column in migration.harvesterhci.io.vmwaresource list page
-export const VM_IMPORT_SOURCE_V_STATUS = {
-  name:     'clusterStatus',
-  labelKey: 'harvester.tableHeaders.vmImportSourceVClusterStatus',
-  value:    'status.status',
-  sort:     'status.status',
-  align:    'left',
-};
-
-// Region column in migration.harvesterhci.io.openstacksource list page
-export const VM_IMPORT_SOURCE_O_REGION = {
-  name:     'region',
-  labelKey: 'harvester.tableHeaders.vmImportSourceORegion',
-  value:    'spec.region',
-  sort:     'spec.region',
-  align:    'left',
-};
-
-// Endpoint column in migration.harvesterhci.io.openstacksource list page
-export const VM_IMPORT_SOURCE_O_ENDPOINT = {
-  name:     'endpoint',
-  labelKey: 'harvester.tableHeaders.vmImportSourceOEndpoint',
-  value:    'spec.endpoint',
-  sort:     'spec.endpoint',
-  align:    'left',
-};
-
-// Cluster Status column in migration.harvesterhci.io.openstacksource list page
-export const VM_IMPORT_SOURCE_O_STATUS = {
-  name:     'clusterStatus',
-  labelKey: 'harvester.tableHeaders.vmImportSourceOClusterStatus',
-  value:    'status.status',
-  sort:     'status.status',
-  align:    'left',
-};
-
-// URL column in migration.harvesterhci.io.ovasource list page
-export const VM_IMPORT_SOURCE_OVA_URL = {
-  name:     'url',
-  labelKey: 'harvester.tableHeaders.vmImportSourceOVAUrl',
-  value:    'spec.url',
-  sort:     'spec.url',
-  align:    'left',
-};
-
-// Status column in migration.harvesterhci.io.ovasource list page
-export const VM_IMPORT_SOURCE_OVA_STATUS = {
-  name:     'status',
-  labelKey: 'harvester.tableHeaders.vmImportSourceOVAStatus',
-  value:    'status.status',
-  sort:     'status.status',
-  align:    'left',
-};

pkg/harvester/config/types.js

@@ -29,15 +29,3 @@ export const L2VLAN_MODE = {
   ACCESS: 'access',
   TRUNK:  'trunk',
 };
-
-export const VMIMPORT_SOURCE_PROVIDER = {
-  VMWARE:    'vmware',
-  OPENSTACK: 'openstack',
-  OVA:       'ova',
-};
-
-export const VMIMPORT_SOURCE_KINDS = {
-  VMWARE:    'VmwareSource',
-  OPENSTACK: 'OpenstackSource',
-  OVA:       'OvaSource',
-};

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

@@ -75,7 +75,7 @@ export default {
       <div class="row">
         <div class="col span-6 mb-20">
           <LabelValue
-            :name="t('harvester.schedule.cron.label')"
+            :name="t('harvester.schedule.cron')"
             :value="cronExpression"
           />
         </div>

pkg/harvester/dialog/HarvesterHotUnplug.vue

@@ -5,10 +5,6 @@ import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import AsyncButton from '@shell/components/AsyncButton';
 
-const VOLUME = 'volume';
-const NETWORK = 'network';
-const CDROM = 'cdrom';
-
 export default {
   name: 'HarvesterHotUnplug',
 
@@ -44,37 +40,19 @@ export default {
     },
 
     isVolume() {
-      return this.modalData.type === VOLUME;
+      return this.modalData.type === 'volume';
     },
 
     titleKey() {
-      const keys = {
-        [VOLUME]:  'harvester.virtualMachine.hotUnplug.detachVolume.title',
-        [CDROM]:   'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.title',
-        [NETWORK]: 'harvester.virtualMachine.hotUnplug.detachNIC.title',
-      };
-
-      return keys[this.modalData.type];
+      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.title' : 'harvester.virtualMachine.hotUnplug.detachNIC.title';
     },
 
     actionLabelKey() {
-      const keys = {
-        [VOLUME]:  'harvester.virtualMachine.hotUnplug.detachVolume.actionLabels',
-        [CDROM]:   'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.actionLabels',
-        [NETWORK]: 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabels',
-      };
-
-      return keys[this.modalData.type];
+      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel' : 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabel';
     },
 
     successMessageKey() {
-      const keys = {
-        [VOLUME]:  'harvester.virtualMachine.hotUnplug.detachVolume.success',
-        [CDROM]:   'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.success',
-        [NETWORK]: 'harvester.virtualMachine.hotUnplug.detachNIC.success',
-      };
-
-      return keys[this.modalData.type];
+      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.success' : 'harvester.virtualMachine.hotUnplug.detachNIC.success';
     }
   },
 
@@ -87,12 +65,10 @@ export default {
       try {
         let res;
 
-        if (this.modalData.type === VOLUME) {
+        if (this.isVolume) {
           res = await this.actionResource.doAction('removeVolume', { diskName: this.name });
-        } else if (this.modalData.type === NETWORK) {
-          res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
         } else {
-          res = await this.actionResource.doAction('ejectCdRomVolume', { deviceName: this.name });
+          res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
         }
 
         if (res._status === 200 || res._status === 204) {

pkg/harvester/dialog/HarvesterInsertCdRomVolume.vue

@@ -1,198 +0,0 @@
-<script>
-import { exceptionToErrorsArray } from '@shell/utils/error';
-import { mapState, mapGetters } from 'vuex';
-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 { HCI } from '../types';
-
-export default {
-  name: 'HarvesterInsertCdRomVolume',
-
-  emits: ['close'],
-
-  components: {
-    AsyncButton,
-    Card,
-    LabeledInput,
-    LabeledSelect,
-    Banner
-  },
-
-  props: {
-    resources: {
-      type:     Array,
-      required: true
-    }
-  },
-
-  async fetch() {
-    try {
-      this.images = await this.$store.dispatch('harvester/findAll', { type: HCI.IMAGE });
-    } catch (err) {
-      this.errors = exceptionToErrorsArray(err);
-      this.images = [];
-    }
-  },
-
-  data() {
-    return {
-      imageName: '',
-      images:    [],
-      errors:    [],
-    };
-  },
-
-  computed: {
-    ...mapState('action-menu', ['modalData']),
-    ...mapGetters({ t: 'i18n/t' }),
-
-    actionResource() {
-      return this.resources?.[0];
-    },
-
-    isFormValid() {
-      return this.imageName !== '';
-    },
-
-    deviceName() {
-      return this.modalData.name;
-    },
-
-    imagesOption() {
-      return this.images
-        .filter((image) => {
-          const labels = image.metadata?.labels || {};
-          const type = labels[HCI_ANNOTATIONS.IMAGE_SUFFIX];
-
-          return type === 'iso';
-        })
-        .map((image) => {
-          return ({
-            label:    this.imageOptionLabel(image),
-            value:    image.id,
-            disabled: image.isImportedImage
-          });
-        });
-    }
-  },
-
-  methods: {
-    close() {
-      this.imageName = '';
-      this.errors = [];
-      this.$emit('close');
-    },
-
-    imageOptionLabel(image) {
-      return `${ image.metadata.namespace }/${ image.spec.displayName }`;
-    },
-
-    async save(buttonCb) {
-      if (!this.actionResource) {
-        buttonCb(false);
-
-        return;
-      }
-
-      const payload = {
-        deviceName: this.deviceName,
-        imageName:  this.imageName
-      };
-
-      try {
-        const res = await this.actionResource.doAction('insertCdRomVolume', payload);
-
-        if ([200, 204].includes(res?._status)) {
-          this.$store.dispatch('growl/success', {
-            title:   this.t('generic.notification.title.succeed'),
-            message: this.t('harvester.modal.insertCdRomVolume.success', {
-              deviceName: this.deviceName,
-              imageName:  this.imageName,
-            })
-          }, { 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.insertCdRomVolume.title')"
-        class="text-default-text"
-      />
-    </template>
-
-    <template #body>
-      <LabeledInput
-        v-model:value="deviceName"
-        :label="t('generic.name')"
-        disabled
-      />
-      <LabeledSelect
-        v-model:value="imageName"
-        class="mt-20"
-        :label="t('harvester.modal.insertCdRomVolume.image')"
-        :options="imagesOption"
-        required
-      />
-      <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/HarvesterSupportBundle.vue

@@ -277,9 +277,8 @@ export default {
                 :label="t('harvester.modal.bundle.namespaces.label')"
                 :clearable="true"
                 :multiple="true"
-                :append-to-body="false"
                 :options="namespaceOptions"
-                class="mb-10 namespace-select"
+                class="mb-10 label-select"
                 :tooltip="t('harvester.modal.bundle.namespaces.tooltip', _, true)"
                 @update:value="updateNamespaces"
               />
@@ -373,11 +372,6 @@ export default {
       padding: 10px 0;
       height: 160px;
     }
-    .namespace-select {
-      :deep(.vs__dropdown-menu) {
-        max-height: 210px;
-      }
-    }
   }
 
   div {

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

@@ -1,5 +1,4 @@
 <script>
-import { mapGetters } from 'vuex';
 import { RadioGroup } from '@components/Form/Radio';
 import { Banner } from '@components/Banner';
 import { LabeledInput } from '@components/Form/LabeledInput';
@@ -17,7 +16,6 @@ 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';
-import CronExpressionEditorModal from '@shell/components/Cron/CronExpressionEditorModal.vue';
 
 export default {
   name:       'CreateVMSchedule',
@@ -30,7 +28,6 @@ export default {
     LabeledSelect,
     MessageLink,
     Banner,
-    CronExpressionEditorModal
   },
 
   mixins: [CreateEditView],
@@ -89,12 +86,10 @@ export default {
       }
     }
 
-    return { settings: [], showModel: false };
+    return { settings: [] };
   },
 
   computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
     backupTargetResource() {
       return this.settings.find( (O) => O.id === 'backup-target');
     },
@@ -177,9 +172,6 @@ export default {
         this.value.spec['maxFailure'] = this.value.spec.retain;
       }
     },
-    openModal() {
-      this.showModel = true;
-    },
   },
 };
 </script>
@@ -264,28 +256,16 @@ export default {
         :weight="99"
         class="bordered-table"
       >
-        <div class="cronEditor">
-          <LabeledInput
-            v-model:value="value.spec.cron"
-            class="mb-30"
-            type="cron"
-            required
-            :mode="mode"
-            :label="t('harvester.schedule.cron.label')"
-            placeholder="0 * * * *"
-            :disabled="isBackupTargetUnAvailable || isView"
-          />
-          <button
-            class="editCronBtn btn role-primary"
-            @click="openModal"
-          >
-            {{ t('harvester.schedule.cron.editButton') }}
-          </button>
-          <CronExpressionEditorModal
-            v-model:show="showModel"
-            v-model:cron-expression="value.spec.cron"
-          />
-        </div>
+        <LabeledInput
+          v-model:value="value.spec.cron"
+          class="mb-30"
+          type="cron"
+          required
+          :mode="mode"
+          :label="t('harvester.schedule.cron')"
+          placeholder="0 * * * *"
+          :disabled="isBackupTargetUnAvailable || isView"
+        />
         <LabeledInput
           v-model:value.number="value.spec.retain"
           class="mb-30"
@@ -312,16 +292,3 @@ export default {
     </Tabbed>
   </CruResource>
 </template>
-
-<style lang="scss" scoped>
-.cronEditor {
-  align-items: center;
-  display: flex;
-}
-
-.editCronBtn {
-  margin-bottom: 30px;
-  margin-left: 10px;
-  height: 60px;
-}
-</style>

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

@@ -6,7 +6,6 @@ import { Checkbox } from '@components/Form/Checkbox';
 import CruResource from '@shell/components/CruResource';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { set } from '@shell/utils/object';
 import { Banner } from '@components/Banner';
 import KeyValue from '@shell/components/form/KeyValue';
 import NodeScheduling from '@shell/components/form/NodeScheduling';
@@ -23,7 +22,6 @@ import Reserved from './kubevirt.io.virtualmachine/VirtualMachineReserved';
 import Volume from './kubevirt.io.virtualmachine/VirtualMachineVolume';
 import Network from './kubevirt.io.virtualmachine/VirtualMachineNetwork';
 import CpuMemory from './kubevirt.io.virtualmachine/VirtualMachineCpuMemory';
-import CpuModel from './kubevirt.io.virtualmachine/VirtualMachineCpuModel';
 import CloudConfig from './kubevirt.io.virtualmachine/VirtualMachineCloudConfig';
 import SSHKey from './kubevirt.io.virtualmachine/VirtualMachineSSHKey';
 
@@ -40,7 +38,6 @@ export default {
     Network,
     Checkbox,
     CpuMemory,
-    CpuModel,
     CruResource,
     CloudConfig,
     LabeledSelect,
@@ -73,12 +70,12 @@ export default {
 
     return {
       templateId,
-      templateValue:     null,
-      templateSpec:      null,
-      versionName:       '',
-      description:       '',
-      defaultVersion:    null,
-      isDefaultVersion:  false,
+      templateValue:    null,
+      templateSpec:     null,
+      versionName:      '',
+      description:      '',
+      defaultVersion:   null,
+      isDefaultVersion: false,
     };
   },
 
@@ -157,18 +154,6 @@ export default {
   },
 
   methods: {
-    updateCpuModel(value) {
-      if (!this.spec?.template?.spec?.domain?.cpu) {
-        set(this.spec, 'template.spec.domain.cpu', {});
-      }
-
-      if (value && value !== '') {
-        set(this.spec.template.spec.domain.cpu, 'model', value);
-      } else {
-        delete this.spec.template.spec.domain.cpu.model;
-      }
-    },
-
     async saveVMT(buttonCb) {
       this.parseVM();
 
@@ -451,17 +436,6 @@ export default {
             />
           </div>
         </div>
-
-        <div class="row mb-20">
-          <div class="col span-6">
-            <CpuModel
-              :value="spec.template.spec.domain.cpu?.model || ''"
-              :mode="mode"
-              @update:value="updateCpuModel"
-            />
-          </div>
-        </div>
-
         <div class="row mb-20">
           <a
             v-if="showAdvanced"

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

@@ -1,133 +0,0 @@
-<script>
-import YAML from 'yaml';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { CONFIG_MAP } from '@shell/config/types';
-import { Banner } from '@components/Banner';
-
-const CPU_MODEL_CONFIG_MAP_ID = 'harvester-system/node-cpu-model-configuration';
-
-export default {
-  name: 'HarvesterCpuModel',
-
-  emits: ['update:value'],
-
-  components: {
-    LabeledSelect,
-    Banner
-  },
-
-  props: {
-    value: {
-      type:    String,
-      default: ''
-    },
-    mode: {
-      type:    String,
-      default: 'create',
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    try {
-      await this.$store.dispatch(`${ inStore }/find`, { type: CONFIG_MAP, id: CPU_MODEL_CONFIG_MAP_ID });
-      this.fetchError = null;
-    } catch (e) {
-      this.fetchError = this.t('harvester.virtualMachine.cpuModel.fetchError', { error: e.message || e });
-    }
-  },
-
-  data() {
-    return { fetchError: null };
-  },
-
-  computed: {
-    localValue: {
-      get() {
-        return this.value ?? '';
-      },
-      set(val) {
-        this.$emit('update:value', val ?? '');
-      }
-    },
-
-    cpuModelConfigMap() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      return this.$store.getters[`${ inStore }/byId`](
-        CONFIG_MAP,
-        CPU_MODEL_CONFIG_MAP_ID
-      );
-    },
-
-    cpuModelOptions() {
-      if (!this.cpuModelConfigMap?.data?.cpuModels) {
-        return [{ label: this.t('generic.default'), value: '' }];
-      }
-
-      let cpuModelsData;
-
-      try {
-        cpuModelsData = YAML.parse(this.cpuModelConfigMap.data?.cpuModels || '');
-      } catch (e) {
-        return [{ label: this.t('generic.default'), value: '' }];
-      }
-
-      const options = [];
-
-      options.push({
-        label: this.t('generic.default'),
-        value: ''
-      });
-
-      // Add global models (host-model, host-passthrough)
-      const globalModels = cpuModelsData.globalModels || [];
-
-      globalModels.forEach((modelName) => {
-        options.push({
-          label: modelName,
-          value: modelName
-        });
-      });
-
-      // Add regular models with node count
-      const modelEntries = Object.entries(cpuModelsData.models || {});
-
-      // Sort models alphabetically for consistent display
-      modelEntries.sort((a, b) => a[0].localeCompare(b[0]));
-
-      modelEntries.forEach(([modelName, modelInfo]) => {
-        const readyCount = modelInfo.readyCount || 0;
-        const label = this.t('harvester.virtualMachine.cpuModel.optionLabel', { modelName, count: readyCount });
-
-        options.push({
-          label,
-          value: modelName
-        });
-      });
-
-      return options;
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <Banner
-      v-if="fetchError"
-      color="error"
-      class="mb-20"
-    >
-      {{ fetchError }}
-    </Banner>
-    <LabeledSelect
-      v-model:value="localValue"
-      :label="t('harvester.virtualMachine.cpuModel.label')"
-      :options="cpuModelOptions"
-      :mode="mode"
-      :disabled="!!fetchError"
-    />
-  </div>
-</template>

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

@@ -54,11 +54,6 @@ export default {
 
     const vmDevices = this.value?.domain?.devices?.hostDevices || [];
     const otherDevices = this.otherDevices(vmDevices).map(({ name }) => name);
-    const vmDeviceNames = vmDevices.map(({ name }) => name);
-
-    this.pciDevices.forEach((row) => {
-      row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
-    });
 
     vmDevices.forEach(({ name, deviceName }) => {
       const checkName = (deviceName || '').split('/')?.[1];

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

@@ -48,13 +48,6 @@ export default {
       this[key] = res[key];
     }
 
-    const vmDevices = this.value?.domain?.devices?.hostDevices || [];
-    const vmDeviceNames = vmDevices.map(({ name }) => name);
-
-    this.devices.forEach((row) => {
-      row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
-    });
-
     this.selectedDevices = (this.value?.domain?.devices?.hostDevices || [])
       .map(({ name }) => name)
       .filter((name) => this.enabledDevices.find((device) => device?.metadata?.name === name));

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

@@ -46,13 +46,6 @@ export default {
       this[key] = res[key];
     }
 
-    const vmDevices = this.value?.domain?.devices?.gpus || [];
-    const vmDeviceNames = vmDevices.map(({ name }) => name);
-
-    this.devices.forEach((row) => {
-      row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
-    });
-
     const vGpus = this.vm.isOff ? [
       ...(this.value?.domain?.devices?.gpus || []).map(({ name }) => name),
     ] : [

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

@@ -13,12 +13,11 @@ import { ucFirst, randomStr } from '@shell/utils/string';
 import { removeObject } from '@shell/utils/array';
 import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params';
 import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs';
-import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
+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';
-import { EMPTY_IMAGE } from '../../../utils/vm';
 
 export default {
   emits: ['update:value'],
@@ -118,10 +117,6 @@ export default {
       return this.mode === _CREATE;
     },
 
-    isHotplugCdRomFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('hotplugCdRom');
-    },
-
     defaultStorageClass() {
       const defaultStorage = this.$store.getters['harvester/all'](STORAGE_CLASS).find((sc) => sc.isDefault);
 
@@ -151,7 +146,7 @@ export default {
     value: {
       handler(neu) {
         const rows = clone(neu).map((V) => {
-          if (!this.isCreate && V.source !== SOURCE_TYPE.CONTAINER && !V.newCreateId && V.image !== EMPTY_IMAGE) {
+          if (!this.isCreate && V.source !== SOURCE_TYPE.CONTAINER && !V.newCreateId) {
             V.to = {
               name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-namespace-id`,
               params: {
@@ -222,48 +217,8 @@ export default {
       }
     },
 
-    canDoVolumeHotplugAction(volume) {
-      if (!this.isHotplugCdRomFeatureEnabled && volume.type === 'cd-rom') {
-        return false;
-      }
-
-      if (volume.hotpluggable) {
-        return true;
-      }
-
-      return volume.type === 'cd-rom' && volume.bus === 'sata' && volume.image === EMPTY_IMAGE;
-    },
-
-    getVolumeHotplugAction(volume) {
-      if (volume.type === 'cd-rom' && volume.bus === 'sata') {
-        if (volume.image === EMPTY_IMAGE) {
-          return VOLUME_HOTPLUG_ACTION.INSERT_CDROM_IMAGE;
-        }
-
-        return VOLUME_HOTPLUG_ACTION.EJECT_CDROM_IMAGE;
-      }
-
-      return VOLUME_HOTPLUG_ACTION.DETACH_DISK;
-    },
-
-    getVolumeHotplugActionLabel(volume) {
-      const labels = {
-        [VOLUME_HOTPLUG_ACTION.DETACH_DISK]:        'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel',
-        [VOLUME_HOTPLUG_ACTION.INSERT_CDROM_IMAGE]: 'harvester.modal.insertCdRomVolume.actionLabel',
-        [VOLUME_HOTPLUG_ACTION.EJECT_CDROM_IMAGE]:  'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.actionLabel',
-      };
-
-      return labels[this.getVolumeHotplugAction(volume)];
-    },
-
-    hotplugVolume(volume) {
-      const calls = {
-        [VOLUME_HOTPLUG_ACTION.DETACH_DISK]:        () => this.vm.unplugVolume(volume.name),
-        [VOLUME_HOTPLUG_ACTION.INSERT_CDROM_IMAGE]: () => this.vm.insertCdRomVolume(volume.name),
-        [VOLUME_HOTPLUG_ACTION.EJECT_CDROM_IMAGE]:  () => this.vm.ejectCdRomVolume(volume.name),
-      };
-
-      return calls[this.getVolumeHotplugAction(volume)]();
+    unplugVolume(volume) {
+      this.vm.unplugVolume(volume.name);
     },
 
     componentFor(type) {
@@ -391,12 +346,12 @@ export default {
               <i class="icon icon-x" />
             </button>
             <button
-              v-if="canDoVolumeHotplugAction(volume) && isView"
+              v-if="volume.hotpluggable && isView"
               type="button"
               class="role-link btn btn-sm remove"
-              @click="hotplugVolume(volume)"
+              @click="unplugVolume(volume)"
             >
-              {{ t(getVolumeHotplugActionLabel(volume)) }}
+              {{ t('harvester.virtualMachine.hotUnplug.detachVolume.actionLabel') }}
             </button>
           </div>
           <div>

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

@@ -14,7 +14,6 @@ import { _VIEW } from '@shell/config/query-params';
 import LabelValue from '@shell/components/LabelValue';
 import { ucFirst } from '@shell/utils/string';
 import { GIBIBYTE } from '../../../../utils/unit';
-import { EMPTY_IMAGE } from '../../../../utils/vm';
 
 export default {
   name: 'HarvesterEditVMImage',
@@ -97,20 +96,8 @@ export default {
       return this.mode === _VIEW;
     },
 
-    isExistingCdrom() {
-      return this.value.type === 'cd-rom' && !this.value.newCreateId;
-    },
-
-    isEmptyImage() {
-      return this.value.image === EMPTY_IMAGE;
-    },
-
-    isHotplugCdRomFeatureEnabled() {
-      return this.$store.getters['harvester-common/getFeatureEnabled']('hotplugCdRom');
-    },
-
     imagesOption() {
-      const images = this.images
+      return this.images
         .filter((image) => {
           if (!image.isReady) return false;
 
@@ -127,19 +114,6 @@ export default {
           value:    image.id,
           disabled: image.isImportedImage
         }));
-
-      const options = [];
-
-      if (this.isHotplugCdRomFeatureEnabled) {
-        options.push({
-          label:    this.t('harvester.virtualMachine.volume.emptyImage'),
-          value:    EMPTY_IMAGE,
-          disabled: false
-        });
-      }
-      options.push(...images);
-
-      return options;
     },
 
     imageName() {
@@ -205,7 +179,6 @@ export default {
     'value.type'(neu) {
       if (neu === 'cd-rom') {
         this.value['bus'] = 'sata';
-        this.updateHotpluggable();
         this.update();
       }
     },
@@ -248,48 +221,12 @@ export default {
 
       return label;
     },
-
     update() {
       this.value.hasDiskError = this.showDiskTooSmallError;
       this.$emit('update');
     },
 
-    updateHotpluggable() {
-      if (this.value.type !== 'cd-rom') {
-        this.value['hotpluggable'] = false;
-      } else {
-        this.value['hotpluggable'] = (this.value.bus === 'sata');
-      }
-    },
-
-    onTypeChange() {
-      if (this.value.image === EMPTY_IMAGE && this.value.type !== 'cd-rom') {
-        this.value['image'] = '';
-      }
-
-      this.updateHotpluggable();
-      this.update();
-    },
-
-    onBusChange() {
-      if (this.value.image === EMPTY_IMAGE && this.value.bus !== 'sata') {
-        this.value['image'] = '';
-      }
-
-      this.updateHotpluggable();
-      this.update();
-    },
-
     onImageChange() {
-      if (this.value.image === EMPTY_IMAGE) {
-        this.value['type'] = 'cd-rom';
-        this.value['bus'] = 'sata';
-        this.value['size'] = `0${ GIBIBYTE }`;
-        this.update();
-
-        return;
-      }
-
       const imageResource = this.$store.getters['harvester/all'](HCI.IMAGE)?.find( (I) => this.value.image === I.id);
       const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
       const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
@@ -297,7 +234,6 @@ export default {
       if (isIsoImage) {
         this.value['type'] = 'cd-rom';
         this.value['bus'] = 'sata';
-        this.updateHotpluggable();
       } else {
         this.value['type'] = 'disk';
         this.value['bus'] = 'virtio';
@@ -320,10 +256,6 @@ export default {
     },
 
     checkImageExists(imageId) {
-      if (imageId === EMPTY_IMAGE) {
-        return;
-      }
-
       if (!!imageId && this.imagesOption.length > 0 && !findBy(this.imagesOption, 'value', imageId)) {
         this.$store.dispatch('growl/error', {
           title:   this.$store.getters['i18n/t']('harvester.vmTemplate.tips.notExistImage.title', { name: imageId }),
@@ -351,7 +283,6 @@ export default {
         >
           <LabeledInput
             v-model:value="value.name"
-            :disabled="!isCreate && isExistingCdrom"
             :label="t('harvester.fields.name')"
             required
             :mode="mode"
@@ -371,11 +302,10 @@ export default {
         >
           <LabeledSelect
             v-model:value="value.type"
-            :disabled="!isCreate && isExistingCdrom"
             :label="t('harvester.fields.type')"
             :options="VOLUME_TYPE"
             :mode="mode"
-            @update:value="onTypeChange"
+            @update:value="update"
           />
         </InputOrDisplay>
       </div>
@@ -393,7 +323,7 @@ export default {
         >
           <LabeledSelect
             v-model:value="value.image"
-            :disabled="(idx === 0 || isExistingCdrom) && (!isCreate && !value.newCreateId && isVirtualType)"
+            :disabled="idx === 0 && !isCreate && !value.newCreateId && isVirtualType"
             :label="t('harvester.fields.image')"
             :options="imagesOption"
             :mode="mode"
@@ -421,7 +351,7 @@ export default {
             :label="t('harvester.fields.size')"
             :mode="mode"
             :required="validateRequired"
-            :disabled="isResizeDisabled || isEmptyImage || (!isCreate && isExistingCdrom)"
+            :disabled="isResizeDisabled"
             :suffix="GIBIBYTE"
             @update:value="update"
           />
@@ -444,8 +374,7 @@ export default {
             :label="t('harvester.virtualMachine.volume.bus')"
             :mode="mode"
             :options="InterfaceOption"
-            :disabled="!isCreate && isExistingCdrom"
-            @update:value="onBusChange"
+            @update:value="update"
           />
         </InputOrDisplay>
       </div>

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, set } from '@shell/utils/object';
+import { clone } from '@shell/utils/object';
 import Tab from '@shell/components/Tabbed/Tab';
 import { Checkbox } from '@components/Form/Checkbox';
 import CruResource from '@shell/components/CruResource';
@@ -32,7 +32,6 @@ import PciDevices from './VirtualMachinePciDevices/index';
 import AccessCredentials from './VirtualMachineAccessCredentials';
 import CloudConfig from './VirtualMachineCloudConfig';
 import CpuMemory from './VirtualMachineCpuMemory';
-import CpuModel from './VirtualMachineCpuModel';
 import Network from './VirtualMachineNetwork';
 import Volume from './VirtualMachineVolume';
 import SSHKey from './VirtualMachineSSHKey';
@@ -58,7 +57,6 @@ export default {
     SSHKey,
     Network,
     CpuMemory,
-    CpuModel,
     CloudConfig,
     NodeScheduling,
     PodAffinity,
@@ -540,18 +538,6 @@ export default {
 
       return out;
     },
-
-    updateCpuModel(value) {
-      if (!this.spec?.template?.spec?.domain?.cpu) {
-        set(this.spec, 'template.spec.domain.cpu', {});
-      }
-
-      if (value && value !== '') {
-        set(this.spec.template.spec.domain.cpu, 'model', value);
-      } else {
-        delete this.spec.template.spec.domain.cpu.model;
-      }
-    },
   },
 };
 </script>
@@ -884,16 +870,6 @@ export default {
           </div>
         </div>
 
-        <div class="row mb-20">
-          <div class="col span-6">
-            <CpuModel
-              v-model:value="cpuModel"
-              :mode="mode"
-              @update:value="updateCpuModel"
-            />
-          </div>
-        </div>
-
         <div class="row mb-20">
           <a
             v-if="showAdvanced"

pkg/harvester/edit/migration.harvesterhci.io.openstacksource.vue

@@ -1,357 +0,0 @@
-<script>
-import CruResource from '@shell/components/CruResource';
-import Tabbed from '@shell/components/Tabbed';
-import Tab from '@shell/components/Tabbed/Tab';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import { RadioGroup } from '@components/Form/Radio';
-import UnitInput from '@shell/components/form/UnitInput';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import FormValidation from '@shell/mixins/form-validation';
-import { SECRET } from '@shell/config/types';
-import { randomStr } from '@shell/utils/string';
-import { mapGetters } from 'vuex';
-
-export default {
-  name: 'EditOpenstackSource',
-
-  emits: ['update:value'],
-
-  components: {
-    CruResource,
-    Tabbed,
-    Tab,
-    LabeledInput,
-    LabeledSelect,
-    NameNsDescription,
-    RadioGroup,
-    UnitInput
-  },
-
-  mixins: [CreateEditView, FormValidation],
-
-  inheritAttrs: false,
-
-  props: {
-    value: {
-      type:     Object,
-      required: true,
-    },
-    mode: {
-      type:     String,
-      required: true,
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    this.allSecrets = await this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET });
-  },
-
-  data() {
-    if (!this.value.spec) this.value.spec = {};
-    if (!this.value.spec.credentials) this.value.spec.credentials = {};
-
-    const initialMode = this.value.spec.credentials.name ? 'existing' : 'new';
-
-    return {
-      allSecrets:      [],
-      authMode:        initialMode,
-
-      newUsername:     '',
-      newPassword:     '',
-      newProjectName:  '',
-      newDomainName:   '',
-      newCaCert:       '',
-
-      // Rules for fields that exist in the value object (Model)
-      fvFormRuleSets: [
-        { path: 'metadata.name', rules: ['nameRequired'] },
-        { path: 'spec.endpoint', rules: ['endpointRequired'] },
-        { path: 'spec.region', rules: ['regionRequired'] },
-      ],
-    };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    authModeOptions() {
-      return [
-        { label: this.t('harvester.addons.vmImport.fields.createSecret'), value: 'new' },
-        { label: this.t('harvester.addons.vmImport.fields.useSecret'), value: 'existing' }
-      ];
-    },
-
-    secretOptions() {
-      const currentNamespace = this.value.metadata.namespace || 'default';
-
-      return this.allSecrets
-        .filter((s) => s.metadata.namespace === currentNamespace)
-        .map((s) => ({
-          label: s.nameDisplay,
-          value: s.metadata.name
-        }));
-    },
-
-    // Define custom rules for the FormValidation mixin
-    fvExtraRules() {
-      return {
-        nameRequired:     (val) => !val ? this.t('validation.required', { key: this.t('harvester.fields.name') }) : undefined,
-        endpointRequired: (val) => !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.openstack.fields.endpoint') }) : undefined,
-        regionRequired:   (val) => !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.openstack.fields.region') }) : undefined,
-      };
-    },
-
-    // Combine mixin validation + conditional manual checks
-    isFormValid() {
-      // Check static fields via Mixin
-      if (!this.fvFormIsValid) {
-        return false;
-      }
-
-      // Check conditional fields
-      if (this.authMode === 'new') {
-        if (!this.newUsername || !this.newPassword) return false;
-        if (!this.newProjectName || !this.newDomainName) return false;
-      } else {
-        if (!this.value.spec.credentials.name) return false;
-      }
-
-      return true;
-    }
-  },
-
-  methods: {
-    usernameRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.username') }) : undefined;
-    },
-    passwordRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.password') }) : undefined;
-    },
-    projectRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.openstack.fields.projectName') }) : undefined;
-    },
-    domainRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.openstack.fields.domainName') }) : undefined;
-    },
-    secretRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.selectSecret') }) : undefined;
-    },
-
-    async saveSource(buttonCb) {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      try {
-        if (this.authMode === 'new') {
-          const secretName = `${ this.value.metadata.name }-creds-${ randomStr(4).toLowerCase() }`;
-          const namespace = this.value.metadata.namespace || 'default';
-
-          const newSecret = await this.$store.dispatch(`${ inStore }/create`, {
-            type:     SECRET,
-            metadata: {
-              name: secretName,
-              namespace
-            }
-          });
-
-          newSecret['_type'] = 'Opaque';
-          newSecret['data'] = {
-            username:     btoa(this.newUsername),
-            password:     btoa(this.newPassword),
-            project_name: btoa(this.newProjectName),
-            domain_name:  btoa(this.newDomainName),
-            ca_cert:      this.newCaCert ? btoa(this.newCaCert) : undefined
-          };
-
-          await newSecret.save();
-
-          this.value.spec.credentials = {
-            name: secretName,
-            namespace
-          };
-        }
-
-        await this.save(buttonCb);
-      } catch (err) {
-        this.errors = [err];
-        buttonCb(false);
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <CruResource
-    :done-route="doneRoute"
-    :resource="value"
-    :mode="mode"
-    :errors="errors"
-    :apply-hooks="applyHooks"
-    :validation-passed="isFormValid"
-    @finish="saveSource"
-    @error="e=>errors=e"
-  >
-    <NameNsDescription
-      :value="value"
-      :mode="mode"
-      :rules="{ name: fvGetAndReportPathRules('metadata.name') }"
-      @update:value="$emit('update:value', $event)"
-    />
-
-    <Tabbed
-      v-bind="$attrs"
-      class="mt-15"
-      :side-tabs="true"
-    >
-      <Tab
-        name="basic"
-        :label="t('harvester.addons.vmImport.titles.basic')"
-        :weight="3"
-      >
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.endpoint"
-              :label="t('harvester.addons.vmImport.openstack.fields.endpoint')"
-              :placeholder="t('harvester.addons.vmImport.openstack.placeholders.endpoint')"
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('spec.endpoint')"
-              required
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.region"
-              :label="t('harvester.addons.vmImport.openstack.fields.region')"
-              :placeholder="t('harvester.addons.vmImport.openstack.placeholders.region')"
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('spec.region')"
-              required
-            />
-          </div>
-        </div>
-      </Tab>
-
-      <Tab
-        name="auth"
-        :label="t('harvester.addons.vmImport.titles.auth')"
-        :weight="2"
-      >
-        <div class="row mb-20">
-          <div class="col span-12">
-            <RadioGroup
-              v-model:value="authMode"
-              name="authMode"
-              :options="authModeOptions"
-              :mode="mode"
-            />
-          </div>
-        </div>
-
-        <div v-if="authMode === 'new'">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newUsername"
-                :label="t('harvester.addons.vmImport.fields.username')"
-                :mode="mode"
-                :rules="[usernameRule]"
-                required
-              />
-            </div>
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newPassword"
-                type="password"
-                :label="t('harvester.addons.vmImport.fields.password')"
-                :mode="mode"
-                :rules="[passwordRule]"
-                required
-              />
-            </div>
-          </div>
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newProjectName"
-                :label="t('harvester.addons.vmImport.openstack.fields.projectName')"
-                :placeholder="t('harvester.addons.vmImport.openstack.placeholders.projectName')"
-                :mode="mode"
-                :rules="[projectRule]"
-                required
-              />
-            </div>
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newDomainName"
-                :label="t('harvester.addons.vmImport.openstack.fields.domainName')"
-                :placeholder="t('harvester.addons.vmImport.openstack.placeholders.domainName')"
-                :mode="mode"
-                :rules="[domainRule]"
-                required
-              />
-            </div>
-          </div>
-          <div class="row mb-20">
-            <div class="col span-12">
-              <LabeledInput
-                v-model:value="newCaCert"
-                type="multiline"
-                :label="t('harvester.addons.vmImport.fields.caCert')"
-                :placeholder="t('harvester.addons.vmImport.placeholders.caCert')"
-                :min-height="100"
-                :mode="mode"
-              />
-            </div>
-          </div>
-        </div>
-
-        <div v-if="authMode === 'existing'">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledSelect
-                v-model:value="value.spec.credentials.name"
-                :options="secretOptions"
-                :label="t('harvester.addons.vmImport.fields.selectSecret')"
-                :mode="mode"
-                :rules="[secretRule]"
-                required
-              />
-            </div>
-          </div>
-        </div>
-      </Tab>
-
-      <Tab
-        name="advanced"
-        :label="t('harvester.addons.vmImport.titles.advanced')"
-        :weight="1"
-      >
-        <div class="row mb-20">
-          <div class="col span-6">
-            <UnitInput
-              v-model:value="value.spec.uploadImageRetryCount"
-              :label="t('harvester.addons.vmImport.openstack.fields.retryCount')"
-              :placeholder="t('harvester.addons.vmImport.openstack.placeholders.retryCount')"
-              suffix="Times"
-              :mode="mode"
-            />
-          </div>
-          <div class="col span-6">
-            <UnitInput
-              v-model:value="value.spec.uploadImageRetryDelay"
-              :label="t('harvester.addons.vmImport.openstack.fields.retryDelay')"
-              :placeholder="t('harvester.addons.vmImport.openstack.placeholders.retryDelay')"
-              suffix="Seconds"
-              :mode="mode"
-            />
-          </div>
-        </div>
-      </Tab>
-    </Tabbed>
-  </CruResource>
-</template>

pkg/harvester/edit/migration.harvesterhci.io.ovasource.vue

@@ -1,322 +0,0 @@
-<script>
-import CruResource from '@shell/components/CruResource';
-import Tabbed from '@shell/components/Tabbed';
-import Tab from '@shell/components/Tabbed/Tab';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import { RadioGroup } from '@components/Form/Radio';
-import UnitInput from '@shell/components/form/UnitInput';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import FormValidation from '@shell/mixins/form-validation';
-import { SECRET } from '@shell/config/types';
-import { randomStr } from '@shell/utils/string';
-import { mapGetters } from 'vuex';
-
-export default {
-  name: 'EditOvaSource',
-
-  emits: ['update:value'],
-
-  components: {
-    CruResource,
-    Tabbed,
-    Tab,
-    LabeledInput,
-    LabeledSelect,
-    NameNsDescription,
-    RadioGroup,
-    UnitInput
-  },
-
-  mixins: [CreateEditView, FormValidation],
-
-  inheritAttrs: false,
-
-  props: {
-    value: {
-      type:     Object,
-      required: true,
-    },
-    mode: {
-      type:     String,
-      required: true,
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    this.allSecrets = await this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET });
-  },
-
-  data() {
-    if (!this.value.spec) this.value.spec = {};
-
-    // Auth is optional for OVA (public URLs).
-    // If credentials.name exists -> Existing.
-    // If not -> None (default).
-    let initialMode = 'none';
-
-    if (this.value.spec.credentials?.name) {
-      initialMode = 'existing';
-    }
-
-    return {
-      allSecrets:      [],
-      authMode:        initialMode,
-
-      newUsername:     '',
-      newPassword:     '',
-      newCaCert:       '', // Key will be "ca.crt"
-
-      // Validation Rules for static fields
-      fvFormRuleSets: [
-        { path: 'metadata.name', rules: ['nameRequired'] },
-        { path: 'spec.url', rules: ['urlRequired'] },
-      ],
-    };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    authModeOptions() {
-      return [
-        { label: this.t('harvester.addons.vmImport.fields.none'), value: 'none' },
-        { label: this.t('harvester.addons.vmImport.fields.createSecret'), value: 'new' },
-        { label: this.t('harvester.addons.vmImport.fields.useSecret'), value: 'existing' }
-      ];
-    },
-
-    secretOptions() {
-      const currentNamespace = this.value.metadata.namespace || 'default';
-
-      return this.allSecrets
-        .filter((s) => s.metadata.namespace === currentNamespace)
-        .map((s) => ({
-          label: s.nameDisplay,
-          value: s.metadata.name
-        }));
-    },
-
-    // Define custom rules for the FormValidation mixin
-    fvExtraRules() {
-      return {
-        nameRequired: (val) => !val ? this.t('validation.required', { key: this.t('harvester.fields.name') }) : undefined,
-        urlRequired:  (val) => !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.ova.fields.url') }) : undefined,
-      };
-    },
-
-    isFormValid() {
-      if (!this.fvFormIsValid) {
-        return false;
-      }
-
-      if (this.authMode === 'new') {
-        // At least a username/password OR a CA cert to be provided.
-        // If the user selected "Create New", they likely intend to enter something.
-        if (!this.newUsername && !this.newPassword && !this.newCaCert) return false;
-      } else if (this.authMode === 'existing') {
-        if (!this.value.spec.credentials?.name) return false;
-      }
-
-      return true;
-    }
-  },
-
-  watch: {
-    authMode(newMode) {
-      if (newMode === 'existing') {
-        // Bind to value.spec.credentials.name for existing credential
-        // Ensure 'credentials' object exists first when selected
-        if (!this.value.spec.credentials) {
-          this.value.spec.credentials = {
-            name:      '',
-            namespace: this.value.metadata.namespace || 'default'
-          };
-        }
-      }
-    }
-  },
-
-  methods: {
-    secretRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.selectSecret') }) : undefined;
-    },
-
-    async saveSource(buttonCb) {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      try {
-        if (this.authMode === 'none') {
-          // Clear any credential reference
-          delete this.value.spec.credentials;
-        } else if (this.authMode === 'new') {
-          const secretName = `${ this.value.metadata.name }-creds-${ randomStr(4).toLowerCase() }`;
-          const namespace = this.value.metadata.namespace || 'default';
-
-          const newSecret = await this.$store.dispatch(`${ inStore }/create`, {
-            type:     SECRET,
-            metadata: {
-              name: secretName,
-              namespace
-            }
-          });
-
-          newSecret['_type'] = 'Opaque';
-          newSecret['data'] = {
-            // Optional fields logic
-            username: this.newUsername ? btoa(this.newUsername) : undefined,
-            password: this.newPassword ? btoa(this.newPassword) : undefined,
-            // vm-import-controller code specifies "ca.crt" with a dot.
-            'ca.crt': this.newCaCert ? btoa(this.newCaCert) : undefined
-          };
-
-          await newSecret.save();
-
-          this.value.spec.credentials = {
-            name: secretName,
-            namespace
-          };
-        }
-
-        await this.save(buttonCb);
-      } catch (err) {
-        this.errors = [err];
-        buttonCb(false);
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <CruResource
-    :done-route="doneRoute"
-    :resource="value"
-    :mode="mode"
-    :errors="errors"
-    :apply-hooks="applyHooks"
-    :validation-passed="isFormValid"
-    @finish="saveSource"
-    @error="e=>errors=e"
-  >
-    <NameNsDescription
-      :value="value"
-      :mode="mode"
-      :rules="{ name: fvGetAndReportPathRules('metadata.name') }"
-      @update:value="$emit('update:value', $event)"
-    />
-
-    <Tabbed
-      v-bind="$attrs"
-      class="mt-15"
-      :side-tabs="true"
-    >
-      <Tab
-        name="basic"
-        :label="t('harvester.addons.vmImport.titles.basic')"
-        :weight="3"
-      >
-        <div class="row mb-20">
-          <div class="col span-12">
-            <LabeledInput
-              v-model:value="value.spec.url"
-              :label="t('harvester.addons.vmImport.ova.fields.url')"
-              :placeholder="t('harvester.addons.vmImport.ova.placeholders.url')"
-              tooltip="Supports HTTP and HTTPS protocols."
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('spec.url')"
-              required
-            />
-          </div>
-        </div>
-      </Tab>
-
-      <Tab
-        name="auth"
-        :label="t('harvester.addons.vmImport.titles.auth')"
-        :weight="2"
-      >
-        <div class="row mb-20">
-          <div class="col span-12">
-            <RadioGroup
-              v-model:value="authMode"
-              name="authMode"
-              :options="authModeOptions"
-              :mode="mode"
-            />
-          </div>
-        </div>
-
-        <div v-if="authMode === 'new'">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newUsername"
-                :label="t('harvester.addons.vmImport.fields.username')"
-                placeholder="(Optional)"
-                :mode="mode"
-              />
-            </div>
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newPassword"
-                type="password"
-                :label="t('harvester.addons.vmImport.fields.password')"
-                placeholder="(Optional)"
-                :mode="mode"
-              />
-            </div>
-          </div>
-          <div class="row mb-20">
-            <div class="col span-12">
-              <LabeledInput
-                v-model:value="newCaCert"
-                type="multiline"
-                :label="t('harvester.addons.vmImport.fields.caCert')"
-                :placeholder="t('harvester.addons.vmImport.placeholders.caCert')"
-                :min-height="100"
-                :mode="mode"
-              />
-            </div>
-          </div>
-        </div>
-
-        <div v-if="authMode === 'existing'">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledSelect
-                v-model:value="value.spec.credentials.name"
-                :options="secretOptions"
-                :label="t('harvester.addons.vmImport.fields.selectSecret')"
-                :mode="mode"
-                :rules="[secretRule]"
-                required
-              />
-            </div>
-          </div>
-        </div>
-      </Tab>
-
-      <Tab
-        name="advanced"
-        :label="t('harvester.addons.vmImport.titles.advanced')"
-        :weight="1"
-      >
-        <div class="row mb-20">
-          <div class="col span-6">
-            <UnitInput
-              v-model:value="value.spec.httpTimeoutSeconds"
-              :label="t('harvester.addons.vmImport.ova.fields.httpTimeout')"
-              placeholder="Default: 600"
-              suffix="Seconds"
-              :mode="mode"
-            />
-          </div>
-        </div>
-      </Tab>
-    </Tabbed>
-  </CruResource>
-</template>

pkg/harvester/edit/migration.harvesterhci.io.virtualmachineimport.vue

@@ -1,570 +0,0 @@
-<script>
-import CruResource from '@shell/components/CruResource';
-import Tabbed from '@shell/components/Tabbed';
-import Tab from '@shell/components/Tabbed/Tab';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import { Checkbox } from '@components/Form/Checkbox';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import FormValidation from '@shell/mixins/form-validation';
-import { STORAGE_CLASS, NETWORK_ATTACHMENT } from '@shell/config/types';
-import { allHash } from '@shell/utils/promise';
-import { MANAGEMENT_NETWORK } from '../mixins/harvester-vm';
-import { VMIMPORT_SOURCE_PROVIDER, VMIMPORT_SOURCE_KINDS } from '../config/types';
-import { HCI } from '../types';
-import { isValidDNSLabelName } from '@pkg/utils/regular';
-import { mapGetters } from 'vuex';
-
-// Full API types for the fetch dispatch
-const VMWARE_SOURCE_TYPE = `${ HCI.MIGRATION }.${ VMIMPORT_SOURCE_KINDS.VMWARE.toLowerCase() }`;
-const OPENSTACK_SOURCE_TYPE = `${ HCI.MIGRATION }.${ VMIMPORT_SOURCE_KINDS.OPENSTACK.toLowerCase() }`;
-const OVA_SOURCE_TYPE = `${ HCI.MIGRATION }.${ VMIMPORT_SOURCE_KINDS.OVA.toLowerCase() }`;
-
-export default {
-  name: 'EditVirtualMachineImport',
-
-  components: {
-    CruResource,
-    Tabbed,
-    Tab,
-    LabeledInput,
-    LabeledSelect,
-    NameNsDescription,
-    Checkbox
-  },
-
-  mixins: [CreateEditView, FormValidation],
-
-  inheritAttrs: false,
-
-  props: {
-    value: {
-      type:     Object,
-      required: true,
-    },
-    mode: {
-      type:     String,
-      required: true,
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    // Fetch all dependencies in parallel to speed up the page load
-    const hash = {
-      storageClasses:   this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
-      networks:         this.$store.dispatch(`${ inStore }/findAll`, { type: NETWORK_ATTACHMENT }),
-      vmwareSources:    this.$store.dispatch(`${ inStore }/findAll`, { type: VMWARE_SOURCE_TYPE }),
-      openstackSources: this.$store.dispatch(`${ inStore }/findAll`, { type: OPENSTACK_SOURCE_TYPE }),
-      ovaSources:       this.$store.dispatch(`${ inStore }/findAll`, { type: OVA_SOURCE_TYPE }).catch(() => []),
-    };
-
-    const res = await allHash(hash);
-
-    this.allStorageClasses = res.storageClasses;
-    this.allNetworks = res.networks;
-    this.vmwareSources = res.vmwareSources;
-    this.openstackSources = res.openstackSources;
-    this.ovaSources = res.ovaSources;
-  },
-
-  data() {
-    // Ensure the spec object exists to prevent 'undefined' errors during rendering
-    if (!this.value.spec) this.value.spec = {};
-    if (!this.value.spec.sourceCluster) this.value.spec.sourceCluster = {};
-    if (!this.value.spec.networkMapping) this.value.spec.networkMapping = [];
-
-    // Detect if in Edit mode by checking the existing kind
-    // This allows to pre-select the correct Provider Type tab
-    let initialProvider = '';
-    const existingKind = this.value.spec.sourceCluster.kind;
-
-    if (existingKind === VMIMPORT_SOURCE_KINDS.VMWARE) initialProvider = VMIMPORT_SOURCE_PROVIDER.VMWARE;
-    else if (existingKind === VMIMPORT_SOURCE_KINDS.OPENSTACK) initialProvider = VMIMPORT_SOURCE_PROVIDER.OPENSTACK;
-    else if (existingKind === VMIMPORT_SOURCE_KINDS.OVA) initialProvider = VMIMPORT_SOURCE_PROVIDER.OVA;
-
-    // Construct the unique key (Kind/Namespace/Name) if we are editing an existing resource
-    let initialSourceKey = null;
-
-    if (this.value.spec.sourceCluster.name) {
-      initialSourceKey = `${ existingKind }/${ this.value.spec.sourceCluster.namespace }/${ this.value.spec.sourceCluster.name }`;
-    }
-
-    return {
-      allStorageClasses: [],
-      allNetworks:       [],
-      vmwareSources:     [],
-      openstackSources:  [],
-      ovaSources:        [],
-
-      // UI State
-      sourceProviderType: initialProvider,
-      selectedSourceKey:  initialSourceKey,
-
-      // Static Options
-      providerTypeOptions: [
-        { label: 'VMware', value: VMIMPORT_SOURCE_PROVIDER.VMWARE },
-        { label: 'OpenStack', value: VMIMPORT_SOURCE_PROVIDER.OPENSTACK },
-        { label: 'OVA', value: VMIMPORT_SOURCE_PROVIDER.OVA }
-      ],
-      diskBusOptions: [
-        // Allow resetting selection / reset to the default behavior (sending null/empty)
-        { label: this.t('harvester.addons.vmImport.options.useDefault'), value: '' },
-        { label: 'VirtIO', value: 'virtio' },
-        { label: 'SCSI', value: 'scsi' },
-        { label: 'SATA', value: 'sata' },
-        { label: 'USB', value: 'usb' },
-      ],
-      interfaceModelOptions: [
-        // Allow resetting selection / reset to the default behavior (sending null/empty)
-        { label: this.t('harvester.addons.vmImport.options.useDefault'), value: '' },
-        { label: 'VirtIO', value: 'virtio' },
-        { label: 'e1000', value: 'e1000' },
-        { label: 'e1000e', value: 'e1000e' },
-        { label: 'ne2k_pci', value: 'ne2k_pci' },
-        { label: 'pcnet', value: 'pcnet' },
-        { label: 'rtl8139', value: 'rtl8139' },
-      ],
-
-      fvFormRuleSets: [
-        { path: 'metadata.name', rules: ['nameRequired'] },
-        { path: 'spec.virtualMachineName', rules: ['vmNameRequired', 'rfc1123'] },
-      ],
-    };
-  },
-
-  created() {
-    if (this.registerBeforeHook) {
-      this.registerBeforeHook(this.updateBeforeSave);
-    }
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    // Return only the sources that match the selected Provider Type (VMware or OpenStack)
-    sourceOptions() {
-      let list = [];
-
-      if (this.sourceProviderType === VMIMPORT_SOURCE_PROVIDER.VMWARE) {
-        list = this.vmwareSources;
-      } else if (this.sourceProviderType === VMIMPORT_SOURCE_PROVIDER.OPENSTACK) {
-        list = this.openstackSources;
-      } else if (this.sourceProviderType === VMIMPORT_SOURCE_PROVIDER.OVA) {
-        list = this.ovaSources;
-      }
-
-      return list.map((s) => {
-        // Fallback for API version/kind if missing on the object
-        let kind = s.kind;
-
-        if (!kind) {
-          if (this.sourceProviderType === VMIMPORT_SOURCE_PROVIDER.VMWARE) kind = VMIMPORT_SOURCE_KINDS.VMWARE;
-          else if (this.sourceProviderType === VMIMPORT_SOURCE_PROVIDER.OPENSTACK) kind = VMIMPORT_SOURCE_KINDS.OPENSTACK;
-          else if (this.sourceProviderType === VMIMPORT_SOURCE_PROVIDER.OVA) kind = VMIMPORT_SOURCE_KINDS.OVA;
-        }
-
-        const apiVersion = s.apiVersion || `${ HCI.MIGRATION }/v1beta1`;
-
-        return {
-          label: s.metadata.name,
-          value: `${ kind }/${ s.metadata.namespace }/${ s.metadata.name }`,
-          // We attach the raw metadata so we can easily populate the spec later without re-finding the object
-          raw:   {
-            kind,
-            apiVersion,
-            name:      s.metadata.name,
-            namespace: s.metadata.namespace
-          }
-        };
-      });
-    },
-
-    fvExtraRules() {
-      return {
-        nameRequired:   (val) => !val ? this.t('validation.required', { key: this.t('harvester.fields.name') }) : undefined,
-        vmNameRequired: (val) => !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.vmName') }) : undefined,
-        rfc1123:
-        (val) => {
-          if (val && !isValidDNSLabelName(val)) {
-            return this.t('harvester.addons.vmImport.errors.rfc1123');
-          }
-
-          return undefined;
-        }
-      };
-    },
-
-    // Perform various form validations before allowing to submit
-    isFormValid() {
-      // Check VM Name is valid
-      const nameError = this.fvNameRule(this.value.spec.virtualMachineName);
-
-      if (nameError) return false;
-
-      // Check mandatory fields in Basics
-      if (!this.value.spec.virtualMachineName) return false;
-      if (!this.selectedSourceKey) return false;
-
-      // Check Network Mappings
-      // If any row is missing source or destination, the form is invalid.
-      const networks = this.value.spec.networkMapping || [];
-      const hasInvalidRow = networks.some((row) => !row.sourceNetwork || !row.destinationNetwork);
-
-      if (hasInvalidRow) return false;
-
-      return true;
-    },
-
-    isNetworkTabInvalid() {
-      const networks = this.value.spec.networkMapping || [];
-      // Only error if a row exists AND it is missing fields
-
-      return networks.some((row) => !row.sourceNetwork || !row.destinationNetwork);
-    },
-
-    // Filter out internal storage classes
-    // to prevent selecting a class that might cause the import to fail
-    storageClassOptions() {
-      return this.allStorageClasses
-        .filter((sc) => {
-          const isInternal = sc.parameters?.['harvesterhci.io/isInternalStorageClass'] === 'true';
-
-          return !isInternal;
-        })
-        .map((sc) => ({
-          label: sc.nameDisplay,
-          value: sc.id
-        }));
-    },
-
-    networkOptions() {
-      const mgmtOption = {
-        label: 'Management Network',
-        value: MANAGEMENT_NETWORK
-      };
-
-      const vlanOptions = this.allNetworks.map((n) => ({
-        label: n.nameDisplay || n.metadata.name,
-        value: n.id
-      }));
-
-      return [mgmtOption, ...vlanOptions];
-    }
-  },
-
-  methods: {
-    // Clear the selected cluster if the user switches providers (e.g. VMware -> OpenStack)
-    // Prevents submitting a VMware cluster name while the kind is OpenStack
-    onProviderTypeChange(newType) {
-      this.selectedSourceKey = null;
-      this.value.spec.sourceCluster = {};
-    },
-
-    // Update the sourceCluster object based on the single dropdown selection
-    updateSource(key) {
-      this.selectedSourceKey = key;
-      const selectedOption = this.sourceOptions.find((o) => o.value === key);
-
-      if (selectedOption) {
-        const {
-          kind, apiVersion, name, namespace
-        } = selectedOption.raw;
-
-        this.value.spec.sourceCluster = {
-          kind,
-          apiVersion,
-          name,
-          namespace
-        };
-      } else {
-        this.value.spec.sourceCluster = {};
-      }
-    },
-
-    addNetworkMapping() {
-      this.value.spec.networkMapping.push({
-        sourceNetwork:         '',
-        destinationNetwork:    '',
-        networkInterfaceModel: ''
-      });
-    },
-
-    removeNetworkMapping(index) {
-      if (!this.value?.spec?.networkMapping) {
-        return;
-      }
-
-      if (index >= 0 && index < this.value.spec.networkMapping.length) {
-        this.value.spec.networkMapping.splice(index, 1);
-      }
-    },
-
-    requiredRule(val) {
-      if (!val) {
-        return this.t('validation.required', { key: this.t('generic.value') });
-      }
-
-      return undefined;
-    },
-
-    // Validates that the input follows Kubernetes Naming Rules (RFC 1123).
-    // If the source VM has uppercase letters or spaces, the user must be warned
-    // that they cannot import it until they rename it on the source. See:
-    // https://docs.harvesterhci.io/v1.6/advanced/addons/vmimport/#source-virtual-machine-name-is-not-rfc1123-compliant
-    fvNameRule(val) {
-      if (!val) return undefined; // 'Required' check handles empty state separately
-
-      // valid RFC 1123
-      if (!isValidDNSLabelName(val)) {
-        return this.t('harvester.addons.vmImport.errors.rfc1123');
-      }
-
-      return undefined;
-    },
-
-    updateBeforeSave() {
-      // If networkMapping exists, filter out the "Management Network" rows
-      // Let the vm-import-controller set the default network mapping
-      if (this.value.spec.networkMapping) {
-        this.value.spec.networkMapping = this.value.spec.networkMapping.filter((row) => {
-          return row.destinationNetwork !== MANAGEMENT_NETWORK;
-        });
-      }
-    },
-
-    // Only handles complex logic that doesn't fit into simple field rules
-    async saveOverride(buttonCb) {
-      const errors = [];
-
-      this.errors = [];
-
-      // Validate Provider Type
-      if (!this.sourceProviderType) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.sourceProvider') }));
-      }
-
-      // Validate Network Tab
-      if (this.isNetworkTabInvalid) {
-        errors.push(this.t('harvester.addons.vmImport.errors.networkMappingRequired'));
-      }
-
-      // Return immediately in case of an error, avoid that `this.save()` runs, preventing `updateBeforeSave` from resetting data.
-      if (errors.length > 0) {
-        this.errors = errors;
-        buttonCb(false);
-
-        return;
-      }
-
-      // Only proceed if valid
-      this.save(buttonCb);
-    },
-  }
-};
-</script>
-
-<template>
-  <CruResource
-    :done-route="doneRoute"
-    :resource="value"
-    :mode="mode"
-    :errors="errors"
-    :apply-hooks="applyHooks"
-    :validation-passed="fvFormIsValid"
-    @finish="saveOverride"
-    @error="e=>errors=e"
-  >
-    <NameNsDescription
-      :value="value"
-      :mode="mode"
-      :rules="{ name: fvGetAndReportPathRules('metadata.name') }"
-      @update:value="$emit('update:value', $event)"
-    />
-
-    <Tabbed
-      v-bind="$attrs"
-      class="mt-15"
-      :side-tabs="true"
-    >
-      <Tab
-        name="basic"
-        :label="t('harvester.addons.vmImport.titles.basic')"
-        :weight="3"
-      >
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="sourceProviderType"
-              :options="providerTypeOptions"
-              :label="t('harvester.addons.vmImport.fields.sourceProvider')"
-              :mode="mode"
-              :rules="[requiredRule]"
-              required
-              @update:value="onProviderTypeChange"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledSelect
-              :value="selectedSourceKey"
-              :options="sourceOptions"
-              :label="t('harvester.addons.vmImport.fields.sourceCluster')"
-              :placeholder="sourceProviderType ? t('harvester.addons.vmImport.placeholders.selectCluster') : t('harvester.addons.vmImport.placeholders.selectProviderFirst')"
-              :disabled="!sourceProviderType"
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('selectedSourceKey')"
-              required
-              @update:value="updateSource"
-            />
-          </div>
-        </div>
-
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.virtualMachineName"
-              :label="t('harvester.addons.vmImport.fields.vmName')"
-              :placeholder="t('harvester.addons.vmImport.placeholders.matchSource')"
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('spec.virtualMachineName')"
-              required
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="value.spec.storageClass"
-              :options="storageClassOptions"
-              :label="t('harvester.addons.vmImport.fields.targetStorageClass')"
-              :mode="mode"
-            />
-          </div>
-        </div>
-      </Tab>
-
-      <Tab
-        name="networking"
-        :label="t('harvester.addons.vmImport.titles.networking')"
-        :weight="2"
-        :error="isNetworkTabInvalid"
-      >
-        <div
-          v-for="(row, i) in value.spec.networkMapping"
-          :key="i"
-          class="network-row box mb-10"
-        >
-          <div class="row">
-            <div class="col span-4">
-              <LabeledInput
-                v-model:value="row.sourceNetwork"
-                :label="t('harvester.addons.vmImport.fields.sourceNetwork')"
-                :mode="mode"
-                :rules="[requiredRule]"
-                required
-              />
-            </div>
-            <div class="col span-4">
-              <LabeledSelect
-                v-model:value="row.destinationNetwork"
-                :options="networkOptions"
-                :label="t('harvester.addons.vmImport.fields.destNetwork')"
-                :mode="mode"
-                :rules="[requiredRule]"
-                required
-              />
-            </div>
-            <div class="col span-3">
-              <LabeledSelect
-                v-model:value="row.networkInterfaceModel"
-                :options="interfaceModelOptions"
-                :label="t('harvester.addons.vmImport.fields.interfaceModel')"
-                :mode="mode"
-              />
-            </div>
-            <div class="col span-1 remove-btn-container">
-              <button
-                type="button"
-                class="btn role-link"
-                @click="removeNetworkMapping(i)"
-              >
-                {{ t('harvester.addons.vmImport.actions.remove') }}
-              </button>
-            </div>
-          </div>
-        </div>
-        <button
-          type="button"
-          class="btn role-secondary"
-          @click="addNetworkMapping"
-        >
-          {{ t('harvester.addons.vmImport.actions.addNetwork') }}
-        </button>
-      </Tab>
-
-      <Tab
-        name="advanced"
-        :label="t('harvester.addons.vmImport.titles.advanced')"
-        :weight="1"
-      >
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.folder"
-              :label="t('harvester.addons.vmImport.fields.folder')"
-              :placeholder="t('harvester.addons.vmImport.placeholders.folderExample')"
-              :mode="mode"
-            />
-          </div>
-        </div>
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="value.spec.defaultDiskBusType"
-              :options="diskBusOptions"
-              :label="t('harvester.addons.vmImport.fields.diskBus')"
-              :mode="mode"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="value.spec.defaultNetworkInterfaceModel"
-              :options="interfaceModelOptions"
-              :label="t('harvester.addons.vmImport.fields.defaultInterface')"
-              :mode="mode"
-            />
-          </div>
-        </div>
-        <div class="row">
-          <div class="col span-12">
-            <Checkbox
-              v-model:value="value.spec.skipPreflightChecks"
-              :label="t('harvester.addons.vmImport.fields.skipPreflight')"
-              :mode="mode"
-            />
-            <Checkbox
-              v-model:value="value.spec.forcePowerOff"
-              :label="t('harvester.addons.vmImport.fields.forcePowerOff')"
-              :mode="mode"
-              class="mt-10"
-            />
-          </div>
-        </div>
-      </Tab>
-    </Tabbed>
-  </CruResource>
-</template>
-
-<style lang="scss" scoped>
-.network-row {
-  border: 1px solid var(--border);
-  padding: 10px;
-  border-radius: var(--border-radius);
-  background: var(--body-bg);
-}
-.remove-btn-container {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-</style>

pkg/harvester/edit/migration.harvesterhci.io.vmwaresource.vue

@@ -1,302 +0,0 @@
-<script>
-import CruResource from '@shell/components/CruResource';
-import Tabbed from '@shell/components/Tabbed';
-import Tab from '@shell/components/Tabbed/Tab';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import { RadioGroup } from '@components/Form/Radio';
-import CreateEditView from '@shell/mixins/create-edit-view';
-import FormValidation from '@shell/mixins/form-validation';
-import { SECRET } from '@shell/config/types';
-import { randomStr } from '@shell/utils/string';
-import { mapGetters } from 'vuex';
-
-export default {
-  name: 'EditVmwareSource',
-
-  // Declare the event, fixes a console warning
-  emits: ['update:value'],
-
-  components: {
-    CruResource,
-    Tabbed,
-    Tab,
-    LabeledInput,
-    LabeledSelect,
-    NameNsDescription,
-    RadioGroup,
-  },
-
-  mixins: [CreateEditView, FormValidation],
-
-  inheritAttrs: false,
-
-  props: {
-    value: {
-      type:     Object,
-      required: true,
-    },
-    mode: {
-      type:     String,
-      required: true,
-    },
-  },
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    this.allSecrets = await this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET });
-  },
-
-  data() {
-    if (!this.value.spec) this.value.spec = {};
-    if (!this.value.spec.credentials) this.value.spec.credentials = {};
-
-    const initialMode = this.value.spec.credentials.name ? 'existing' : 'new';
-
-    return {
-      allSecrets:      [],
-      authMode:        initialMode,
-      newUsername:     '',
-      newPassword:     '',
-      newCaCert:       '',
-
-      fvFormRuleSets: [
-        { path: 'metadata.name', rules: ['nameRequired'] },
-        { path: 'spec.endpoint', rules: ['endpointRequired'] },
-        { path: 'spec.dc', rules: ['dcRequired'] },
-      ],
-    };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    authModeOptions() {
-      return [
-        { label: this.t('harvester.addons.vmImport.fields.createSecret'), value: 'new' },
-        { label: this.t('harvester.addons.vmImport.fields.useSecret'), value: 'existing' }
-      ];
-    },
-
-    secretOptions() {
-      const currentNamespace = this.value.metadata.namespace || 'default';
-
-      return this.allSecrets
-        .filter((s) => s.metadata.namespace === currentNamespace)
-        .map((s) => ({
-          label: s.nameDisplay,
-          value: s.metadata.name
-        }));
-    },
-
-    // Define custom rules for the FormValidation mixin
-    fvExtraRules() {
-      return {
-        nameRequired:     (val) => !val ? this.t('validation.required', { key: this.t('harvester.fields.name') }) : undefined,
-        endpointRequired: (val) => !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.vmware.fields.endpoint') }) : undefined,
-        dcRequired:       (val) => !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.vmware.fields.datacenter') }) : undefined,
-      };
-    },
-
-    isFormValid() {
-      if (!this.fvFormIsValid) {
-        return false;
-      }
-
-      if (this.authMode === 'new') {
-        if (!this.newUsername || !this.newPassword) return false;
-      } else {
-        if (!this.value.spec.credentials.name) return false;
-      }
-
-      return true;
-    }
-  },
-
-  methods: {
-    usernameRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.username') }) : undefined;
-    },
-    passwordRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.password') }) : undefined;
-    },
-    secretRule(val) {
-      return !val ? this.t('validation.required', { key: this.t('harvester.addons.vmImport.fields.selectSecret') }) : undefined;
-    },
-
-    async saveSource(buttonCb) {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-
-      try {
-        if (this.authMode === 'new') {
-          const secretName = `${ this.value.metadata.name }-creds-${ randomStr(4).toLowerCase() }`;
-          const namespace = this.value.metadata.namespace || 'default';
-
-          // Create the model with the correct Schema ID (SECRET)
-          const newSecret = await this.$store.dispatch(`${ inStore }/create`, {
-            type:     SECRET,
-            metadata: {
-              name: secretName,
-              namespace
-            }
-          });
-
-          // Use '_type' to set the Kubernetes 'type' field.
-          newSecret['_type'] = 'Opaque';
-
-          // base64 encode the data
-          newSecret['data'] = {
-            username: btoa(this.newUsername),
-            password: btoa(this.newPassword),
-            // Only include CA cert if the user provided one
-            caCert:   this.newCaCert ? btoa(this.newCaCert) : undefined
-          };
-
-          await newSecret.save();
-
-          // Link the new secret to the Source
-          this.value.spec.credentials = {
-            name: secretName,
-            namespace
-          };
-        }
-
-        await this.save(buttonCb);
-      } catch (err) {
-        this.errors = [err];
-        buttonCb(false);
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <CruResource
-    :done-route="doneRoute"
-    :resource="value"
-    :mode="mode"
-    :errors="errors"
-    :apply-hooks="applyHooks"
-    :validation-passed="isFormValid"
-    @finish="saveSource"
-    @error="e=>errors=e"
-  >
-    <NameNsDescription
-      :value="value"
-      :mode="mode"
-      :rules="{ name: fvGetAndReportPathRules('metadata.name') }"
-      @update:value="$emit('update:value', $event)"
-    />
-
-    <Tabbed
-      v-bind="$attrs"
-      class="mt-15"
-      :side-tabs="true"
-    >
-      <Tab
-        name="basic"
-        :label="t('harvester.addons.vmImport.titles.basic')"
-        :weight="2"
-      >
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.endpoint"
-              :label="t('harvester.addons.vmImport.vmware.fields.endpoint')"
-              :placeholder="t('harvester.addons.vmImport.vmware.placeholders.endpoint')"
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('spec.endpoint')"
-              required
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="value.spec.dc"
-              :label="t('harvester.addons.vmImport.vmware.fields.datacenter')"
-              :placeholder="t('harvester.addons.vmImport.vmware.placeholders.datacenter')"
-              :tooltip="t('harvester.addons.vmImport.vmware.tooltips.datacenter')"
-              :mode="mode"
-              :rules="fvGetAndReportPathRules('spec.dc')"
-              required
-            />
-          </div>
-        </div>
-      </Tab>
-
-      <Tab
-        name="auth"
-        :label="t('harvester.addons.vmImport.titles.auth')"
-        :weight="1"
-      >
-        <div class="row mb-20">
-          <div class="col span-12">
-            <RadioGroup
-              v-model:value="authMode"
-              name="authMode"
-              :options="authModeOptions"
-              :mode="mode"
-            />
-          </div>
-        </div>
-
-        <div v-if="authMode === 'new'">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newUsername"
-                :label="t('harvester.addons.vmImport.fields.username')"
-                :mode="mode"
-                :rules="[usernameRule]"
-                required
-              />
-            </div>
-            <div class="col span-6">
-              <LabeledInput
-                v-model:value="newPassword"
-                type="password"
-                :label="t('harvester.addons.vmImport.fields.password')"
-                :mode="mode"
-                :rules="[passwordRule]"
-                required
-              />
-            </div>
-          </div>
-          <div class="row mb-20">
-            <div class="col span-12">
-              <LabeledInput
-                v-model:value="newCaCert"
-                type="multiline"
-                :label="t('harvester.addons.vmImport.fields.caCert')"
-                :placeholder="t('harvester.addons.vmImport.placeholders.caCert')"
-                :min-height="100"
-                :mode="mode"
-              />
-            </div>
-          </div>
-
-          <div class="text-muted">
-            Note: A new Kubernetes Secret will be created to store these credentials.
-          </div>
-        </div>
-
-        <div v-if="authMode === 'existing'">
-          <div class="row mb-20">
-            <div class="col span-6">
-              <LabeledSelect
-                v-model:value="value.spec.credentials.name"
-                :options="secretOptions"
-                :label="t('harvester.addons.vmImport.fields.selectSecret')"
-                :mode="mode"
-                :rules="[secretRule]"
-                required
-              />
-            </div>
-          </div>
-        </div>
-      </Tab>
-    </Tabbed>
-  </CruResource>
-</template>

pkg/harvester/l10n/en-us.yaml

@@ -20,7 +20,6 @@ nav:
     Monitoring: Monitoring
     Logging: Logging
     'Monitoring and Logging': Monitoring and Logging
-    vmimport: Virtual Machine Imports
 
 resourceTable:
   groupBy:
@@ -164,11 +163,6 @@ harvester:
       vmNetwork: Virtual Machine Network
       macAddress: MAC Address
       macAddressTooltip: If left blank, the MAC address will be automatically generated.
-    insertCdRomVolume:
-      success: '{ imageName } is inserted into device { deviceName }.'
-      title: Insert Image
-      image: Image
-      actionLabel: Insert Image
     cpuMemoryHotplug:
       success: 'CPU and Memory are updated to the virtual machine { vm }.'
       title: Edit CPU and Memory
@@ -195,16 +189,12 @@ harvester:
       title: Restart Virtual Machine
       tip: Restart the virtual machine for configuration changes to take effect.
       cancel: Save
-
   notification:
     title:
       succeed: Succeed
       info: Info
       warning: Warning
       error: Error
-    restartRequired:
-      title: '{count} {count, plural, =1 {Virtual Machine is} other {Virtual Machines are}} Pending Restart'
-      message: 'Please restart { vmNames } to apply updated configurations'
   action:
     createVM: Create Virtual Machine
     start: Start
@@ -305,17 +295,6 @@ harvester:
     totalSnapshotQuota: Total Snapshot Quota
     storageClass: Storage Class
     restore: Restore
-    vmImportSourceVm: Source VM
-    vmImportSourceCluster: Source Cluster
-    vmImportStatus: Import Status
-    vmImportSourceVDatacenter: Datacenter
-    vmImportSourceVEndpoint: Endpoint
-    vmImportSourceVClusterStatus: Cluster Status
-    vmImportSourceORegion: Region
-    vmImportSourceOEndpoint: Endpoint
-    vmImportSourceOClusterStatus: Cluster Status
-    vmImportSourceOVAUrl: URL
-    vmImportSourceOVAStatus: Status
   tab:
     volume: Volumes
     network: Networks
@@ -378,9 +357,6 @@ harvester:
     claimError: Error enabling passthrough on {name}
     unclaimError: Error disabling passthrough on {name}
     cantUnclaim: You cannot disable passthrough on a device claimed by another user.
-    detachWarning:
-      title: Cannot Disable Passthrough
-      message: Please detach the device from the VM and save it first before disabling passthrough.
     enableGroup: Enable Group
     disableGroup: Disable Group
     labelRequired: "This rule should not be manually altered: it ensures that the PCI devices selected for this virtual machine are available on the virtual machine's host."
@@ -622,10 +598,6 @@ harvester:
   virtualMachine:
     label: Virtual Machines
     osType: OS Type
-    cpuModel:
-      label: CPU Model
-      fetchError: 'Failed to load CPU model configuration: {error}'
-      optionLabel: "{modelName} ({count} {count, plural, one {node} other {nodes}})"
     hotplug:
       title: Enable CPU and memory hotplug
       tooltip: The default maximum CPU and maximum memory are {hotPlugTimes} times based on CPU and memory.
@@ -636,10 +608,6 @@ harvester:
         title: 'Are you sure that you want to detach volume {name}?'
         actionLabel: Detach Volume
         success: 'Volume { name } is detached successfully.'
-      ejectCdRomVolume:
-        title: 'Are you sure that you want to eject image from device {name}?'
-        actionLabel: Eject Image
-        success: 'Image from device { name } is ejected successfully.'
       detachNIC:
         title: 'Are you sure that you want to detach network interface {name}?'
         actionLabel: Detach Network Interface
@@ -746,7 +714,6 @@ harvester:
       unmount:
         title: Are you sure?
         message: Are you sure you want to unmount this volume?
-      emptyImage: No media
     network:
       title: Network
       addNetwork: Add Network
@@ -1018,9 +985,7 @@ harvester:
     createTitle: Create Schedule
     createButtonText: Create Schedule
     scheduleType: Virtual Machine Schedule Type
-    cron:
-      label: Cron Schedule
-      editButton: Edit
+    cron: Cron Schedule
     detail:
       namespace: Namespace
       sourceVM: Source Virtual Machine
@@ -1313,10 +1278,7 @@ harvester:
       deleteImage: Please select an image to delete.
       deleteSuccess: "{name} deleted successfully."
       imagePreloadStrategy: Image Preload Strategy
-      nodeUpgradeOption: Node Upgrade Option
       restoreVM: Restore VM
-      strategy: Strategy
-      pauseNodes: Pause Nodes
       strategyType: Strategy Type
       concurrency: Concurrency
     harvesterMonitoring:
@@ -1332,6 +1294,12 @@ 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.
@@ -1602,84 +1570,10 @@ harvester:
       '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
-        auth: Authentication
         pvc: Volume
-        networking: Network Mapping
-        advanced: Advanced
-      labels:
-        vmimport: Virtual Machine Import
-        vmimportSourceVMWare: Source VMWare
-        vmimportSourceOpenStack: Source OpenStack
-        vmimportSourceOVA: Source OVA
-      fields:
-        sourceProvider: Source Provider Type
-        sourceCluster: Source Cluster
-        vmName: VM Name
-        targetStorageClass: Target Storage Class
-        sourceNetwork: Source Network Name
-        destNetwork: Destination Network
-        interfaceModel: Interface Model
-        folder: Folder
-        diskBus: Default Disk Bus
-        defaultInterface: Default Network Interface
-        skipPreflight: Skip Preflight Checks
-        forcePowerOff: Force Power Off Source VM
-        username: Username
-        password: Password
-        caCert: CA Certificate (PEM)
-        selectSecret: Select Secret
-        createSecret: Create New Credentials
-        useSecret: Use Existing Secret
-        none: None (Public URL)
-      placeholders:
-        selectCluster: Select a cluster...
-        selectProviderFirst: Select a provider type first
-        matchSource: Must match the name in the source cluster
-        folderExample: e.g. /Datacenters/DC1/vm
-        caCert: "-----BEGIN CERTIFICATE----- ..."
-      options:
-        useDefault: Use Default
-      actions:
-        addNetwork: Add Network Mapping
-        remove: Remove
-      errors:
-        rfc1123: 'Invalid format. Name must be lowercase, alphanumeric, and cannot contain spaces (e.g. "my-vm-1"). If your Source VM name does not match this, you must rename it on the Source cluster first.'
-        networkMappingRequired: Every Network Mapping row must have a Source and Destination selected.
-      openstack:
-        fields:
-          endpoint: Identity Service Endpoint
-          region: Region
-          projectName: Project Name
-          domainName: Domain Name
-          retryCount: Upload Image Retry Count
-          retryDelay: Upload Image Retry Delay
-        placeholders:
-          endpoint: "e.g. https://devstack/identity"
-          region: e.g. RegionOne
-          projectName: e.g. admin
-          domainName: e.g. default
-          retryCount: "Default: 30"
-          retryDelay: "Default: 10"
-      vmware:
-        fields:
-          endpoint: vCenter Endpoint
-          datacenter: Datacenter
-        placeholders:
-          endpoint: "e.g. https://vscim/sdk"
-          datacenter: e.g. DC0
-        tooltips:
-          datacenter: The exact name of the Datacenter object in vCenter
-      ova:
-        fields:
-          url: OVA URL
-          httpTimeout: HTTP Timeout
-        placeholders:
-          url: "e.g. https://download.example.com/images/my-vm.ova"
-
     rancherVcluster:
       accessRancher: Access the Rancher Dashboard
       hostname: Hostname
@@ -1845,9 +1739,6 @@ harvester:
   vgpu:
     label: vGPU Devices
     noPermission: Please contact system administrator to add Harvester add-ons first.
-    detachWarning:
-      title: Cannot Disable vGPU
-      message: Please detach the device from the VM and save it first before disabling this vGPU device.
     goSetting:
       prefix: The nvidia-driver-toolkit add-on is not enabled, click
       middle: here
@@ -1882,9 +1773,6 @@ harvester:
     claimError: Error enabling passthrough on {name}
     unclaimError: Error disabling passthrough on {name}
     cantUnclaim: You cannot disable passthrough on a device claimed by another user.
-    detachWarning:
-      title: Cannot Disable Passthrough
-      message: Please detach the device from the VM and save it first before disabling passthrough.
     enablePassthroughWarning: 'Please re-enable the USB device if the device path changes in the following situations:<br/>&nbsp1) Re-plugging the USB device.<br/>&nbsp2) Rebooting the node.<br/><br/>An incorrect device path may cause passthrough to fail.'
 
   harvesterVlanConfigMigrateDialog:

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

@@ -64,10 +64,6 @@ export default {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const rows = this.$store.getters[`${ inStore }/all`](HCI.PCI_DEVICE);
 
-      rows.forEach((row) => {
-        row.allowDisable = true;
-      });
-
       return rows;
     }
   },

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

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

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

@@ -65,10 +65,6 @@ export default {
       const vGpuDevices = this.$store.getters[`${ inStore }/all`](HCI.VGPU_DEVICE) || [];
       const srioVGpuDevices = this.$store.getters[`${ inStore }/all`](HCI.SR_IOVGPU_DEVICE) || [];
 
-      vGpuDevices.forEach((row) => {
-        row.allowDisable = true;
-      });
-
       if (this.hasSRIOVGPUSchema) {
         return vGpuDevices.filter((device) => !!srioVGpuDevices.find((s) => s.isEnabled && s.spec?.nodeName === device.spec?.nodeName));
       }

pkg/harvester/list/harvesterhci.io.migration.openstacksource.vue

@@ -1,60 +0,0 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
-import Loading from '@shell/components/Loading';
-import { SCHEMA } from '@shell/config/types';
-import { HCI } from '../types';
-
-const schema = {
-  id:         HCI.VMIMPORT_SOURCE_O,
-  type:       SCHEMA,
-  attributes: {
-    kind:       HCI.VMIMPORT_SOURCE_O,
-    namespaced: true
-  },
-  metadata: { name: HCI.VMIMPORT_SOURCE_O },
-};
-
-export default {
-  name:         'HarvesterVMImportSourceO',
-  components:   { ResourceTable, Loading },
-  inheritAttrs: false,
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    this.rows = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIMPORT_SOURCE_O });
-
-    const configSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.VMIMPORT_SOURCE_O);
-
-    if (!configSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post')) {
-      this.$store.dispatch('type-map/configureType', { match: HCI.VMIMPORT_SOURCE_O, isCreatable: false });
-    }
-  },
-
-  data() {
-    return { rows: [] };
-  },
-
-  computed: {
-    schema() {
-      return schema;
-    }
-  },
-
-  typeDisplay() {
-    return this.$store.getters['type-map/labelFor'](schema, 99);
-  }
-};
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <ResourceTable
-    v-else
-    v-bind="$attrs"
-    :groupable="true"
-    :schema="schema"
-    :rows="rows"
-    key-field="_key"
-  />
-</template>

pkg/harvester/list/harvesterhci.io.migration.virtualmachineimport.vue

@@ -1,60 +0,0 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
-import Loading from '@shell/components/Loading';
-import { SCHEMA } from '@shell/config/types';
-import { HCI } from '../types';
-
-const schema = {
-  id:         HCI.VMIMPORT,
-  type:       SCHEMA,
-  attributes: {
-    kind:       HCI.VMIMPORT,
-    namespaced: true
-  },
-  metadata: { name: HCI.VMIMPORT },
-};
-
-export default {
-  name:         'HarvesterVMImportVirtualMachine',
-  components:   { ResourceTable, Loading },
-  inheritAttrs: false,
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    this.rows = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIMPORT });
-
-    const configSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.VMIMPORT);
-
-    if (!configSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post')) {
-      this.$store.dispatch('type-map/configureType', { match: HCI.VMIMPORT, isCreatable: false });
-    }
-  },
-
-  data() {
-    return { rows: [] };
-  },
-
-  computed: {
-    schema() {
-      return schema;
-    }
-  },
-
-  typeDisplay() {
-    return this.$store.getters['type-map/labelFor'](schema, 99);
-  }
-};
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <ResourceTable
-    v-else
-    v-bind="$attrs"
-    :groupable="true"
-    :schema="schema"
-    :rows="rows"
-    key-field="_key"
-  />
-</template>

pkg/harvester/list/harvesterhci.io.migration.vmwaresource.vue

@@ -1,60 +0,0 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
-import Loading from '@shell/components/Loading';
-import { SCHEMA } from '@shell/config/types';
-import { HCI } from '../types';
-
-const schema = {
-  id:         HCI.VMIMPORT_SOURCE_V,
-  type:       SCHEMA,
-  attributes: {
-    kind:       HCI.VMIMPORT_SOURCE_V,
-    namespaced: true
-  },
-  metadata: { name: HCI.VMIMPORT_SOURCE_V },
-};
-
-export default {
-  name:         'HarvesterVMImportSourceV',
-  components:   { ResourceTable, Loading },
-  inheritAttrs: false,
-
-  async fetch() {
-    const inStore = this.$store.getters['currentProduct'].inStore;
-
-    this.rows = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIMPORT_SOURCE_V });
-
-    const configSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.VMIMPORT_SOURCE_V);
-
-    if (!configSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post')) {
-      this.$store.dispatch('type-map/configureType', { match: HCI.VMIMPORT_SOURCE_V, isCreatable: false });
-    }
-  },
-
-  data() {
-    return { rows: [] };
-  },
-
-  computed: {
-    schema() {
-      return schema;
-    }
-  },
-
-  typeDisplay() {
-    return this.$store.getters['type-map/labelFor'](schema, 99);
-  }
-};
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <ResourceTable
-    v-else
-    v-bind="$attrs"
-    :groupable="true"
-    :schema="schema"
-    :rows="rows"
-    key-field="_key"
-  />
-</template>

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

@@ -110,12 +110,11 @@ export default {
 
   data() {
     return {
-      hasNode:                      false,
-      allVMs:                       [],
-      allVMIs:                      [],
-      allNodeNetworks:              [],
-      allClusterNetworks:           [],
-      restartNotificationDisplayed: false,
+      hasNode:            false,
+      allVMs:             [],
+      allVMIs:            [],
+      allNodeNetworks:    [],
+      allClusterNetworks: [],
       HCI
     };
   },
@@ -175,48 +174,6 @@ export default {
     this['allVMIs'] = vmis;
   },
 
-  beforeUnmount() {
-    // clear restart message before component unmount
-    this.$store.dispatch('growl/clear');
-  },
-
-  watch: {
-    allVMs: {
-      handler(neu) {
-        const vmNames = [];
-
-        neu.forEach((vm) => {
-          if (vm.isRestartRequired) {
-            vmNames.push(vm.metadata.name);
-          }
-        });
-        const count = vmNames.length;
-
-        if ( count === 0 && this.restartNotificationDisplayed) {
-          this.restartNotificationDisplayed = false;
-
-          return;
-        }
-
-        if (count > 0) {
-          // clear old notification before showing new one
-          if (this.restartNotificationDisplayed) {
-            this.$store.dispatch('growl/clear');
-          }
-        }
-
-        if (count > 0 && vmNames.length > 0) {
-          this.$store.dispatch('growl/warning', {
-            title:   this.t('harvester.notification.restartRequired.title', { count }),
-            message: this.t('harvester.notification.restartRequired.message', { vmNames: vmNames.join(', ') }),
-            timeout: 10000,
-          }, { root: true });
-          this.restartNotificationDisplayed = true;
-        }
-      },
-      deep: true,
-    }
-  },
   methods: {
     lockIconTooltipMessage(row) {
       const message = '';
@@ -286,12 +243,6 @@ export default {
   </div>
 </template>
 
-<style lang="scss">
-.growl-container {
-  z-index: 56 !important;  // set to be lower than the vm action menu (z-index: 57)
-}
-</style>
-
 <style lang="scss" scoped>
 .state {
   display: flex;

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

@@ -22,7 +22,7 @@ import {
 } from '../../config/harvester-map';
 import { HCI_SETTING } from '../../config/settings';
 import { HCI } from '../../types';
-import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
+import { parseVolumeClaimTemplates } from '../../utils/vm';
 import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { GIBIBYTE } from '../../utils/unit';
 import { VOLUME_MODE } from '@pkg/harvester/config/types';
@@ -182,7 +182,6 @@ export default {
       immutableMode:                 this.realMode === _CREATE ? _CREATE : _VIEW,
       terminationGracePeriodSeconds: '',
       cpuPinning:                    false,
-      cpuModel:                      '',
     };
   },
 
@@ -395,7 +394,6 @@ export default {
       const efiPersistentStateEnabled = this.isEFIPersistentStateEnabled(spec);
       const secureBoot = this.isSecureBoot(spec);
       const cpuPinning = this.isCpuPinning(spec);
-      const cpuModel = spec.template.spec.domain.cpu?.model || '';
 
       const secretRef = this.getSecret(spec);
       const accessCredentials = this.getAccessCredentials(spec);
@@ -433,7 +431,6 @@ export default {
       this['tpmPersistentStateEnabled'] = tpmPersistentStateEnabled;
       this['secureBoot'] = secureBoot;
       this['cpuPinning'] = cpuPinning;
-      this['cpuModel'] = cpuModel;
 
       this['hasCreateVolumes'] = hasCreateVolumes;
       this['networkRows'] = networkRows;
@@ -511,15 +508,12 @@ export default {
 
           const type = DISK?.cdrom ? CD_ROM : DISK?.disk ? HARD_DISK : '';
 
-          if (type === CD_ROM && volume === undefined) {
-            // Empty CD_ROM
-            source = SOURCE_TYPE.IMAGE;
-            image = EMPTY_IMAGE;
-            size = `0${ GIBIBYTE }`;
-          } else if (volume.containerDisk) { // SOURCE_TYPE.CONTAINER
+          if (volume?.containerDisk) { // SOURCE_TYPE.CONTAINER
             source = SOURCE_TYPE.CONTAINER;
             container = volume.containerDisk.image;
-          } else if (volume.persistentVolumeClaim && volume.persistentVolumeClaim?.claimName) {
+          }
+
+          if (volume.persistentVolumeClaim && volume.persistentVolumeClaim?.claimName) {
             volumeName = volume.persistentVolumeClaim.claimName;
             const DVT = _volumeClaimTemplates.find( (T) => T.metadata.name === volumeName);
 
@@ -707,14 +701,6 @@ export default {
       }
     },
 
-    needVolume(R) {
-      if (R.image === EMPTY_IMAGE) {
-        return false;
-      }
-
-      return true;
-    },
-
     parseDiskRows(disk) {
       const disks = [];
       const volumes = [];
@@ -722,18 +708,18 @@ export default {
       const volumeClaimTemplates = [];
 
       disk.forEach( (R, index) => {
+        const prefixName = this.value.metadata?.name || '';
+        const dataVolumeName = this.parseDataVolumeName(R, prefixName);
+
         const _disk = this.parseDisk(R, index);
+        const _volume = this.parseVolume(R, dataVolumeName);
+        const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
 
         disks.push(_disk);
+        volumes.push(_volume);
+        diskNameLabels.push(dataVolumeName);
 
-        if (this.needVolume(R)) {
-          const prefixName = this.value.metadata?.name || '';
-          const dataVolumeName = this.parseDataVolumeName(R, prefixName);
-          const _volume = this.parseVolume(R, dataVolumeName);
-          const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
-
-          volumes.push(_volume);
-          diskNameLabels.push(dataVolumeName);
+        if (R.source !== SOURCE_TYPE.CONTAINER) {
           volumeClaimTemplates.push(_dataVolumeTemplate);
         }
       });

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

@@ -144,12 +144,6 @@ export default class PCIDevice extends SteveModel {
   // 'disable' passthrough deletes claim
   // backend should return error if device is in use
   async disablePassthrough() {
-    if (!this.allowDisable) {
-      this.showDetachWarning();
-
-      return;
-    }
-
     try {
       if (!this.claimedByMe) {
         throw new Error(this.$rootGetters['i18n/t']('harvester.pci.cantUnclaim', { name: escapeHtml(this.metadata.name) }));
@@ -175,20 +169,4 @@ export default class PCIDevice extends SteveModel {
   get groupByDevice() {
     return this.status?.description;
   }
-
-  showDetachWarning() {
-    this.$dispatch('growl/warning', {
-      title:   this.$rootGetters['i18n/t']('harvester.pci.detachWarning.title'),
-      message: this.$rootGetters['i18n/t']('harvester.pci.detachWarning.message'),
-      timeout: 5000
-    }, { root: true });
-  }
-
-  get allowDisable() {
-    return this._allowDisable;
-  }
-
-  set allowDisable(value) {
-    this._allowDisable = value;
-  }
 }

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

@@ -133,12 +133,6 @@ export default class USBDevice extends SteveModel {
   // 'disable' passthrough deletes claim
   // backend should return error if device is in use
   async disablePassthrough() {
-    if (!this.allowDisable) {
-      this.showDetachWarning();
-
-      return;
-    }
-
     try {
       if (!this.claimedByMe) {
         throw new Error(this.$rootGetters['i18n/t']('harvester.usb.cantUnclaim', { name: escapeHtml(this.metadata.name) }));
@@ -164,20 +158,4 @@ export default class USBDevice extends SteveModel {
   get groupByDevice() {
     return this.status?.description;
   }
-
-  showDetachWarning() {
-    this.$dispatch('growl/warning', {
-      title:   this.$rootGetters['i18n/t']('harvester.usb.detachWarning.title'),
-      message: this.$rootGetters['i18n/t']('harvester.usb.detachWarning.message'),
-      timeout: 5000
-    }, { root: true });
-  }
-
-  get allowDisable() {
-    return this._allowDisable;
-  }
-
-  set allowDisable(value) {
-    this._allowDisable = value;
-  }
 }

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

@@ -100,12 +100,6 @@ export default class VGpuDevice extends SteveModel {
   }
 
   async disableVGpu() {
-    if (!this.allowDisable) {
-      this.showDetachWarning();
-
-      return;
-    }
-
     const { vGPUTypeName, enabled } = this.spec;
 
     try {
@@ -132,20 +126,4 @@ export default class VGpuDevice extends SteveModel {
   get vGpuAvailableTypes() {
     return this.status?.availableTypes ? Object.keys(this.status.availableTypes) : [];
   }
-
-  showDetachWarning() {
-    this.$dispatch('growl/warning', {
-      title:   this.$rootGetters['i18n/t']('harvester.vgpu.detachWarning.title'),
-      message: this.$rootGetters['i18n/t']('harvester.vgpu.detachWarning.message'),
-      timeout: 5000
-    }, { root: true });
-  }
-
-  get allowDisable() {
-    return this._allowDisable;
-  }
-
-  set allowDisable(value) {
-    this._allowDisable = value;
-  }
 }

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

@@ -52,11 +52,19 @@ export default class HciSetting extends HarvesterResource {
     });
   }
 
+  get clusterRegistrationTLSVerifyFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('clusterRegistrationTLSVerify');
+  }
+
   get customValue() {
     if (this.metadata.name === HCI_SETTING.STORAGE_NETWORK) {
       try {
         return JSON.stringify(JSON.parse(this.value), null, 2);
       } catch (e) {}
+    } else if (this.metadata.name === HCI_SETTING.CLUSTER_REGISTRATION_URL) {
+      try {
+        return this.clusterRegistrationTLSVerifyFeatureEnabled ? JSON.stringify(JSON.parse(this.value), null, 2) : this.value;
+      } catch (e) {}
     }
 
     return false;

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

@@ -153,7 +153,7 @@ export default class VirtVm extends HarvesterResource {
       },
       {
         action:  'takeVMSnapshot',
-        enabled: (!!this.actions?.snapshot || !!this.actions?.backup),
+        enabled: (!!this.actions?.snapshot || !!this.action?.backup),
         icon:    'icon icon-snapshot',
         label:   this.t('harvester.action.vmSnapshot')
       },
@@ -183,7 +183,7 @@ export default class VirtVm extends HarvesterResource {
       },
       {
         action:  'ejectCDROM',
-        enabled: !this.hotplugCdRomEnabled && !!this.actions?.ejectCdRom,
+        enabled: !!this.actions?.ejectCdRom,
         icon:    'icon icon-delete',
         label:   this.t('harvester.action.ejectCDROM')
       },
@@ -401,17 +401,6 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
-  ejectCdRomVolume(diskName) {
-    const resources = this;
-
-    this.$dispatch('promptModal', {
-      resources,
-      name:      diskName,
-      type:      'cdrom',
-      component: 'HarvesterHotUnplug',
-    });
-  }
-
   unplugNIC(networkName) {
     const resources = this;
 
@@ -534,16 +523,6 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
-  insertCdRomVolume(diskName) {
-    const resources = this;
-
-    this.$dispatch('promptModal', {
-      resources,
-      name:      diskName,
-      component:  'HarvesterInsertCdRomVolume',
-    });
-  }
-
   addHotplugNic(resources = this) {
     this.$dispatch('promptModal', {
       resources,
@@ -1201,15 +1180,11 @@ export default class VirtVm extends HarvesterResource {
     );
   }
 
-  get isRestartRequired() {
+  get stateDescription() {
     const conditions = get(this, 'status.conditions');
     const restartRequired = findBy(conditions, 'type', 'RestartRequired');
 
-    return restartRequired && restartRequired.status === 'True';
-  }
-
-  get stateDescription() {
-    if (this.isRestartRequired) {
+    if (restartRequired && restartRequired.status === 'True') {
       return this.t('harvester.virtualMachine.hotplug.restartVMMessage');
     }
 
@@ -1288,10 +1263,6 @@ export default class VirtVm extends HarvesterResource {
     return this.$rootGetters['harvester-common/getFeatureEnabled']('hotplugNic');
   }
 
-  get hotplugCdRomEnabled() {
-    return this.$rootGetters['harvester-common/getFeatureEnabled']('hotplugCdRom');
-  }
-
   get isBackupTargetUnavailable() {
     const allSettings = this.$rootGetters['harvester/all'](HCI.SETTING) || [];
     const backupTargetSetting = allSettings.find( (O) => O.id === 'backup-target');

pkg/harvester/package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.8.0-dev",
+  "version": "1.7.3",
   "private": false,
   "rancher": {
     "annotations": {
       "catalog.cattle.io/display-name": "Harvester",
       "catalog.cattle.io/kube-version": ">= 1.16.0-0",
-      "catalog.cattle.io/rancher-version": ">= 2.14.0-0",
+      "catalog.cattle.io/rancher-version": ">= 2.13.0-0",
       "catalog.cattle.io/ui-extensions-version": ">= 3.0.0 < 4.0.0"
     }
   },
@@ -29,4 +29,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

pkg/harvester/store/harvester-store/actions.ts

@@ -98,6 +98,11 @@ export default {
     if (getters['schemaFor'](HCI.UPGRADE)) {
       hash.upgrades = dispatch('findAll', { type: HCI.UPGRADE });
     }
+    // Pre-fetch all HCI.UPGRADE_LOG data within loadCluster to ensure HarvesterUpgradeHeader has the necessary data. This is required because the header is dynamically loaded before the user enters the cluster in Rancher integration mode.
+    // See more details in https://github.com/harvester/harvester-ui-extension/pull/715
+    if (getters['schemaFor'](HCI.UPGRADE_LOG)) {
+      hash.upgradeLogs = dispatch('findAll', { type: HCI.UPGRADE_LOG });
+    }
 
     const res: any = await allHash(hash);
 

pkg/harvester/types.ts

@@ -56,11 +56,6 @@ export const HCI = {
   IP_POOL:             'loadbalancer.harvesterhci.io.ippool',
   HARVESTER_CONFIG:    'rke-machine-config.cattle.io.harvesterconfig',
   LVM_VOLUME_GROUP:    'harvesterhci.io.lvmvolumegroup',
-  VMIMPORT_SOURCE_V:   'migration.harvesterhci.io.vmwaresource',
-  VMIMPORT_SOURCE_O:   'migration.harvesterhci.io.openstacksource',
-  VMIMPORT_SOURCE_OVA: 'migration.harvesterhci.io.ovasource',
-  VMIMPORT:            'migration.harvesterhci.io.virtualmachineimport',
-  MIGRATION:           'migration.harvesterhci.io',
 };
 
 export const VOLUME_SNAPSHOT = 'snapshot.storage.k8s.io.volumesnapshot';

pkg/harvester/utils/dynamic-nav.js

@@ -1,99 +0,0 @@
-/**
- * Dynamically toggles SideNav entries based on the enabled status of a specific Addon.
- *
- * @param {Object} store - The Vuex store instance.
- * @param {String} productName - The product name (e.g. 'harvester').
- * @param {Object} config - Configuration object.
- * @param {String} config.addonName - The name of the addon to watch.
- * @param {String} config.resourceType - The schema ID for addons.
- * @param {String} config.navGroup - The group name in the side nav.
- * @param {Array<String>} config.types - Array of Resource IDs to show/hide.
- */
-export function registerAddonSideNav(store, productName, {
-  addonName, resourceType, navGroup, types
-}) {
-  if (typeof window === 'undefined') {
-    return;
-  }
-
-  // Forces the SideNav component to re-render by toggling a dummy user preference.
-  // Necessary because the menu component does not automatically detect
-  // changes to the allowed types list.
-  const kickSideNav = () => {
-    const TRIGGER = 'ui.refresh.trigger';
-
-    store.dispatch('type-map/addFavorite', TRIGGER);
-
-    // SideNav component seem to ignore rapid state changes.
-    // Wait 600ms to ensure the toggle event triggers a re-render.
-    setTimeout(() => {
-      store.dispatch('type-map/removeFavorite', TRIGGER);
-    }, 600);
-  };
-
-  // Adds or removes the resource IDs from the product visibility whitelist.
-  const setMenuVisibility = (visible) => {
-    if (visible) {
-      store.commit('type-map/basicType', {
-        product: productName,
-        group:   navGroup,
-        types
-      });
-    } else {
-      // Manually delete the keys from the state object to hide them.
-      const basicTypes = store.state['type-map'].basicTypes[productName];
-
-      if (basicTypes) {
-        types.forEach((t) => delete basicTypes[t]);
-      }
-    }
-    kickSideNav();
-  };
-
-  // Start polling to check if the store is ready.
-  let attempts = 0;
-  const MAX_ATTEMPTS = 60;
-
-  const waitForStore = setInterval(() => {
-    attempts++;
-
-    try {
-      // Check if the Schema definitions are loaded.
-      const hasSchema = store.getters[`${ productName }/schemaFor`] &&
-                        store.getters[`${ productName }/schemaFor`](resourceType);
-
-      // Check if the resource list data is fully loaded to prevent race conditions.
-      const hasData = store.getters[`${ productName }/haveAll`] &&
-                      store.getters[`${ productName }/haveAll`](resourceType);
-
-      if (hasSchema && hasData) {
-        // Store is ready. Stop polling.
-        clearInterval(waitForStore);
-
-        // Watch the specific addon resource for changes to its enabled status.
-        store.watch(
-          (state, getters) => {
-            const addons = getters[`${ productName }/all`](resourceType);
-            const addon = addons.find((a) => a.metadata.name === addonName);
-
-            return addon?.spec?.enabled === true;
-          },
-          (isEnabled) => {
-            setMenuVisibility(isEnabled);
-          },
-          { immediate: true, deep: true }
-        );
-      } else if (hasSchema && !hasData) {
-        // If the schema is ready but the data is missing, request the list from the API.
-        // Ensures the script does not wait indefinitely if the UI has not loaded the addons yet.
-        store.dispatch(`${ productName }/findAll`, { type: resourceType });
-      } else if (attempts >= MAX_ATTEMPTS) {
-        // Stop checking if the store does not load within the timeout limit.
-        clearInterval(waitForStore);
-      }
-    } catch (e) {
-      // Ignore errors if the store module is not yet registered and wait for the next attempt.
-      if (attempts >= MAX_ATTEMPTS) clearInterval(waitForStore);
-    }
-  }, 1000);
-}

pkg/harvester/utils/vm.js

@@ -9,5 +9,3 @@ export function parseVolumeClaimTemplates(data) {
 
   return out;
 }
-
-export const EMPTY_IMAGE = 'EMPTY_IMAGE';