chore: bump version to v1.7.0-rc6 (#649) (#650)

(cherry picked from commit 5769588633)

Signed-off-by: Andy Lee <andy.lee@suse.com>
Co-authored-by: Andy Lee <andy.lee@suse.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.7.0-rc5",
+  "version": "1.7.0-rc6",
   "private": false,
   "engines": {
     "node": ">=20.0.0"

pkg/harvester/config/labels-annotations.js

@@ -50,6 +50,7 @@ export const HCI = {
   STORAGE_CLASS:                    'harvesterhci.io/storageClassName',
   STORAGE_NETWORK:                  'storage-network.settings.harvesterhci.io',
   ADDON_EXPERIMENTAL:               'addon.harvesterhci.io/experimental',
+  ADDON_DISPLAYNAME:                'addon.harvesterhci.io/displayName',
   VOLUME_ERROR:                     'longhorn.io/volume-scheduling-error',
   VOLUME_FOR_VM:                    'harvesterhci.io/volumeForVirtualMachine',
   KVM_AMD_CPU:                      'cpu-feature.node.kubevirt.io/svm',

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

@@ -96,7 +96,6 @@ export default {
       templateVersionId: '',
       namePrefix:        '',
       isSingle:          true,
-      useTemplate:       false,
       isOpen:            false,
       hostname,
       isRestartImmediately,

pkg/harvester/l10n/en-us.yaml

@@ -1561,6 +1561,7 @@ harvester:
       'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
       'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
       'harvester-csi-driver-lvm': harvester-csi-driver-lvm is an add-on allowing users to create PVC through the LVM with local devices.
+      'descheduler': 'The virtual machine auto balance optimizes workload scheduling by evicting pods that are not optimally placed according to administrator-defined policies.'
     vmImport:
       titles:
         basic: Basic

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

@@ -142,6 +142,7 @@ export default {
       showYaml:                      false,
       spec:                          null,
       osType:                        'linux',
+      useTemplate:                   false,
       sshKey:                        [],
       maintenanceStrategies,
       maintenanceStrategy:           'Migrate',
@@ -273,7 +274,7 @@ export default {
 
     needNewSecret() {
       // When creating a template it is always necessary to create a new secret.
-      return this.showYaml ? false : this.resourceType === HCI.VM_VERSION || this.isCreate;
+      return this.isCreate || this.showYaml ? false : this.resourceType === HCI.VM_VERSION;
     },
 
     defaultTerminationSetting() {
@@ -708,7 +709,8 @@ export default {
       const volumeClaimTemplates = [];
 
       disk.forEach( (R, index) => {
-        const dataVolumeName = this.parseDataVolumeName(R);
+        const prefixName = this.value.metadata?.name || '';
+        const dataVolumeName = this.parseDataVolumeName(R, prefixName);
 
         const _disk = this.parseDisk(R, index);
         const _volume = this.parseVolume(R, dataVolumeName);
@@ -1003,23 +1005,18 @@ export default {
       this['cpuMemoryHotplugEnabled'] = cpuMemoryHotplugEnabled;
     },
 
-    parseDataVolumeName(R) {
-      const prefixName = this.value.metadata?.name || '';
+    parseDataVolumeName(R, prefixName) {
       let dataVolumeName = '';
 
-      if (!R.dataVolumeName) {
-        if (R.source === SOURCE_TYPE.ATTACH_VOLUME) {
-          dataVolumeName = R.volumeName;
-        } else if (this.isClone || !this.hasCreateVolumes.includes(R.realName)) {
-          dataVolumeName = `${ prefixName }-${ R.name }-${ randomStr(5).toLowerCase() }`;
-        } else {
-          dataVolumeName = R.realName;
-        }
-
-        R.dataVolumeName = dataVolumeName;
+      if (R.source === SOURCE_TYPE.ATTACH_VOLUME) {
+        dataVolumeName = R.volumeName;
+      } else if (this.isClone || !this.hasCreateVolumes.includes(R.realName)) {
+        dataVolumeName = `${ prefixName }-${ R.name }-${ randomStr(5).toLowerCase() }`;
+      } else {
+        dataVolumeName = R.realName;
       }
 
-      return R.dataVolumeName;
+      return dataVolumeName;
     },
 
     parseDisk(R, index) {
@@ -1647,7 +1644,8 @@ export default {
 
     secretRef: {
       handler(secret) {
-        if (secret && this.resourceType !== HCI.BACKUP && this.resourceType !== HCI.VM) {
+        // we should not inherit the secret if it's from VM template.
+        if (secret && this.resourceType !== HCI.BACKUP && !this.useTemplate) {
           this.secretName = secret?.metadata.name;
         }
       },

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

@@ -113,8 +113,9 @@ export default class HciAddonConfig extends HarvesterResource {
 
   get displayName() {
     const isExperimental = this.metadata?.labels?.[HCI_ANNOTATIONS.ADDON_EXPERIMENTAL] === 'true';
+    const name = this.metadata?.labels?.[HCI_ANNOTATIONS.ADDON_DISPLAYNAME] || this.metadata.name;
 
-    return isExperimental ? `${ this.metadata.name } (${ this.t('generic.experimental') })` : this.metadata.name;
+    return isExperimental ? `${ name } (${ this.t('generic.experimental') })` : name;
   }
 
   get customValidationRules() {

pkg/harvester/package.json

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