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

…v1.3/pr-892 filter storageClass by provisioner (backport #892)
harvester · May 16, 2024 · 87de63b · 87de63b
2 parents 9d809b5 + b30df77
commit 87de63b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
@@ -34,6 +34,7 @@ export const HCI = {
   DYNAMIC_SSHKEYS_USERS:        'harvesterhci.io/dynamic-ssh-key-users',
   IMAGE_SUFFIX:                 'harvesterhci.io/image-type',
   OS_TYPE:                      'harvesterhci.io/os-type',
+  STORAGE_PROVISIONER:          'harvesterhci.io/storageProvisioner',
   HOST_REQUEST:                 'management.cattle.io/pod-requests',
   STORAGE_CLASS:                'harvesterhci.io/storageClassName',
   STORAGE_NETWORK:              'storage-network.settings.harvesterhci.io',

diff --git a/pkg/harvester/dialog/RestoreSnapshotDialog.vue b/pkg/harvester/dialog/RestoreSnapshotDialog.vue
@@ -6,6 +6,7 @@ import { Banner } from '@components/Banner';
 import AsyncButton from '@shell/components/AsyncButton';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 
 import { allHash } from '@shell/utils/promise';
 import { STORAGE_CLASS } from '@shell/config/types';
@@ -43,7 +44,9 @@ export default {
     if (this.showStorageClass) {
       const defaultStorage = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS).find(s => s.isDefault);
 
-      this.$set(this, 'storageClassName', defaultStorage?.metadata?.name || 'longhorn');
+      const currentStorageName = this.resources[0].metadata?.annotations[HCI_ANNOTATIONS.STORAGE_CLASS];
+
+      this.$set(this, 'storageClassName', currentStorageName || defaultStorage?.metadata?.name || 'longhorn');
     }
   },
 
@@ -60,7 +63,9 @@ export default {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const storages = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS);
 
-      const out = storages.filter(s => !s.parameters?.backingImage).map((s) => {
+      const out = storages.filter(s => !s.parameters?.backingImage).filter((s) => {
+        return s.provisioner === this.actionResource.metadata?.annotations[HCI_ANNOTATIONS.STORAGE_PROVISIONER];
+      }).map((s) => {
         const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
         return {