public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2026-03-22 05:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: container disks don't need volumeClaimTemplates but volumes (#735) (#737)

Browse Source 
(cherry picked from commit 888ec7a50fdc2e8ffc7d5210ae0e39d30c3e43cc)

Signed-off-by: Tim Liou <tim.liou@suse.com>
Co-authored-by: Tim Liou <tim.liou@suse.com>
This commit is contained in:
mergify[bot] 2026-03-12 17:45:40 +08:00 committed by GitHub
parent cfc7a76fe7
commit 6d627f82e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/harvester/mixins/harvester-vm/index.js
View File

@ -707,18 +707,22 @@ export default {
} }
}, },
needVolume(R) { needVolumeRelatedInfo(R) {
if (R.image === EMPTY_IMAGE) { // return [needVolume, needVolumeClaimTemplate]
return false; if (R.source === SOURCE_TYPE.CONTAINER) {
return [true, false];
} }
return true; if (R.source === SOURCE_TYPE.IMAGE && R.image === EMPTY_IMAGE) {
return [false, false];
}
return [true, true];
}, },
parseDiskRows(disk) { parseDiskRows(disk) {
const disks = []; const disks = [];
const volumes = []; const volumes = [];
const diskNameLabels = [];
const volumeClaimTemplates = []; const volumeClaimTemplates = [];
disk.forEach( (R, index) => { disk.forEach( (R, index) => {
@ -726,14 +730,18 @@ export default {
disks.push(_disk); disks.push(_disk);
if (this.needVolume(R)) { const prefixName = this.value.metadata?.name || '';
const prefixName = this.value.metadata?.name || ''; const dataVolumeName = this.parseDataVolumeName(R, prefixName);
const dataVolumeName = this.parseDataVolumeName(R, prefixName); const [needVolume, needVolumeClaimTemplate] = this.needVolumeRelatedInfo(R);
if (needVolume) {
const _volume = this.parseVolume(R, dataVolumeName); const _volume = this.parseVolume(R, dataVolumeName);
const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
volumes.push(_volume); volumes.push(_volume);
diskNameLabels.push(dataVolumeName); }
if (needVolumeClaimTemplate) {
const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
volumeClaimTemplates.push(_dataVolumeTemplate); volumeClaimTemplates.push(_dataVolumeTemplate);
} }
}); });