Compare commits

...

2 Commits

Author SHA1 Message Date
mergify[bot]
0fc8bece02
chore: bump version to v1.7.0-rc6 (#649) (#650)
(cherry picked from commit 57695886336a7553b5ffdf6bb65093fa2037b3e6)

Signed-off-by: Andy Lee <andy.lee@suse.com>
Co-authored-by: Andy Lee <andy.lee@suse.com>
2025-12-11 16:50:51 +08:00
mergify[bot]
39764af627
fix: failed to create multiple VMs (#647) (#648)
(cherry picked from commit b29950f99cbcaf40919654fee8f6a58201a33574)

Signed-off-by: Andy Lee <andy.lee@suse.com>
Co-authored-by: Andy Lee <andy.lee@suse.com>
2025-12-11 16:17:02 +08:00
3 changed files with 12 additions and 16 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "harvester-ui-extension", "name": "harvester-ui-extension",
"version": "1.7.0-rc5", "version": "1.7.0-rc6",
"private": false, "private": false,
"engines": { "engines": {
"node": ">=20.0.0" "node": ">=20.0.0"

View File

@ -709,7 +709,8 @@ export default {
const volumeClaimTemplates = []; const volumeClaimTemplates = [];
disk.forEach( (R, index) => { disk.forEach( (R, index) => {
const dataVolumeName = this.parseDataVolumeName(R); const prefixName = this.value.metadata?.name || '';
const dataVolumeName = this.parseDataVolumeName(R, prefixName);
const _disk = this.parseDisk(R, index); const _disk = this.parseDisk(R, index);
const _volume = this.parseVolume(R, dataVolumeName); const _volume = this.parseVolume(R, dataVolumeName);
@ -1004,23 +1005,18 @@ export default {
this['cpuMemoryHotplugEnabled'] = cpuMemoryHotplugEnabled; this['cpuMemoryHotplugEnabled'] = cpuMemoryHotplugEnabled;
}, },
parseDataVolumeName(R) { parseDataVolumeName(R, prefixName) {
const prefixName = this.value.metadata?.name || '';
let dataVolumeName = ''; let dataVolumeName = '';
if (!R.dataVolumeName) { if (R.source === SOURCE_TYPE.ATTACH_VOLUME) {
if (R.source === SOURCE_TYPE.ATTACH_VOLUME) { dataVolumeName = R.volumeName;
dataVolumeName = R.volumeName; } else if (this.isClone || !this.hasCreateVolumes.includes(R.realName)) {
} else if (this.isClone || !this.hasCreateVolumes.includes(R.realName)) { dataVolumeName = `${ prefixName }-${ R.name }-${ randomStr(5).toLowerCase() }`;
dataVolumeName = `${ prefixName }-${ R.name }-${ randomStr(5).toLowerCase() }`; } else {
} else { dataVolumeName = R.realName;
dataVolumeName = R.realName;
}
R.dataVolumeName = dataVolumeName;
} }
return R.dataVolumeName; return dataVolumeName;
}, },
parseDisk(R, index) { parseDisk(R, index) {

View File

@ -1,7 +1,7 @@
{ {
"name": "harvester", "name": "harvester",
"description": "Rancher UI Extension for Harvester", "description": "Rancher UI Extension for Harvester",
"version": "1.7.0-rc5", "version": "1.7.0-rc6",
"private": false, "private": false,
"rancher": { "rancher": {
"annotations": { "annotations": {