chore: bump to v1.6.1 (#561)

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.6.1-dev",
+  "version": "1.6.1",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
@@ -30,7 +30,7 @@
     "nth-check": "2.1.1",
     "qs": "6.14.0",
     "roarr": "7.21.1",
-    "semver": "7.7.2",
+    "semver": "7.7.3",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
   },
   "scripts": {

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

@@ -338,6 +338,15 @@ export default {
     saveVM(buttonCb) {
       clear(this.errors);
 
+      this.validateCPUMemory();
+
+      // block create VM flow if has validation errors
+      if (this.errors.length) {
+        buttonCb(false);
+
+        return;
+      }
+
       if (this.isSingle) {
         this.saveSingle(buttonCb);
       } else {
@@ -345,6 +354,18 @@ export default {
       }
     },
 
+    validateCPUMemory() {
+      const { cpu, memory } = this;
+
+      if ((!cpu)) {
+        this.errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.cpu') }, true));
+      }
+
+      if ((!memory)) {
+        this.errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.memory') }, true));
+      }
+    },
+
     async saveSingle(buttonCb) {
       this.parseVM();
       this.value.spec.template.spec.hostname = this.hostname ? this.hostname : this.value.metadata.name;
@@ -466,9 +487,7 @@ export default {
         }
       }
 
-      const cpuMemoryErrors = this.getCPUMemoryValidation();
+      const errors = this.getAccessCredentialsValidation();
-      const accessCredentialsErrors = this.getAccessCredentialsValidation();
-      const errors = [...cpuMemoryErrors, ...accessCredentialsErrors];
 
       if (errors.length > 0) {
         return Promise.reject(errors);

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

@@ -687,14 +687,12 @@ export default {
         set(this.spec.template.spec, 'domain.memory.maxGuest', this.maxMemory);
         set(this.spec.template.spec, 'domain.resources.limits.memory', this.maxMemory);
       } else {
+        this.spec.template.spec.domain.cpu.maxSockets = 1;
         this.spec.template.spec.domain.cpu.sockets = 1;
         this.spec.template.spec.domain.cpu.cores = this.cpu;
         this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString();
         this.spec.template.spec.domain.resources.limits.memory = this.memory;
         // clean below fields as we don't need them if not enable CPU and memory hotplug
-        if (this.spec?.template?.spec?.domain?.cpu?.maxSockets) {
-          delete this.spec.template.spec.domain.cpu.maxSockets;
-        }
         if (this.spec?.template?.spec?.domain?.memory?.maxGuest) {
           delete this.spec.template.spec.domain.memory.maxGuest;
         }
@@ -1361,21 +1359,6 @@ export default {
       }
     },
 
-    getCPUMemoryValidation() {
-      const errors = [];
-      const { cpu, memory } = this;
-
-      if ((!cpu)) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.cpu') }, true));
-      }
-
-      if ((!memory)) {
-        errors.push(this.t('validation.required', { key: this.t('harvester.virtualMachine.input.memory') }, true));
-      }
-
-      return errors;
-    },
-
     getAccessCredentialsValidation() {
       const errors = [];
 

pkg/harvester/package.json

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

pkg/harvester/utils/cpuMemory.js

@@ -3,17 +3,19 @@ import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations
 export function getVmCPUMemoryValues(vm) {
   if (!vm) {
     return {
-      cpu:              0,
+      cpu:              null,
       memory:           null,
       isHotplugEnabled: false
     };
   }
 
   const isHotplugEnabled = isCPUMemoryHotPlugEnabled(vm);
+  const { sockets = 1, threads = 1, cores = null } = vm.spec.template.spec.domain.cpu || {};
+  const cpu = cores === null ? null : sockets * threads * cores;
 
   if (isHotplugEnabled) {
     return {
-      cpu:       vm.spec.template.spec.domain.cpu.sockets,
+      cpu,
       memory:    vm.spec.template.spec.domain?.memory?.guest || null,
       maxCpu:    vm.spec.template.spec.domain.cpu?.maxSockets || 0,
       maxMemory: vm.spec.template.spec.domain?.memory?.maxGuest || null,
@@ -21,7 +23,7 @@ export function getVmCPUMemoryValues(vm) {
     };
   } else {
     return {
-      cpu:    vm.spec.template.spec.domain.cpu.cores,
+      cpu,
       memory: vm.spec.template.spec.domain.resources?.limits?.memory || null,
       isHotplugEnabled
     };
@@ -29,8 +31,5 @@ export function getVmCPUMemoryValues(vm) {
 }
 
 export function isCPUMemoryHotPlugEnabled(vm) {
-  return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' ||
+  return vm?.metadata?.annotations[HCI_ANNOTATIONS.VM_CPU_MEMORY_HOTPLUG] === 'true' || !!vm?.spec?.template?.spec?.domain?.memory?.maxGuest || false;
-    !!vm?.spec?.template?.spec?.domain.cpu?.maxSockets ||
-    !!vm?.spec?.template?.spec?.domain?.memory?.maxGuest ||
-    false;
 }

yarn.lock

@@ -3114,9 +3114,9 @@
     "@types/node" "*"
 
 "@types/node@*", "@types/node@20.10.8", "@types/node@^14.14.31", "@types/node@~20.19.0":
-  version "20.19.13"
+  version "20.19.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.13.tgz#b79004a05068e28fb2de281b3a44c5c993650e59"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.21.tgz#6e5378e04993c40395473b13baf94a09875157b8"
-  integrity sha512-yCAeZl7a0DxgNVteXFHt9+uyFbqXGy/ShC4BlcHkoE0AfGXYv/BUiplV72DjMYXHDBXFjhvr6DD1NiRVfB4j8g==
+  integrity sha512-CsGG2P3I5y48RPMfprQGfy4JPRZ6csfC3ltBZSRItG3ngggmNY/qs2uZKp4p9VbrpqNNSMzUZNFZKzgOGnd/VA==
   dependencies:
     undici-types "~6.21.0"
 
@@ -11525,10 +11525,10 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-"semver@2 || 3 || 4 || 5", semver@7.7.2, semver@^5.5.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0, semver@^7.6.3, semver@~7.0.0:
+"semver@2 || 3 || 4 || 5", semver@7.7.3, semver@^5.5.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0, semver@^7.6.3, semver@~7.0.0:
-  version "7.7.2"
+  version "7.7.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
-  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
 send@0.17.1:
   version "0.17.1"