From 7af8a82838f9e0d5cc6033057f398331413409c9 Mon Sep 17 00:00:00 2001
From: Yiya Chen <yiya.chen@suse.com>
Date: Wed, 8 Oct 2025 13:41:35 +0800
Subject: [PATCH] feat: remove machine type dropdown (#546)

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 pkg/harvester/config/feature-flags.js                   | 5 +++--
 pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue | 5 ++++-
 pkg/harvester/mixins/harvester-vm/index.js              | 6 ++++--
 pkg/harvester/models/kubevirt.io.virtualmachine.js      | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js
index ea7fdb02..ef0ffd56 100644
--- a/pkg/harvester/config/feature-flags.js
+++ b/pkg/harvester/config/feature-flags.js
@@ -39,7 +39,6 @@ const FEATURE_FLAGS = {
   ],
   'v1.5.1': [],
   'v1.6.0': [
-    'vmMachineTypes',
     'customSupportBundle',
     'csiOnlineExpandValidation',
     'vmNetworkMigration',
@@ -50,7 +49,9 @@ const FEATURE_FLAGS = {
     'vmCloneRunStrategy',
   ],
   'v1.6.1': [],
-  'v1.7.0': []
+  'v1.7.0': [
+    'vmMachineTypeAuto'
+  ]
 };
 
 const generateFeatureFlags = () => {
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index 1a27322f..0321cb3d 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -873,7 +873,10 @@ export default {
               />
             </div>
 
-            <div class="col span-6">
+            <div
+              v-if="!value.vmMachineTypeAutoFeatureEnabled"
+              class="col span-6"
+            >
               <LabeledSelect
                 v-model:value="machineType"
                 label-key="harvester.virtualMachine.input.MachineType"
diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
index 3a5d5f4e..2a7c2071 100644
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@@ -299,9 +299,11 @@ export default {
   async created() {
     await this.$store.dispatch(`${ this.inStore }/findAll`, { type: SECRET });
 
-    if (this.value.vmMachineTypesFeatureEnabled) {
+    if (!this.value.vmMachineTypeAutoFeatureEnabled) {
       try {
-        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl']('v1/harvester/clusters/local?link=machineTypes');
+        const url = this.$store.getters['harvester-common/getHarvesterClusterUrl'](
+          'v1/harvester/clusters/local?link=machineTypes'
+        );
         const machineTypes = await this.$store.dispatch('harvester/request', { url });
 
         this.machineTypes = machineTypes;
diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js
index 7e538354..3071c3a1 100644
--- a/pkg/harvester/models/kubevirt.io.virtualmachine.js
+++ b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@@ -1236,8 +1236,8 @@ export default class VirtVm extends HarvesterResource {
     return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
   }
 
-  get vmMachineTypesFeatureEnabled() {
-    return this.$rootGetters['harvester-common/getFeatureEnabled']('vmMachineTypes');
+  get vmMachineTypeAutoFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('vmMachineTypeAuto');
   }
 
   get isBackupTargetUnavailable() {