mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2025-12-13 13:11:43 +00:00
fix: inherit labels (#322)
Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
This commit is contained in:
parent
9e015ec3b1
commit
01528f7429
@ -189,6 +189,10 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.value.spec['templateId'] = `${ namespace }/${ name }`;
|
this.value.spec['templateId'] = `${ namespace }/${ name }`;
|
||||||
|
this.value.spec.vm.metadata.labels = {
|
||||||
|
...this.value.spec.vm.metadata.labels,
|
||||||
|
...this.value.metadata.labels
|
||||||
|
};
|
||||||
const res = await this.value.save();
|
const res = await this.value.save();
|
||||||
|
|
||||||
await this.saveSecret(res);
|
await this.saveSecret(res);
|
||||||
|
|||||||
@ -255,6 +255,10 @@ export default {
|
|||||||
|
|
||||||
cloneVersionVM.metadata.annotations[HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE] = JSON.stringify(deleteDataSource);
|
cloneVersionVM.metadata.annotations[HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE] = JSON.stringify(deleteDataSource);
|
||||||
|
|
||||||
|
// Update labels and instance labels value
|
||||||
|
this.value.metadata.labels = cloneVersionVM.metadata.labels;
|
||||||
|
this.value.spec.template.metadata.labels = cloneVersionVM.spec.template.metadata.labels;
|
||||||
|
|
||||||
this.getInitConfig({
|
this.getInitConfig({
|
||||||
value: cloneVersionVM, existUserData: true, fromTemplate: true
|
value: cloneVersionVM, existUserData: true, fromTemplate: true
|
||||||
});
|
});
|
||||||
|
|||||||
@ -60,11 +60,11 @@ export default class HciVmTemplateVersion extends HarvesterResource {
|
|||||||
applyDefaults() {
|
applyDefaults() {
|
||||||
const spec = {
|
const spec = {
|
||||||
vm: {
|
vm: {
|
||||||
metadata: { annotations: { [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: '[]' } },
|
metadata: { annotations: { [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: '[]' }, labels: {} },
|
||||||
spec: {
|
spec: {
|
||||||
runStrategy: 'RerunOnFailure',
|
runStrategy: 'RerunOnFailure',
|
||||||
template: {
|
template: {
|
||||||
metadata: { annotations: {} },
|
metadata: { annotations: {}, labels: {} },
|
||||||
spec: {
|
spec: {
|
||||||
domain: {
|
domain: {
|
||||||
machine: { type: '' },
|
machine: { type: '' },
|
||||||
|
|||||||
@ -233,7 +233,7 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
const spec = {
|
const spec = {
|
||||||
runStrategy: 'RerunOnFailure',
|
runStrategy: 'RerunOnFailure',
|
||||||
template: {
|
template: {
|
||||||
metadata: { annotations: {} },
|
metadata: { annotations: {}, labels: {} },
|
||||||
spec: {
|
spec: {
|
||||||
domain: {
|
domain: {
|
||||||
machine: { type: '' },
|
machine: { type: '' },
|
||||||
@ -283,6 +283,7 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
|
|
||||||
if (realMode !== _CLONE) {
|
if (realMode !== _CLONE) {
|
||||||
this.metadata['annotations'] = { [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: '[]' };
|
this.metadata['annotations'] = { [HCI_ANNOTATIONS.VOLUME_CLAIM_TEMPLATE]: '[]' };
|
||||||
|
this.metadata['labels'] = {};
|
||||||
this['spec'] = spec;
|
this['spec'] = spec;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user