chore: modify the check-version script (#490)

- to pass the dev build

Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>

.eslintignore

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

.github/auto-assign-config.yaml

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

.github/mergify.yml

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

.github/release.yml

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

.github/workflows/backport-request.yaml

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

.github/workflows/release-label.yaml

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

.github/workflows/run-lint.yaml

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

README.md

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

package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.6.0-rc5",
+  "version": "1.7.0-dev",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
   },
   "dependencies": {
     "@babel/plugin-transform-class-static-block": "7.26.0",
-    "@rancher/shell": "3.0.5-rc.7",
+    "@rancher/shell": "3.0.5-rc.8",
     "cache-loader": "^4.1.0",
     "color": "4.2.3",
     "ip": "2.0.1",
@@ -46,6 +46,7 @@
     "prepare": "husky"
   },
   "devDependencies": {
+    "@commitlint/load": "^19.8.1",
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "eslint-plugin-node": "^11.1.0",

pkg/harvester/components/novnc/NovncConsoleWrapper.vue

@@ -258,7 +258,7 @@ export default {
     },
 
     softReboot() {
-      this.vmResource.softrebootVM();
+      this.vmResource.doSoftReboot();
     },
 
     showKeysModal() {
@@ -372,3 +372,12 @@ export default {
     background: rgb(40, 40, 40);
   }
 </style>
+
+<style lang="scss">
+  .vm-console .v-popper__arrow-container {
+    display: none;
+  }
+  .vm-console .v-popper__popper{
+    margin-top: 8px;
+  }
+</style>

pkg/harvester/config/feature-flags.js

@@ -48,7 +48,9 @@ const FEATURE_FLAGS = {
     'cpuMemoryHotplug',
     'cdiSettings',
     'vmCloneRunStrategy',
-  ]
+  ],
+  'v1.6.1': [],
+  'v1.7.0': []
 };
 
 const generateFeatureFlags = () => {

pkg/harvester/config/harvester-map.js

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

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

@@ -44,6 +44,12 @@ export default {
     };
 
     await allHash(hash);
+
+    if (this.mode === _CREATE ) {
+      this.setDefaultVolumeSnapshotClass();
+    } else {
+      this.initCDISettingsFromAnnotations();
+    }
   },
 
   data() {
@@ -59,14 +65,6 @@ export default {
     };
   },
 
-  created() {
-    if (this.mode === _CREATE ) {
-      this.setDefaultVolumeSnapshotClass();
-    } else {
-      this.initCDISettingsFromAnnotations();
-    }
-  },
-
   computed: {
     inStore() {
       return this.$store.getters['currentProduct'].inStore;
@@ -148,7 +146,7 @@ export default {
     setDefaultVolumeSnapshotClass() {
       try {
         const setting = this.$store.getters[`${ this.inStore }/byId`](HCI.SETTING, HCI_SETTING.CSI_DRIVER_CONFIG);
-        const config = JSON.parse(setting?.value || '{}');
+        const config = JSON.parse(setting?.value || setting?.default || '{}');
         const defaultClass = config?.[this.provisioner]?.volumeSnapshotClassName || null;
 
         const allClasses = this.$store.getters[`${ this.inStore }/all`](VOLUME_SNAPSHOT_CLASS) || [];

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

@@ -257,6 +257,7 @@ export default {
         :label="t('harvester.vmTemplate.tabs.basics')"
       >
         <CpuMemory
+          class="mb-20"
           :cpu="cpu"
           :memory="memory"
           :max-cpu="maxCpu"

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

@@ -240,7 +240,7 @@ export default {
 </script>
 
 <template>
-  <div class="mt-20">
+  <div>
     <LabeledSelect
       v-model:value="checkedSsh"
       :label="t('harvester.virtualMachine.input.sshKey')"

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

@@ -605,6 +605,7 @@ export default {
         :label="t('harvester.virtualMachine.detail.tabs.basics')"
       >
         <CpuMemory
+          class="mb-20"
           :cpu="cpu"
           :max-cpu="maxCpu"
           :memory="memory"

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

@@ -691,11 +691,14 @@ export default {
         this.spec.template.spec.domain.cpu.cores = this.cpu;
         this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString();
         this.spec.template.spec.domain.resources.limits.memory = this.memory;
-        // clean
+        // clean below fields as we don't need them if not enable CPU and memory hotplug
-        delete this.spec.template.spec.resources;
+        if (this.spec?.template?.spec?.domain?.cpu?.maxSockets) {
-        delete this.spec.template.spec.domain.memory;
           delete this.spec.template.spec.domain.cpu.maxSockets;
         }
+        if (this.spec?.template?.spec?.domain?.memory?.maxGuest) {
+          delete this.spec.template.spec.domain.memory.maxGuest;
+        }
+      }
     },
 
     parseDiskRows(disk) {

pkg/harvester/models/harvester.js

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

pkg/harvester/models/harvester/configmap.js

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

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

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

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

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

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

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

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

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

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

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

pkg/harvester/models/harvester/monitoring.coreos.com.alertmanagerconfig.js

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

pkg/harvester/models/harvester/secret.js

@@ -5,6 +5,25 @@ import Secret from '@shell/models/secret';
 import { NAMESPACE } from '@shell/config/types';
 
 export default class HciSecret extends Secret {
+  // prevent harvester secret detail page be overridden.
+  // See isFullPageOverride in https://github.com/rancher/dashboard/blob/master/shell/components/ResourceDetail/index.vue
+  get fullDetailPageOverride() {
+    return false;
+  }
+
+  get listLocation() {
+    const listLocation = clone(super.listLocation);
+
+    listLocation.name = this.harvesterResourcesInExplorer ? 'c-cluster-product-resource' : `${ HARVESTER_PRODUCT }-c-cluster-resource`;
+    listLocation.params.resource = HCI.SECRET;
+
+    return listLocation;
+  }
+
+  get harvesterResourcesInExplorer() {
+    return this.$rootGetters['productId'] !== HARVESTER_PRODUCT;
+  }
+
   get _detailLocation() {
     const schema = this.$getters['schemaFor'](this.type);
 

pkg/harvester/models/harvester/storage.k8s.io.storageclass.js

@@ -9,6 +9,19 @@ import { isInternalStorageClass } from '../../utils/storage-class';
 export const LVM_DRIVER = 'lvm.driver.harvesterhci.io';
 
 export default class HciStorageClass extends StorageClass {
+  get listLocation() {
+    const listLocation = clone(super.listLocation);
+
+    listLocation.name = this.harvesterResourcesInExplorer ? 'c-cluster-product-resource' : `${ HARVESTER_PRODUCT }-c-cluster-resource`;
+    listLocation.params.resource = HCI.STORAGE;
+
+    return listLocation;
+  }
+
+  get harvesterResourcesInExplorer() {
+    return this.$rootGetters['productId'] !== HARVESTER_PRODUCT;
+  }
+
   get detailLocation() {
     const detailLocation = clone(this._detailLocation);
 
@@ -94,13 +107,14 @@ export default class HciStorageClass extends StorageClass {
   get availableActions() {
     let out = super.availableActions || [];
 
-    out = out.map((action) => {
+    if (this.isInternalStorageClass()) {
-      if ((action.action === 'setDefault' || action.action === 'setAsDefault' || action.action === 'promptRemove') && this.isInternalStorageClass()) {
+      out = out.filter((action) => {
-        return { ...action, enabled: false };
+        return !['setDefault', 'setAsDefault', 'promptRemove'].includes(action.action);
-      }
-
-      return action;
       });
+    }
+    if (out[0] && out[0].divider === true) {
+      out = out.slice(1);
+    }
 
     return out;
   }

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

@@ -327,6 +327,10 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
+  doSoftReboot() {
+    this.doActionGrowl('softreboot', {});
+  }
+
   softrebootVM(resources = this) {
     this.$dispatch('promptModal', {
       resources,

pkg/harvester/package.json

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

scripts/check-version.sh

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

scripts/extract-release-label.mjs

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