Latest changes from Harvester master - d7d9d4af8a88d677695d7aff47a81d52041dfcca

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
2026-10-07 22:56:07 +08:00 · 2024-11-12 11:50:17 +01:00
parent d04cd35a08
commit dc74441d26
46 changed files with 1290 additions and 1624 deletions
@@ -9,7 +9,7 @@ import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import ButtonDropdown from '@shell/components/ButtonDropdown';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { HCI as HCI_LABELS_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
-import { LONGHORN, SECRET } from '@shell/config/types';
+import { LONGHORN, SECRET, LONGHORN_DRIVER, LONGHORN_VERSION_V1, LONGHORN_VERSION_V2 } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { formatSi } from '@shell/utils/units';
 import { findBy } from '@shell/utils/array';
@@ -29,9 +29,13 @@ import HarvesterDisk from './HarvesterDisk';
 import HarvesterSeeder from './HarvesterSeeder';
 import HarvesterKsmtuned from './HarvesterKsmtuned';
 import Tags from '../../components/DiskTags';
+import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
+import isEqual from 'lodash/isEqual';

 export const LONGHORN_SYSTEM = 'longhorn-system';

+export const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
+
 export default {
  name:       'HarvesterEditNode',

@@ -66,10 +70,11 @@ export default {
    const inStore = this.$store.getters['currentProduct'].inStore;

    const hash = {
-      longhornNodes: this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
-      blockDevices:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BLOCK_DEVICE }),
-      addons:        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
-      secrets:       this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
+      longhornNodes:        this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
+      blockDevices:         this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BLOCK_DEVICE }),
+      addons:               this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
+      secrets:              this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
+      longhornV2DataEngine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
    };

    if (this.$store.getters[`${ inStore }/schemaFor`](HCI.INVENTORY)) {
@@ -80,23 +85,25 @@ export default {

    const blockDevices = this.$store.getters[`${ inStore }/all`](HCI.BLOCK_DEVICE);
    const provisionedBlockDevices = blockDevices.filter((d) => {
-      const provisioned = d?.spec?.fileSystem?.provisioned;
      const isCurrentNode = d?.spec?.nodeName === this.value.id;
      const isLonghornMounted = findBy(this.longhornDisks, 'name', d.metadata.name);

-      return provisioned && isCurrentNode && !isLonghornMounted;
+      return d?.isProvisioned && isCurrentNode && !isLonghornMounted;
    })
      .map((d) => {
        const corrupted = d?.status?.deviceStatus?.fileSystem?.corrupted;

        return {
-          isNew:          true,
-          name:           d?.metadata?.name,
-          originPath:     d?.spec?.fileSystem?.mountPoint,
-          path:           d?.spec?.fileSystem?.mountPoint,
-          blockDevice:    d,
-          displayName:    d?.displayName,
-          forceFormatted: corrupted ? true : d?.spec?.fileSystem?.forceFormatted || false,
+          isNew:              true,
+          name:               d?.metadata?.name,
+          originPath:         d?.spec?.fileSystem?.mountPoint,
+          path:               d?.spec?.fileSystem?.mountPoint,
+          blockDevice:        d,
+          displayName:        d?.displayName,
+          forceFormatted:     corrupted ? true : d?.spec?.fileSystem?.forceFormatted || false,
+          provisioner:        d?.spec?.provisioner?.lvm ? LVM_DRIVER : LONGHORN_DRIVER,
+          provisionerVersion: d?.spec?.provisioner?.longhorn?.engineVersion || LONGHORN_VERSION_V1,
+          lvmVolumeGroup:     d?.spec?.provisioner?.lvm?.vgName,
        };
      });

@@ -160,6 +167,13 @@ export default {
      return out;
    },

+    longhornSystemVersion() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const v2DataEngine = this.$store.getters[`${ inStore }/byId`](LONGHORN.SETTINGS, LONGHORN_V2_DATA_ENGINE) || {};
+
+      return v2DataEngine.value === 'true' ? LONGHORN_VERSION_V2 : LONGHORN_VERSION_V1;
+    },
+
    longhornDisks() {
      const inStore = this.$store.getters['currentProduct'].inStore;
      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `${ LONGHORN_SYSTEM }/${ this.value.id }`);
@@ -180,16 +194,19 @@ export default {
        return {
          ...diskStatus[key],
          ...diskSpec?.[key],
-          name:             key,
-          isNew:            false,
-          storageReserved:  formatSi(diskSpec[key]?.storageReserved, formatOptions),
-          storageAvailable: formatSi(diskStatus[key]?.storageAvailable, formatOptions),
-          storageMaximum:   formatSi(diskStatus[key]?.storageMaximum, formatOptions),
-          storageScheduled: formatSi(diskStatus[key]?.storageScheduled, formatOptions),
+          name:               key,
+          isNew:              false,
+          storageReserved:    formatSi(diskSpec[key]?.storageReserved, formatOptions),
+          storageAvailable:   formatSi(diskStatus[key]?.storageAvailable, formatOptions),
+          storageMaximum:     formatSi(diskStatus[key]?.storageMaximum, formatOptions),
+          storageScheduled:   formatSi(diskStatus[key]?.storageScheduled, formatOptions),
          blockDevice,
-          displayName:      blockDevice?.displayName || key,
-          forceFormatted:   blockDevice?.spec?.fileSystem?.forceFormatted || false,
-          tags:             diskSpec?.[key]?.tags || [],
+          displayName:        blockDevice?.displayName || key,
+          forceFormatted:     blockDevice?.spec?.fileSystem?.forceFormatted || false,
+          tags:               diskSpec?.[key]?.tags || [],
+          provisioner:        blockDevice?.spec?.provisioner?.lvm ? LVM_DRIVER : LONGHORN_DRIVER,
+          provisionerVersion: blockDevice?.spec?.provisioner?.longhorn?.engineVersion || LONGHORN_VERSION_V1,
+          lvmVolumeGroup:     blockDevice?.spec?.provisioner?.lvm?.vgName,
        };
      });

@@ -197,7 +214,7 @@ export default {
    },

    showFormattedWarning() {
-      const out = this.newDisks.filter(d => d.forceFormatted && d.isNew) || [];
+      const out = this.newDisks.filter(d => d.forceFormatted && d.isNew && d.provisionerVersion === LONGHORN_VERSION_V1) || [];

      return out.length > 0;
    },
@@ -316,15 +333,18 @@ export default {

      this.newDisks.push({
        name,
-        path:              mountPoint,
-        allowScheduling:   false,
-        evictionRequested: false,
-        storageReserved:   0,
-        isNew:             true,
-        originPath:        disk?.spec?.fileSystem?.mountPoint,
-        blockDevice:       disk,
-        displayName:       disk?.displayName,
+        path:               mountPoint,
+        allowScheduling:    false,
+        evictionRequested:  false,
+        storageReserved:    0,
+        isNew:              true,
+        originPath:         disk?.spec?.fileSystem?.mountPoint,
+        blockDevice:        disk,
+        displayName:        disk?.displayName,
        forceFormatted,
+        provisioner:        LONGHORN_DRIVER,
+        provisionerVersion: LONGHORN_VERSION_V1,
+        lvmVolumeGroup:     null,
      });
    },

@@ -338,13 +358,10 @@ export default {
      } else if (addDisks.length !== 0 && removeDisks.length === 0) {
        const updatedDisks = addDisks.filter((d) => {
          const blockDevice = this.$store.getters[`${ inStore }/byId`](HCI.BLOCK_DEVICE, `${ LONGHORN_SYSTEM }/${ d.name }`);
-          const { provisioned, forceFormatted } = blockDevice.spec.fileSystem;
+          const { forceFormatted } = blockDevice.spec.fileSystem;
+          const { provisioner } = blockDevice.spec;

-          if (provisioned && forceFormatted === d.forceFormatted) {
-            return false;
-          } else {
-            return true;
-          }
+          return !(blockDevice.isProvisioned && forceFormatted === d.forceFormatted && isEqual(provisioner, d.provisioner));
        });

        if (updatedDisks.length === 0) {
@@ -356,16 +373,25 @@ export default {
        await Promise.all(addDisks.map((d) => {
          const blockDevice = this.$store.getters[`${ inStore }/byId`](HCI.BLOCK_DEVICE, `${ LONGHORN_SYSTEM }/${ d.name }`);

-          blockDevice.spec.fileSystem.provisioned = true;
+          blockDevice.spec.provision = true;
          blockDevice.spec.fileSystem.forceFormatted = d.forceFormatted;

+          switch (d.provisioner) {
+          case LONGHORN_DRIVER:
+            blockDevice.spec.provisioner = { longhorn: { engineVersion: d.provisionerVersion } };
+            break;
+          case LVM_DRIVER:
+            blockDevice.spec.provisioner = { lvm: { vgName: d.lvmVolumeGroup } };
+            break;
+          }
+
          return blockDevice.save();
        }));

        await Promise.all(removeDisks.map((d) => {
          const blockDevice = this.$store.getters[`${ inStore }/byId`](HCI.BLOCK_DEVICE, `${ LONGHORN_SYSTEM }/${ d.name }`);

-          blockDevice.spec.fileSystem.provisioned = false;
+          blockDevice.spec.provision = false;

          return blockDevice.save();
        }));
@@ -418,7 +444,7 @@ export default {
          if ((!findBy(this.disks || [], 'name', d.metadata.name) &&
                d?.spec?.nodeName === this.value.id &&
                (!addedToNodeCondition || addedToNodeCondition?.status === 'False') &&
-                !d.spec?.fileSystem?.provisioned &&
+                !d?.isProvisioned &&
                !isAdded) ||
                isRemoved
          ) {
@@ -573,6 +599,7 @@ export default {
                class="mb-20"
                :mode="mode"
                :disks="disks"
+                :node="value"
              />
            </template>
            <template #add>