public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2025-12-13 21:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter golden image volume in hot plug volume modal (#239) (#240)

Browse Source 
Signed-off-by: Andy Lee <andy.lee@suse.com>
(cherry picked from commit 78234b9e1ea927639479696403f68597043ce691)

Co-authored-by: Andy Lee <andy.lee@suse.com>
This commit is contained in:
mergify[bot] 2025-04-10 13:27:23 +08:00 committed by GitHub
parent 089573f193
commit 3bfe57dc54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/harvester/dialog/HarvesterAddHotplugModal.vue
View File

@ -57,6 +57,10 @@ export default {
if (!!pvc.metadata?.annotations?.[HCI_ANNOTATIONS.IMAGE_ID]) { if (!!pvc.metadata?.annotations?.[HCI_ANNOTATIONS.IMAGE_ID]) {
return false; return false;
} }
// we won't show golden image volume in the hot plug volume modal
if (pvc.isGoldenImageVolume) {
return false;
}
return !pvc.attachVM; return !pvc.attachVM;
}) })

2
pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/existing.vue
View File

@ -111,7 +111,7 @@ export default {
return false; return false;
} }
if (pvc.metadata?.annotations?.[HCI_ANNOTATIONS.GOLDEN_IMAGE] === 'true') { if (pvc.isGoldenImageVolume) {
return false; return false;
} }

4
pkg/harvester/list/harvesterhci.io.volume.vue
View File

@ -6,10 +6,8 @@ import {
} from '@shell/config/types'; } from '@shell/config/types';
import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers'; import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
import HarvesterVolumeState from '../formatters/HarvesterVolumeState'; import HarvesterVolumeState from '../formatters/HarvesterVolumeState';
import { allSettled } from '../utils/promise'; import { allSettled } from '../utils/promise';
import { HCI, VOLUME_SNAPSHOT } from '../types'; import { HCI, VOLUME_SNAPSHOT } from '../types';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
const schema = { const schema = {
id: HCI.VOLUME, id: HCI.VOLUME,
@ -72,7 +70,7 @@ export default {
}, },
filterRows() { filterRows() {
// we only show the non golden image PVCs in the list // we only show the non golden image PVCs in the list
return this.rows.filter((pvc) => pvc?.metadata?.annotations?.[HCI_ANNOTATIONS.GOLDEN_IMAGE] !== 'true'); return this.rows.filter((pvc) => !pvc?.isGoldenImageVolume);
}, },
headers() { headers() {
return [ return [

4
pkg/harvester/models/harvester/persistentvolumeclaim.js
View File

@ -344,6 +344,10 @@ export default class HciPv extends HarvesterResource {
return this.dataEngine === DATA_ENGINE_V2; return this.dataEngine === DATA_ENGINE_V2;
} }
get isGoldenImageVolume() {
return this?.metadata?.annotations?.[HCI_ANNOTATIONS.GOLDEN_IMAGE] === 'true';
}
get thirdPartyStorageFeatureEnabled() { get thirdPartyStorageFeatureEnabled() {
return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage'); return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
} }