Merge pull request #1233 from harvester/mergify/bp/release-harvester-…

…v1.4/pr-1223 Add longhorn support message in VM clone dialog (backport #1223)
harvester · Nov 15, 2024 · 335b2e0 · 335b2e0
2 parents fced9a1 + e054702
commit 335b2e0
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 80 deletions.
diff --git a/pkg/harvester/dialog/CloneVmDialog.vue b/pkg/harvester/dialog/CloneVmDialog.vue
@@ -91,15 +91,22 @@ export default {
     </template>
 
     <template #body>
-      <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
-
-      <LabeledInput
-        v-show="cloneData"
-        v-model="name"
-        class="mb-20"
-        :label="t('harvester.modal.cloneVM.name')"
-        required
-      />
+      <template v-if="!actionResource?.longhornV2Volumes.length">
+        <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
+
+        <LabeledInput
+          v-show="cloneData"
+          v-model="name"
+          class="mb-20"
+          :label="t('harvester.modal.cloneVM.name')"
+          required
+        />
+      </template>
+      <template v-else>
+        <Banner color="warning">
+          <t k="harvester.modal.cloneVM.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
     </template>
 
     <div slot="actions" class="actions">
@@ -109,6 +116,7 @@ export default {
         </button>
 
         <AsyncButton
+          v-if="!actionResource?.longhornV2Volumes.length"
           mode="create"
           :action-label="cloneData ? t('harvester.modal.cloneVM.action.create') : t('harvester.modal.cloneVM.action.clone')"
           :disabled="cloneData && !name"

diff --git a/pkg/harvester/dialog/HarvesterExportImageDialog.vue b/pkg/harvester/dialog/HarvesterExportImageDialog.vue
@@ -141,27 +141,34 @@ export default {
     </template>
 
     <template #body>
-      <LabeledSelect
-        v-model="namespace"
-        :label="t('harvester.modal.exportImage.namespace')"
-        :options="namespaces"
-        class="mb-20"
-        required
-      />
-
-      <LabeledInput
-        v-model="name"
-        :label="t('harvester.modal.exportImage.name')"
-        required
-      />
-
-      <LabeledSelect
-        v-model="storageClassName"
-        :options="storageClassOptions"
-        :label="t('harvester.storage.storageClass.label')"
-        class="mt-20"
-        required
-      />
+      <template v-if="actionResource?.isLonghornV2">
+        <Banner color="warning">
+          <t k="harvester.modal.exportImage.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
+      <template v-else>
+        <LabeledSelect
+          v-model="namespace"
+          :label="t('harvester.modal.exportImage.namespace')"
+          :options="namespaces"
+          class="mb-20"
+          required
+        />
+
+        <LabeledInput
+          v-model="name"
+          :label="t('harvester.modal.exportImage.name')"
+          required
+        />
+
+        <LabeledSelect
+          v-model="storageClassName"
+          :options="storageClassOptions"
+          :label="t('harvester.storage.storageClass.label')"
+          class="mt-20"
+          required
+        />
+      </template>
     </template>
 
     <div slot="actions" class="actions">
@@ -171,6 +178,7 @@ export default {
         </button>
 
         <AsyncButton
+          v-if="!actionResource?.isLonghornV2"
           mode="create"
           :disabled="disableSave"
           @click="save"

diff --git a/pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue b/pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue
@@ -74,7 +74,7 @@ export default {
             'growl/success',
             {
               title:   this.t('generic.notification.title.succeed'),
-              message: this.t('harvester.modal.vmSnapshot.success', { name: this.snapshotName })
+              message: this.t('harvester.modal.vmSnapshot.message.success', { name: this.snapshotName })
             },
             { root: true }
           );
@@ -118,8 +118,24 @@ export default {
     />
 
     <template #body>
-      <LabeledInput v-model="actionResource.metadata.namespace" :disabled="true" :label="t('generic.namespace')" />
-      <LabeledInput v-model="snapshotName" class="mt-20" :label="t('generic.name')" required />
+      <template v-if="actionResource?.longhornV2Volumes.length > 0">
+        <Banner color="warning">
+          <t k="harvester.modal.vmSnapshot.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
+      <template v-else>
+        <LabeledInput
+          v-model="actionResource.metadata.namespace"
+          :disabled="true"
+          :label="t('generic.namespace')"
+        />
+        <LabeledInput
+          v-model="snapshotName"
+          class="mt-20"
+          :label="t('generic.name')"
+          required
+        />
+      </template>
     </template>
 
     <div slot="actions" class="actions">
@@ -128,7 +144,12 @@ export default {
           {{ t('generic.cancel') }}
         </button>
 
-        <AsyncButton mode="create" :disabled="!snapshotName" @click="save" />
+        <AsyncButton
+          v-if="!actionResource?.longhornV2Volumes.length"
+          mode="create"
+          :disabled="!snapshotName"
+          @click="save"
+        />
       </div>
 
       <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />

diff --git a/pkg/harvester/dialog/SnapshotDialog.vue b/pkg/harvester/dialog/SnapshotDialog.vue
@@ -70,7 +70,11 @@ export default {
       {{ t('harvester.modal.snapshot.title') }}
     </template>
     <template #body>
+      <Banner v-if="actionResource?.isLonghornV2" color="warning">
+        <t k="harvester.modal.snapshot.message.support.longhorn" :raw="true" />
+      </Banner>
       <LabeledInput
+        v-else
         v-model="name"
         :label="t('harvester.modal.snapshot.name')"
         required
@@ -82,6 +86,7 @@ export default {
           {{ t('generic.cancel') }}
         </button>
         <AsyncButton
+          v-if="!actionResource?.isLonghornV2"
           mode="create"
           :disabled="disableSave"
           @click="save"

diff --git a/pkg/harvester/dialog/VolumeCloneDialog.vue b/pkg/harvester/dialog/VolumeCloneDialog.vue
@@ -81,22 +81,30 @@ export default {
       {{ t('harvester.modal.volumeClone.title') }}
     </template>
     <template #body>
-      <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
+      <template v-if="!actionResource?.isLonghornV2">
+        <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
 
-      <LabeledInput
-        v-show="cloneData"
-        v-model="name"
-        class="mb-20"
-        :label="t('harvester.modal.volumeClone.name')"
-        required
-      />
+        <LabeledInput
+          v-show="cloneData"
+          v-model="name"
+          class="mb-20"
+          :label="t('harvester.modal.volumeClone.name')"
+          required
+        />
+      </template>
+      <template v-else>
+        <Banner color="warning">
+          <t k="harvester.modal.volumeClone.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
     </template>
     <div slot="actions" class="actions">
       <div class="buttons">
         <button class="btn role-secondary mr-10" @click="close">
           {{ t('generic.cancel') }}
         </button>
         <AsyncButton
+          v-if="!actionResource?.isLonghornV2"
           mode="create"
           :disabled="disableSave"
           @click="save"

diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
@@ -74,12 +74,16 @@ harvester:
         tip: Please enter a virtual machine name!
         success: 'Virtual machine { name } cloned successfully.'
         failed: 'Failed clone virtual machine!'
+        support:
+          longhorn: The virtual machine uses Longhorn v2 volumes, which do not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Clone action.
     exportImage:
       title: Export to Image
       name: Name
       namespace: Namespace
       message:
         success: 'Image { name } created successfully.'
+        support:
+          longhorn: The volume uses Longhorn V2 engine, which does not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Export Image action.
     migration:
       failedMessage: Latest migration failed!
       title: Migration
@@ -108,19 +112,26 @@ harvester:
       name: Name
       message:
         success: 'Take Snapshot { name } successfully.'
+        support:
+          longhorn: The volume uses Longhorn V2 engine, which does not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Take Snapshot action.
     volumeClone:
       title: Clone Volume
       name: Name
       message:
         success: 'New Volume { name } cloned successfully.'
+        support:
+          longhorn: The volume uses Longhorn V2 engine, which does not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Clone action.
     restoreSnapshot:
       title: Restore Snapshot
       name: 'New Volume Name'
       success: 'New Volume { name } restored successfully.'
     vmSnapshot:
       title: Take Virtual Machine Snapshot
       name: Name
-      success: 'Take virtual machine Snapshot { name } successfully.'
+      message:
+        success: 'Take virtual machine Snapshot { name } successfully.'
+        support:
+          longhorn: The VM uses Longhorn v2 volumes, which do not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Take Snapshot action.
     restart:
       title: Restart Virtual Machine
       tip: Restart the virtual machine for configuration changes to take effect.

diff --git a/pkg/harvester/models/harvester/persistentvolumeclaim.js b/pkg/harvester/models/harvester/persistentvolumeclaim.js
@@ -35,38 +35,27 @@ export default class HciPv extends HarvesterResource {
   }
 
   get availableActions() {
-    let out = super._availableActions;
+    const out = super._availableActions;
 
-    // Longhorn V2 provisioner do not support volume clone feature yet
-    if (this.isLonghornV2) {
-      out = out.filter(action => action.action !== 'goToClone');
-    } else {
-      const clone = out.find(action => action.action === 'goToClone');
+    const clone = out.find(action => action.action === 'goToClone');
 
-      if (clone) {
-        clone.action = 'goToCloneVolume';
-      }
-    }
-
-    if (!this.isLonghorn || !this.isLonghornV2) {
-      out = [
-        {
-          action:  'exportImage',
-          enabled: this.hasAction('export') && !this.isEncrypted,
-          icon:    'icon icon-copy',
-          label:   this.t('harvester.action.exportImage')
-        },
-        {
-          action:  'snapshot',
-          enabled: this.hasAction('snapshot'),
-          icon:    'icon icon-backup',
-          label:   this.t('harvester.action.snapshot'),
-        },
-        ...out
-      ];
+    if (clone) {
+      clone.action = 'goToCloneVolume';
     }
 
     return [
+      {
+        action:  'exportImage',
+        enabled: this.hasAction('export') && !this.isEncrypted,
+        icon:    'icon icon-copy',
+        label:   this.t('harvester.action.exportImage')
+      },
+      {
+        action:  'snapshot',
+        enabled: this.hasAction('snapshot'),
+        icon:    'icon icon-backup',
+        label:   this.t('harvester.action.snapshot'),
+      },
       {
         action:  'cancelExpand',
         enabled: this.hasAction('cancelExpand'),

diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@@ -89,17 +89,12 @@ const IgnoreMessages = ['pod has unbound immediate PersistentVolumeClaims'];
 
 export default class VirtVm extends HarvesterResource {
   get availableActions() {
-    let out = super._availableActions;
+    const out = super._availableActions;
 
-    // VM attached with Longhorn V2 volume doesn't support clone feature
-    if (this.longhornV2Volumes.length > 0) {
-      out = out.filter(action => action.action !== 'goToClone');
-    } else {
-      const clone = out.find(action => action.action === 'goToClone');
+    const clone = out.find(action => action.action === 'goToClone');
 
-      if (clone) {
-        clone.action = 'goToCloneVM';
-      }
+    if (clone) {
+      clone.action = 'goToCloneVM';
     }
 
     return [
@@ -157,7 +152,7 @@ export default class VirtVm extends HarvesterResource {
       },
       {
         action:  'takeVMSnapshot',
-        enabled: !!this.actions?.backup && !this.longhornV2Volumes.length,
+        enabled: !!this.actions?.backup,
         icon:    'icon icon-snapshot',
         label:   this.t('harvester.action.vmSnapshot')
       },