chore: bump version to 1.9.0-rc7 (#1132)

Signed-off-by: Harvester Bot <94133267+harvesterhci-io-github-bot@users.noreply.github.com>

.github/pull_request_template.md

@@ -8,16 +8,12 @@
     - [ ] Yes, the backend owner is @
     - [ ] No, frontend-only.
 
-### Related Issue
+### Related Issue #
  <!-- Link the issue as harvester/harvester#<issue_number> -->
  harvester/harvester#<issue_number>
 
 
-### Test Steps
+### Test screenshot or video (Required)
- <!-- Provide the test steps for reviewer to verify the issue -->
+<!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary -->
-1. Go to ... page
-
-### Test screenshot or video
-<!-- Attach screenshot or video of the changes and eventual comparison -->
 
 

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

@@ -1,7 +1,6 @@
 name: Build Standalone on PR Merge
 
 on:
-  workflow_dispatch: # manually trigger on Github Actions only support PR branch pushed to harvester/harvester-ui-extension
   push:
     branches:
       - main
@@ -30,35 +29,3 @@ jobs:
       id-token: write
     with:
       CI_BRANCH: ${{github.ref_name}}
-  comment-on-pr:
-    name: Comment build result on PR
-    # Only for manual runs so the existing push / pull_request flows are untouched.
-    if: github.event_name == 'workflow_dispatch'
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Add build artifact comment to the PR opened from this branch
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: ${{ github.ref_name }}
-        run: |
-          set -euo pipefail
-          # Match scripts/version: sanitize the branch and map main -> latest.
-          if [ "$BRANCH" = "main" ]; then
-            DIR="latest"
-          else
-            DIR=$(printf '%s' "$BRANCH" | sed -E 's/[^a-zA-Z0-9.-]+/-/g')
-          fi
-          URL="https://releases.rancher.com/harvester-ui/dashboard/${DIR}/index.html"
-
-          PR=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --base main --head "$BRANCH" --json number --jq '.[0].number // empty')
-          if [ -z "$PR" ]; then
-            echo "No open PR found for branch $BRANCH, skipping comment."
-            exit 0
-          fi
-
-          BODY=$(printf '🚀 **UI Artifact Build Status:** `SUCCESS` ✅\n> ui-index: %s\n> ui-source: external' "$URL")
-          gh pr comment "$PR" --repo "$GITHUB_REPOSITORY" --body "$BODY"

package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.10.0-dev",
+  "version": "1.9.0-rc7",
   "private": false,
   "engines": {
     "node": ">=24.0.0"
   },
   "dependencies": {
     "@babel/plugin-transform-class-static-block": "7.29.7",
-    "@rancher/shell": "3.0.13",
+    "@rancher/shell": "3.0.12-rc.7",
     "@vue-flow/background": "^1.3.0",
     "@vue-flow/controls": "^1.1.1",
     "@vue-flow/core": "^1.33.5",
@@ -39,7 +39,7 @@
     "merge": "2.1.1",
     "node-forge": "1.4.0",
     "nth-check": "2.1.1",
-    "qs": "6.16.0",
+    "qs": "6.15.3",
     "roarr": "7.21.7",
     "semver": "7.8.5",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
@@ -48,17 +48,15 @@
     "dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve",
     "build": "./node_modules/.bin/vue-cli-service build",
     "clean": "./node_modules/@rancher/shell/scripts/clean",
-    "lint": "./node_modules/@rancher/shell/scripts/lint --max-warnings 0 --ext .js,.ts,.vue .",
+    "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
-    "lint:fix": "./node_modules/@rancher/shell/scripts/lint --fix --max-warnings 0 --ext .js,.ts,.vue .",
+    "lint:fix": "./node_modules/.bin/eslint --fix --max-warnings 0 --ext .js,.ts,.vue .",
     "build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh",
     "serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs",
     "publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
     "parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
     "commitlint": "commitlint --edit",
     "prepare": "husky",
-    "agents:generate": "./scripts/generate-agent-and-persona-mds.sh",
+    "agents:generate": "./scripts/generate-agent-and-persona-mds.sh"
-    "prelint": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error",
-    "prelint:fix": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error"
   },
   "devDependencies": {
     "@commitlint/load": "^19.8.1",

pkg/harvester/config/types.js

@@ -15,13 +15,6 @@ export const VOLUME_MODE = {
   FILE_SYSTEM: 'Filesystem'
 };
 
-export const ACCESS_MODE = {
-  READ_WRITE_MANY:     'ReadWriteMany',
-  READ_WRITE_ONCE:     'ReadWriteOnce',
-  READ_ONLY_MANY:      'ReadOnlyMany',
-  READ_WRITE_ONCE_POD: 'ReadWriteOncePod',
-};
-
 export const NETWORK_PROTOCOL = {
   IPv4: 'IPv4',
   IPv6: 'IPv6',

pkg/harvester/dialog/HarvesterEnableK3k.vue

@@ -1,164 +0,0 @@
-<script>
-import merge from 'lodash/merge';
-import jsyaml from 'js-yaml';
-import { mapGetters } from 'vuex';
-import { Card } from '@components/Card';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import AsyncButton from '@shell/components/AsyncButton';
-import { escapeHtml } from '@shell/utils/string';
-
-const DEFAULT_VALUE = {
-  rancher: {
-    hostname:          '',
-    version:           '',
-    bootstrapPassword: '',
-  },
-};
-
-export default {
-  name: 'HarvesterEnableK3k',
-
-  emits: ['close'],
-
-  components: {
-    AsyncButton,
-    Card,
-    LabeledInput,
-  },
-
-  props: {
-    resources: {
-      type:     Array,
-      required: true
-    }
-  },
-
-  data() {
-    const addon = this.resources[0];
-    let valuesContentJson;
-
-    try {
-      valuesContentJson = merge({}, DEFAULT_VALUE, jsyaml.load(addon.spec.valuesContent));
-    } catch (e) {
-      valuesContentJson = merge({}, DEFAULT_VALUE);
-    }
-
-    return { valuesContentJson };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    buttonDisabled() {
-      const { rancher } = this.valuesContentJson;
-
-      return !(rancher?.hostname || '').trim() || !(rancher?.version || '').trim() || !(rancher?.bootstrapPassword || '').trim();
-    }
-  },
-
-  methods: {
-    close() {
-      this.$emit('close');
-    },
-
-    async enable(buttonCb) {
-      const addon = this.resources[0];
-
-      try {
-        addon.spec.valuesContent = jsyaml.dump(this.valuesContentJson);
-        addon.spec.enabled = true;
-        await addon.save();
-        buttonCb(true);
-        this.close();
-      } catch (err) {
-        addon.spec.enabled = false;
-        this.$store.dispatch('growl/fromError', {
-          title: this.t('generic.notification.title.error', { name: escapeHtml(addon.metadata.name) }),
-          err,
-        }, { root: true });
-        buttonCb(false);
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <Card :show-highlight-border="false">
-    <template #title>
-      <h4
-        v-clean-html="t('harvester.addons.rancherK3k.enable.title')"
-        class="text-default-text"
-      />
-    </template>
-
-    <template #body>
-      <div class="body">
-        <div class="row mb-15">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="valuesContentJson.rancher.hostname"
-              :required="true"
-              :label="t('harvester.addons.rancherK3k.hostname')"
-              placeholder="rancher.$vip.nip.io"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="valuesContentJson.rancher.version"
-              :required="true"
-              :label="t('harvester.addons.rancherK3k.version')"
-              placeholder="v1.14.0"
-            />
-          </div>
-        </div>
-        <div class="row mb-15">
-          <div class="col span-12">
-            <LabeledInput
-              v-model:value="valuesContentJson.rancher.bootstrapPassword"
-              :required="true"
-              type="password"
-              :label="t('harvester.addons.rancherK3k.password')"
-              :tooltip="t('harvester.addons.rancherK3k.passwordTooltip')"
-            />
-          </div>
-        </div>
-      </div>
-    </template>
-
-    <template #actions>
-      <div class="buttons actions">
-        <button
-          class="btn role-secondary mr-10"
-          @click="close"
-        >
-          {{ t('generic.cancel') }}
-        </button>
-
-        <AsyncButton
-          mode="enable"
-          :disabled="buttonDisabled"
-          @click="enable"
-        />
-      </div>
-    </template>
-  </Card>
-</template>
-
-<style lang="scss" scoped>
-.body {
-  display: flex;
-  flex-direction: column;
-  min-width: 400px;
-}
-
-.actions {
-  width: 100%;
-}
-
-.buttons {
-  display: flex;
-  justify-content: flex-end;
-  width: 100%;
-}
-</style>

pkg/harvester/edit/harvesterhci.io.addon/rancher-k3k.vue

@@ -1,167 +0,0 @@
-<script>
-import merge from 'lodash/merge';
-import jsyaml from 'js-yaml';
-import { LabeledInput } from '@components/Form/LabeledInput';
-import { RadioGroup } from '@components/Form/Radio';
-
-const DEFAULT_VALUE = {
-  certManagerVersion: 'v1.20.2',
-  rancher:            {
-    hostname:          '',
-    version:           '',
-    bootstrapPassword: '',
-  },
-  k3kCluster: {
-    servers:          1,
-    version:          'v1.35.4-k3s1',
-    storageClassName: 'harvester-longhorn',
-  },
-};
-
-export default {
-  name:       'EditAddonRancherK3k',
-  components: { LabeledInput, RadioGroup },
-
-  inheritAttrs: false,
-
-  props: {
-    value: {
-      type:     Object,
-      required: true,
-    },
-
-    mode: {
-      type:     String,
-      required: true
-    },
-    registerBeforeHook: {
-      type:     Function,
-      required: true,
-    },
-  },
-
-  data() {
-    let valuesContentJson = {};
-
-    try {
-      valuesContentJson = merge({}, DEFAULT_VALUE, jsyaml.load(this.value.spec.valuesContent));
-    } catch (err) {
-      valuesContentJson = merge({}, DEFAULT_VALUE);
-
-      this.$store.dispatch('growl/fromError', {
-        title: this.$store.getters['i18n/t']('generic.notification.title.error'),
-        err:   err.data || err,
-      }, { root: true });
-    }
-
-    return { valuesContentJson };
-  },
-
-  created() {
-    if (this.registerBeforeHook) {
-      this.registerBeforeHook(this.willSave, 'willSave');
-    }
-  },
-
-  methods: {
-    willSave() {
-      const errors = [];
-
-      if (!this.value.spec.enabled) {
-        return Promise.resolve();
-      }
-
-      if (!this.valuesContentJson.rancher.hostname) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.addons.rancherK3k.hostname') }, true));
-      }
-
-      if (!this.valuesContentJson.rancher.version) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.addons.rancherK3k.version') }, true));
-      }
-
-      if (!this.valuesContentJson.rancher.bootstrapPassword) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.addons.rancherK3k.password') }, true));
-      }
-
-      if (errors.length > 0) {
-        return Promise.reject(errors);
-      } else {
-        return Promise.resolve();
-      }
-    },
-  },
-
-  watch: {
-    valuesContentJson: {
-      handler(neu) {
-        this.value.spec['valuesContent'] = jsyaml.dump(neu);
-      },
-      deep:      true,
-      immediate: true
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <div class="row">
-      <div class="col span-12">
-        <RadioGroup
-          v-model:value="value.spec.enabled"
-          class="mb-20"
-          name="model"
-          :mode="mode"
-          :options="[true,false]"
-          :labels="[t('generic.enabled'), t('generic.disabled')]"
-        />
-      </div>
-    </div>
-
-    <template v-if="value.spec.enabled">
-      <div class="row mb-20">
-        <div class="col span-6">
-          <LabeledInput
-            v-model:value="valuesContentJson.rancher.hostname"
-            label-key="harvester.addons.rancherK3k.hostname"
-            :required="true"
-            :mode="mode"
-            placeholder="rancher.$vip.nip.io"
-          />
-        </div>
-
-        <div class="col span-6">
-          <LabeledInput
-            v-model:value="valuesContentJson.rancher.version"
-            label-key="harvester.addons.rancherK3k.version"
-            :required="true"
-            :mode="mode"
-            placeholder="v1.14.0"
-          />
-        </div>
-      </div>
-
-      <div class="row mt-20">
-        <div class="col span-6">
-          <LabeledInput
-            v-model:value="valuesContentJson.rancher.bootstrapPassword"
-            label-key="harvester.addons.rancherK3k.password"
-            :mode="mode"
-            :required="true"
-            type="password"
-            :tooltip="t('harvester.addons.rancherK3k.passwordTooltip')"
-          />
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-  :deep() .radio-group {
-    display: flex;
-    .radio-container {
-      margin-right: 30px;
-    }
-  }
-</style>

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

@@ -1,5 +1,5 @@
 <script>
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import ArrayList from '@shell/components/form/ArrayList';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -10,10 +10,6 @@ import { HCI_SETTING } from '../../config/settings';
 import { allHash } from '@shell/utils/promise';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 
-const {
-  READ_WRITE_ONCE, READ_ONLY_MANY, READ_WRITE_MANY, READ_WRITE_ONCE_POD
-} = ACCESS_MODE;
-
 export default {
   name: 'CDISettings',
 
@@ -94,10 +90,10 @@ export default {
 
     accessModeOptions() {
       return [
-        { label: READ_WRITE_ONCE, value: READ_WRITE_ONCE },
+        { label: 'ReadWriteOnce', value: 'ReadWriteOnce' },
-        { label: READ_ONLY_MANY, value: READ_ONLY_MANY },
+        { label: 'ReadOnlyMany', value: 'ReadOnlyMany' },
-        { label: READ_WRITE_MANY, value: READ_WRITE_MANY },
+        { label: 'ReadWriteMany', value: 'ReadWriteMany' },
-        { label: READ_WRITE_ONCE_POD, value: READ_WRITE_ONCE_POD },
+        { label: 'ReadWriteOncePod', value: 'ReadWriteOncePod' },
       ];
     },
 

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

@@ -26,11 +26,9 @@ import { HCI, VOLUME_SNAPSHOT } from '../types';
 import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
 import { DATA_ENGINE_V2 } from '../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../utils/unit';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { isInternalStorageClass } from '../utils/storage-class';
 
-const { READ_WRITE_MANY, READ_WRITE_ONCE, READ_ONLY_MANY } = ACCESS_MODE;
-
 export default {
   name: 'HarvesterVolume',
 
@@ -85,7 +83,7 @@ export default {
     if (this.mode === _CREATE) {
       // default volumeMode to Block
       this.value.spec.volumeMode = VOLUME_MODE.BLOCK;
-      this.value.spec.accessModes = [READ_WRITE_MANY];
+      this.value.spec.accessModes = ['ReadWriteMany'];
     }
 
     const storage = this.value?.spec?.resources?.requests?.storage || null;
@@ -162,7 +160,7 @@ export default {
     },
 
     accessModeOptions() {
-      return [READ_WRITE_ONCE, READ_WRITE_MANY, READ_ONLY_MANY];
+      return ['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany'];
     },
 
     imageOption() {
@@ -357,7 +355,7 @@ export default {
 
     getAccessMode() {
       if (!this.longhornV2LVMSupport) {
-        return [READ_WRITE_MANY];
+        return ['ReadWriteMany'];
       }
 
       if (this.value?.spec?.accessModes && this.value?.spec?.accessModes?.length > 0) {
@@ -373,7 +371,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.value.thirdPartyStorageFeatureEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? [READ_WRITE_ONCE] : [READ_WRITE_MANY];
+      return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
     },
     buildDataVolumeObj() {
       const storage = {

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

@@ -16,12 +16,10 @@ import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs';
 import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
 import { HCI } from '../../../types';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { OFF } from '../../../models/kubevirt.io.virtualmachine';
 import { EMPTY_IMAGE } from '../../../utils/vm';
 
-const { READ_WRITE_MANY } = ACCESS_MODE;
-
 export default {
   emits: ['update:value'],
 
@@ -71,7 +69,7 @@ export default {
 
     customAccessMode: {
       type:    String,
-      default: READ_WRITE_MANY
+      default: 'ReadWriteMany'
     },
 
     resourceType: {

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

@@ -14,9 +14,7 @@ import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storagec
 import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../../../../utils/unit';
 import { isInternalStorageClass } from '../../../../utils/storage-class';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
-
-const { READ_WRITE_MANY, READ_WRITE_ONCE } = ACCESS_MODE;
 
 export default {
   name: 'HarvesterEditVolume',
@@ -207,7 +205,7 @@ export default {
 
     getAccessMode(storageClassName) {
       if (!this.longhornV2LVMSupport) {
-        return READ_WRITE_MANY;
+        return 'ReadWriteMany';
       }
 
       const storageClass = this.storageClasses.find((sc) => sc.name === storageClassName);
@@ -218,7 +216,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.thirdPartyStorageClassEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? READ_WRITE_ONCE : READ_WRITE_MANY;
+      return readWriteOnce ? 'ReadWriteOnce' : 'ReadWriteMany';
     },
 
     update() {

pkg/harvester/harvester-prime.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 165"><defs><style>.cls-1{fill:#30BA78;}.cls-2{fill:#fff;}</style></defs><rect class="cls-1" width="200" height="165" rx="20"/><path class="cls-2" d="M158.93945,121.73682H119.40527a5.0009,5.0009,0,0,1-4.33007-2.5L95.30859,84.99951a4.99813,4.99813,0,0,1,0-5L115.0752,45.7627a5.00088,5.00088,0,0,1,4.33007-2.5h39.53418a5.00088,5.00088,0,0,1,4.33008,2.5l19.7666,34.23681a4.99808,4.99808,0,0,1,0,5l-19.7666,34.23731A5.0009,5.0009,0,0,1,158.93945,121.73682Zm-36.64746-10h33.76074l16.87989-29.23731L156.05273,53.2627H122.292L105.41211,82.49951Z"/><path class="cls-2" d="M147.39258,101.73633H130.95312a5.0009,5.0009,0,0,1-4.33007-2.5L118.40332,85a4.99813,4.99813,0,0,1,0-5l8.21973-14.2373a5.00088,5.00088,0,0,1,4.33007-2.5h16.43946a5.00091,5.00091,0,0,1,4.33008,2.5L159.94238,80a4.99808,4.99808,0,0,1,0,5l-8.21972,14.23633A5.00093,5.00093,0,0,1,147.39258,101.73633Zm-13.55274-10h10.666l5.333-9.23633-5.333-9.2373h-10.666l-5.333,9.2373Z"/><path class="cls-2" d="M50.34082,121.73682H40.958a5.00092,5.00092,0,0,1-4.33008-2.5L16.86133,84.99951a4.99808,4.99808,0,0,1,0-5L36.62793,45.7627a5.0009,5.0009,0,0,1,4.33008-2.5h9.38281a5,5,0,0,1,0,10H43.84473L26.96484,82.49951l16.87989,29.23731h6.49609a5,5,0,1,1,0,10Z"/><path class="cls-2" d="M76.49023,121.73682H67.10742a5.00093,5.00093,0,0,1-4.33008-2.5L43.01074,84.99951a4.99813,4.99813,0,0,1,0-5L62.77734,45.7627a5.00091,5.00091,0,0,1,4.33008-2.5h9.38281a5,5,0,0,1,0,10H69.99414L53.11426,82.49951l16.87988,29.23731h6.49609a5,5,0,0,1,0,10Z"/><path class="cls-2" d="M102.63867,121.73682H93.25684a5.0009,5.0009,0,0,1-4.33008-2.5L69.16016,84.99951a4.99808,4.99808,0,0,1,0-5L88.92676,45.7627a5.00088,5.00088,0,0,1,4.33008-2.5h9.38183a5,5,0,0,1,0,10H96.14355L79.26367,82.49951l16.87988,29.23731h6.49512a5,5,0,1,1,0,10Z"/><path class="cls-2" d="M130.958,73.26367a4.99757,4.99757,0,0,1-4.335-2.501l-11.54785-20a5,5,0,1,1,8.66015-5l11.54785,20a5.00157,5.00157,0,0,1-4.32519,7.501Z"/><path class="cls-2" d="M147.3877,73.26367a5.00157,5.00157,0,0,1-4.3252-7.501l11.54688-20a5,5,0,1,1,8.66015,5l-11.54687,20A4.99758,4.99758,0,0,1,147.3877,73.26367Z"/><path class="cls-2" d="M178.70605,87.5H155.6123a5,5,0,0,1,0-10h23.09375a5,5,0,0,1,0,10Z"/><path class="cls-2" d="M122.7334,87.5H99.63867a5,5,0,1,1,0-10H122.7334a5,5,0,1,1,0,10Z"/><path class="cls-2" d="M119.40039,121.73779a5.00157,5.00157,0,0,1-4.32519-7.501l11.54785-20.00049a5,5,0,1,1,8.66015,5l-11.54785,20.00049A4.99757,4.99757,0,0,1,119.40039,121.73779Z"/><path class="cls-2" d="M158.94434,121.73779a4.99757,4.99757,0,0,1-4.335-2.501L143.0625,99.23633a5,5,0,0,1,8.66016-5l11.54687,20.00049a5.00157,5.00157,0,0,1-4.32519,7.501Z"/><path class="cls-2" d="M101.50195,87.49951H21.19141a5,5,0,0,1,0-10h80.31054a5,5,0,0,1,0,10Z"/></svg>

pkg/harvester/index.ts

@@ -7,11 +7,10 @@ import harvesterStore from './store/harvester-store';
 import customValidators from './validators';
 import { PRODUCT_NAME } from './config/harvester';
 import { defineAsyncComponent } from 'vue';
-import semver from 'semver';
 import './styles/vue-flow.scss';
 
 // Init the package
-export default function(plugin: IPlugin) {
+export default function (plugin: IPlugin) {
   const isDev = process.env.NODE_ENV !== 'production';
   const isSingleVirtualCluster = process.env.rancherEnv === PRODUCT_NAME;
 
@@ -21,19 +20,8 @@ export default function(plugin: IPlugin) {
   // Provide plugin metadata from package.json
   plugin.metadata = require('./package.json');
 
-  const version = semver.parse(plugin.metadata.version);
+  // Built-in icon
-  const isHarvesterPrime = (version?.patch ?? 0) > 0;
+  plugin.metadata.icon = require('./icon.svg');
-  const rancher = typeof plugin.metadata.rancher === 'object' ? plugin.metadata.rancher : {};
-
-  plugin.metadata.description = isHarvesterPrime ? 'Rancher UI Extension for Harvester Prime' : 'Rancher UI Extension for Harvester';
-  plugin.metadata.rancher = {
-    ...rancher,
-    annotations: {
-      ...rancher?.annotations,
-      'catalog.cattle.io/display-name': isHarvesterPrime ? 'SUSE Virtualization' : 'Harvester',
-    },
-  };
-  plugin.metadata.icon = isHarvesterPrime ? require('./harvester-prime.svg') : require('./icon.svg');
 
   plugin.addProduct(require('./config/harvester-cluster'));
 

pkg/harvester/l10n/en-us.yaml

@@ -1832,8 +1832,6 @@ harvester:
       'rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
       'rancher-monitoring': rancher-monitoring is an add-on to collect Harvester cluster and virtual machine metrics, view them on the embedded dashboard, and send alert(s) to remote servers.
       'rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
-      'k3k': k3k is an add-on to deploy the k3k controller.
-      'rancher-k3k': rancher-k3k deploys a k3k virtual cluster with Rancher installed.
       'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
       'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
       'harvester-csi-driver-lvm': harvester-csi-driver-lvm is an add-on allowing users to create PVC through the LVM with local devices.
@@ -2138,14 +2136,6 @@ harvester:
       hostname: Hostname
       rancherVersion: Rancher Version
       password: Bootstrap Password
-    rancherK3k:
-      accessRancher: Access the Rancher Dashboard
-      hostname: Hostname
-      version: Rancher Version
-      password: Bootstrap Password
-      passwordTooltip: The initial password in Rancher for the first time login.
-      enable:
-        title: Enable K3k
     switchFailed: "{action} {name} failed!"
     nvidiaDriverToolkit:
       titles:

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

@@ -72,7 +72,7 @@ export default {
           />
 
           <a
-            v-if="['rancher-vcluster', 'rancher-k3k'].includes(scope.row.metadata.name) && scope.row.spec.enabled"
+            v-if="scope.row.metadata.name === 'rancher-vcluster' && scope.row.spec.enabled"
             v-tooltip="t('harvester.addons.rancherVcluster.accessRancher')"
             class="ml-5"
             rel="nofollow noopener noreferrer"

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

@@ -25,9 +25,7 @@ import { HCI } from '../../types';
 import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
 import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { GIBIBYTE } from '../../utils/unit';
-import { VOLUME_MODE, ACCESS_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
-
-const { READ_WRITE_MANY } = ACCESS_MODE;
 
 const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
 
@@ -278,7 +276,7 @@ export default {
     },
 
     customAccessMode() {
-      return this.storageClassSetting.accessModes || READ_WRITE_MANY;
+      return this.storageClassSetting.accessModes || 'ReadWriteMany';
     },
 
     isWindows() {
@@ -506,7 +504,7 @@ export default {
           id:               randomStr(5),
           source:           SOURCE_TYPE.IMAGE,
           name:             'disk-0',
-          accessMode:       READ_WRITE_MANY, // root disk only support LHv1 volume, should be RWX
+          accessMode:       'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
           bus,
           volumeName:       '',
           size,
@@ -572,7 +570,7 @@ export default {
               const pvcResource = allPVCs.find( (O) => O.id === `${ namespace }/${ volume?.persistentVolumeClaim?.claimName }`);
 
               source = SOURCE_TYPE.ATTACH_VOLUME;
-              accessMode = pvcResource?.spec?.accessModes?.[0] || READ_WRITE_MANY;
+              accessMode = pvcResource?.spec?.accessModes?.[0] || 'ReadWriteMany';
               size = pvcResource?.spec?.resources?.requests?.storage || '10Gi';
               storageClassName = pvcResource?.spec?.storageClassName;
               volumeMode = pvcResource?.spec?.volumeMode || VOLUME_MODE.BLOCK;
@@ -1317,9 +1315,8 @@ export default {
       case SOURCE_TYPE.IMAGE: {
         const image = this.images.find( (I) => R.image === I.id);
 
-        out.spec.storageClassName = R.realName ? R.storageClassName : (R.storageClassName || image?.storageClassName);
-
         if (image) {
+          out.spec.storageClassName = image.storageClassName;
           out.metadata.annotations = { [HCI_ANNOTATIONS.IMAGE_ID]: image.id };
         } else {
           out.metadata.annotations = { [HCI_ANNOTATIONS.IMAGE_ID]: '' };

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

@@ -5,14 +5,12 @@ import HarvesterResource from './harvester';
 import { HCI } from '../types';
 
 const HARVESTER_NVIDIA_DRIVER_TOOLKIT = 'harvester-system/nvidia-driver-toolkit';
-const RANCHER_VCLUSTER = 'harvester-system/rancher-vcluster';
-const RANCHER_K3K_ADDON = 'rancher-k3k/rancher-k3k';
 
 export default class HciAddonConfig extends HarvesterResource {
   get availableActions() {
     const out = super._availableActions;
 
-    if (this.id === RANCHER_VCLUSTER || this.id === RANCHER_K3K_ADDON) {
+    if (this.id === 'harvester-system/rancher-vcluster') {
       const rancherDashboard = {
         action:  'goToRancher',
         enabled: this.spec.enabled,
@@ -59,15 +57,6 @@ export default class HciAddonConfig extends HarvesterResource {
         return;
       }
 
-      if (!this.spec.enabled && this.id === RANCHER_K3K_ADDON) {
-        this.$dispatch('promptModal', {
-          resources: [this],
-          component: 'HarvesterEnableK3k',
-        });
-
-        return;
-      }
-
       this.spec.enabled = !this.spec.enabled;
       await this.save();
     } catch (err) {
@@ -80,19 +69,18 @@ export default class HciAddonConfig extends HarvesterResource {
   }
 
   goToRancher() {
+    const valuesContent = jsyaml.load(this.spec.valuesContent);
+
     window.open(
-      this.rancherHostname,
+      `https://${ valuesContent.hostname }`,
       '_blank',
     );
   }
 
   get rancherHostname() {
-    const valuesContent = jsyaml.load(this.spec.valuesContent) || {};
+    const valuesContent = jsyaml.load(this.spec.valuesContent);
 
-    // rancher-k3k nests the hostname under `rancher`, rancher-vcluster keeps it at the top level
+    return `https://${ valuesContent.hostname }`;
-    const hostname = this.id === RANCHER_K3K_ADDON ? valuesContent.rancher?.hostname : valuesContent.hostname;
-
-    return `https://${ hostname }`;
   }
 
   get stateColor() {

pkg/harvester/package.json

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