From 6eb845b46b64e359ae7edea3dd27738949557614 Mon Sep 17 00:00:00 2001 From: Yi-Ya Chen Date: Mon, 10 Feb 2025 18:18:49 +0800 Subject: [PATCH] refactor: update feature flag Signed-off-by: Yi-Ya Chen (cherry picked from commit 1651e201e8f455b8bf5ed16326b70ccce33cdf68) --- pkg/harvester/config/feature-flags.js | 2 +- ...rvesterhci.io.virtualmachinetemplateversion.vue | 6 +++--- .../edit/kubevirt.io.virtualmachine/index.vue | 6 +++--- pkg/harvester/l10n/en-us.yaml | 2 +- pkg/harvester/mixins/harvester-vm/impl.js | 2 +- pkg/harvester/mixins/harvester-vm/index.js | 14 +++++++------- ...arvesterhci.io.virtualmachinetemplateversion.js | 4 ++-- pkg/harvester/models/kubevirt.io.virtualmachine.js | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js index 05581682..5ece95f0 100644 --- a/pkg/harvester/config/feature-flags.js +++ b/pkg/harvester/config/feature-flags.js @@ -48,7 +48,7 @@ const featuresV142 = [ // TODO: add v1.5.0 official release note const featuresV150 = [ ...featuresV142, - 'VMPersistentState' + 'tpmPersistentState' ]; export const RELEASE_FEATURES = { diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue index edba114d..477cac13 100644 --- a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue +++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue @@ -466,11 +466,11 @@ export default { /> diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue index 47402f22..8e67f575 100644 --- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue +++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue @@ -874,11 +874,11 @@ export default { /> diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml index 7926e9f9..8df57428 100644 --- a/pkg/harvester/l10n/en-us.yaml +++ b/pkg/harvester/l10n/en-us.yaml @@ -594,7 +594,7 @@ harvester: enableUsb: Enable USB Tablet advancedOptions: tpm: Enable TPM - persistentState: Persistent State + tpmPersistentState: TPM Persistent State cpuManager: prefix: You must enable CPU Manager for at least one node in middle: 'host page' diff --git a/pkg/harvester/mixins/harvester-vm/impl.js b/pkg/harvester/mixins/harvester-vm/impl.js index 7592990b..ffb0e56a 100644 --- a/pkg/harvester/mixins/harvester-vm/impl.js +++ b/pkg/harvester/mixins/harvester-vm/impl.js @@ -140,7 +140,7 @@ export default { return !!spec?.template?.spec?.domain?.devices?.tpm; }, - isPersistentStateEnabled(spec) { + isTPMPersistentStateEnabled(spec) { return !!spec?.template?.spec?.domain?.devices?.tpm?.persistent; }, diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js index 6aa38a91..062e57d1 100644 --- a/pkg/harvester/mixins/harvester-vm/index.js +++ b/pkg/harvester/mixins/harvester-vm/index.js @@ -164,7 +164,7 @@ export default { accessCredentials: [], efiEnabled: false, tpmEnabled: false, - persistentStateEnabled: false, + tpmPersistentStateEnabled: false, secureBoot: false, userDataTemplateId: '', saveUserDataAsClearText: false, @@ -368,7 +368,7 @@ export default { const installAgent = this.hasInstallAgent(userData, osType, true); const efiEnabled = this.isEfiEnabled(spec); const tpmEnabled = this.isTpmEnabled(spec); - const persistentStateEnabled = this.isPersistentStateEnabled(spec); + const tpmPersistentStateEnabled = this.isTPMPersistentStateEnabled(spec); const secureBoot = this.isSecureBoot(spec); const cpuPinning = this.isCpuPinning(spec); @@ -401,7 +401,7 @@ export default { this['installUSBTablet'] = installUSBTablet; this['efiEnabled'] = efiEnabled; this['tpmEnabled'] = tpmEnabled; - this['persistentStateEnabled'] = persistentStateEnabled; + this['tpmPersistentStateEnabled'] = tpmPersistentStateEnabled; this['secureBoot'] = secureBoot; this['cpuPinning'] = cpuPinning; @@ -1424,8 +1424,8 @@ export default { } }, - setPersistentStateEnabled(persistentStateEnabled) { - if (persistentStateEnabled) { + setTPMPersistentStateEnabled(tpmPersistentStateEnabled) { + if (tpmPersistentStateEnabled) { set(this.spec.template.spec.domain.devices, 'tpm', { persistent: true }); } else { set(this.spec.template.spec.domain.devices, 'tpm', {}); @@ -1555,8 +1555,8 @@ export default { this.setTPM(val); }, - persistentStateEnabled(val) { - this.setPersistentStateEnabled(val); + tpmPersistentStateEnabled(val) { + this.setTPMPersistentStateEnabled(val); }, installAgent: { diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachinetemplateversion.js b/pkg/harvester/models/harvesterhci.io.virtualmachinetemplateversion.js index d17bb187..fa385dd0 100644 --- a/pkg/harvester/models/harvesterhci.io.virtualmachinetemplateversion.js +++ b/pkg/harvester/models/harvesterhci.io.virtualmachinetemplateversion.js @@ -277,7 +277,7 @@ export default class HciVmTemplateVersion extends HarvesterResource { this.spec.vm.spec.template.metadata['labels'] = { ...wasIgnored, ...val }; } - get persistentStateFeatureEnabled() { - return this.$rootGetters['harvester-common/getFeatureEnabled']('VMPersistentState'); + get tpmPersistentStateFeatureEnabled() { + return this.$rootGetters['harvester-common/getFeatureEnabled']('tpmPersistentState'); } } diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js index 3643c784..9eea0783 100644 --- a/pkg/harvester/models/kubevirt.io.virtualmachine.js +++ b/pkg/harvester/models/kubevirt.io.virtualmachine.js @@ -1175,8 +1175,8 @@ export default class VirtVm extends HarvesterResource { return this.$rootGetters['harvester-common/getFeatureEnabled']('volumeEncryption'); } - get persistentStateFeatureEnabled() { - return this.$rootGetters['harvester-common/getFeatureEnabled']('VMPersistentState'); + get tpmPersistentStateFeatureEnabled() { + return this.$rootGetters['harvester-common/getFeatureEnabled']('tpmPersistentState'); } setInstanceLabels(val) {