From eb667fd56b2bd45e08ffbb11fd08faf453dd1b2f Mon Sep 17 00:00:00 2001 From: "andy.lee" Date: Wed, 8 Jan 2025 14:41:18 +0800 Subject: [PATCH 1/3] fix: missing label in VM scheduling tab Signed-off-by: andy.lee --- pkg/harvester/mixins/harvester-vm/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js index eae47688..ebe2c1f1 100644 --- a/pkg/harvester/mixins/harvester-vm/index.js +++ b/pkg/harvester/mixins/harvester-vm/index.js @@ -282,14 +282,14 @@ export default { affinityLabels() { return { - namespaceInputLabel: this.t('harvesterManager.affinity.namespaces.label'), + namespaceInputLabel: this.t('harvester.virtualMachine.affinity.namespaces.label'), namespaceSelectionLabels: [ - this.t('harvesterManager.affinity.thisPodNamespace'), + this.t('harvester.virtualMachine.affinity.thisPodNamespace'), this.t('workload.scheduling.affinity.allNamespaces'), - this.t('harvesterManager.affinity.matchExpressions.inNamespaces') + this.t('harvester.virtualMachine.affinity.matchExpressions.inNamespaces') ], - addLabel: this.t('harvesterManager.affinity.addLabel'), - topologyKeyPlaceholder: this.t('harvesterManager.affinity.topologyKey.placeholder') + addLabel: this.t('harvester.affinity.addLabel'), + topologyKeyPlaceholder: this.t('harvester.affinity.topologyKey.placeholder') }; }, }, From ab71cb377c9d93ce7cc0b3639e6d09275e517f47 Mon Sep 17 00:00:00 2001 From: "andy.lee" Date: Thu, 9 Jan 2025 10:59:49 +0800 Subject: [PATCH 2/3] fix: update translation key Signed-off-by: andy.lee --- pkg/harvester/mixins/harvester-vm/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js index ebe2c1f1..a375de2d 100644 --- a/pkg/harvester/mixins/harvester-vm/index.js +++ b/pkg/harvester/mixins/harvester-vm/index.js @@ -282,7 +282,7 @@ export default { affinityLabels() { return { - namespaceInputLabel: this.t('harvester.virtualMachine.affinity.namespaces.label'), + namespaceInputLabel: this.t('harvester.affinity.namespaces.label'), namespaceSelectionLabels: [ this.t('harvester.virtualMachine.affinity.thisPodNamespace'), this.t('workload.scheduling.affinity.allNamespaces'), From 8b43c200b2d41e22839ab7acfeb9fe92c983b9c5 Mon Sep 17 00:00:00 2001 From: "andy.lee" Date: Thu, 9 Jan 2025 16:13:51 +0800 Subject: [PATCH 3/3] fix: remove translation key Signed-off-by: andy.lee --- pkg/harvester/l10n/en-us.yaml | 15 +++------------ pkg/harvester/mixins/harvester-vm/index.js | 6 +++--- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml index ffba1efd..db4e5040 100644 --- a/pkg/harvester/l10n/en-us.yaml +++ b/pkg/harvester/l10n/en-us.yaml @@ -742,6 +742,9 @@ harvester: terminationGracePeriodSeconds: label: Termination Grace Period affinity: + addLabel: Add Workload Selector + topologyKey: + placeholder: 'topology.kubernetes.io/zone' thisPodNamespace: This virtual machine's namespace matchExpressions: inNamespaces: "Workloads in these namespaces" @@ -1494,18 +1497,6 @@ harvester: pollingInterval: label: Polling Interval - affinity: - thisPodNamespace: This virtual machine's namespace - matchExpressions: - inNamespaces: "Workloads in these namespaces" - vmAffinityTitle: Virtual Machine Scheduling - namespaces: - placeholder: e.g. default,system,base - label: Namespaces - addLabel: Add Workload Selector - topologyKey: - placeholder: 'topology.kubernetes.io/zone' - advancedSettings: experimental: 'Experimental features allow users to test and evaluate early-access functionality prior to official supported releases' descriptions: diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js index a375de2d..d04df2bd 100644 --- a/pkg/harvester/mixins/harvester-vm/index.js +++ b/pkg/harvester/mixins/harvester-vm/index.js @@ -282,14 +282,14 @@ export default { affinityLabels() { return { - namespaceInputLabel: this.t('harvester.affinity.namespaces.label'), + namespaceInputLabel: this.t('harvester.virtualMachine.affinity.namespaces.label'), namespaceSelectionLabels: [ this.t('harvester.virtualMachine.affinity.thisPodNamespace'), this.t('workload.scheduling.affinity.allNamespaces'), this.t('harvester.virtualMachine.affinity.matchExpressions.inNamespaces') ], - addLabel: this.t('harvester.affinity.addLabel'), - topologyKeyPlaceholder: this.t('harvester.affinity.topologyKey.placeholder') + addLabel: this.t('harvester.virtualMachine.affinity.addLabel'), + topologyKeyPlaceholder: this.t('harvester.virtualMachine.affinity.topologyKey.placeholder') }; }, },