fix(core, kubevirt): remove ht from discovery

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>

Author: nevermarine

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go

@@ -166,9 +166,8 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 		cpu.Features = []virtv1.CPUFeature{{Name: HTCPUFeature, Policy: "require"}}
 	case v1alpha2.CPUTypeDiscovery, v1alpha2.CPUTypeFeatures:
 		cpu.Model = GenericCPUModel
-		features := make([]virtv1.CPUFeature, 0, len(class.Status.CpuFeatures.Enabled)+2)
+		features := make([]virtv1.CPUFeature, 0, len(class.Status.CpuFeatures.Enabled)+1)
 		hasSvm := false
-		hasHT := false
 		for _, feature := range class.Status.CpuFeatures.Enabled {
 			policy := "require"
 			if feature == "invtsc" {
@@ -177,9 +176,6 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 			if feature == "svm" {
 				hasSvm = true
 			}
-			if feature == HTCPUFeature {
-				hasHT = true
-			}
 			features = append(features, virtv1.CPUFeature{
 				Name:   feature,
 				Policy: policy,
@@ -188,9 +184,6 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 		if !hasSvm {
 			features = append(features, virtv1.CPUFeature{Name: "svm", Policy: "optional"})
 		}
-		if !hasHT {
-			features = append(features, virtv1.CPUFeature{Name: HTCPUFeature, Policy: "require"})
-		}
 		cpu.Features = features
 	default:
 		return fmt.Errorf("unexpected cpu type: %q", class.Spec.CPU.Type)

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_test.go

@@ -247,26 +247,6 @@ func TestSetCPUModel(t *testing.T) {
 		}
 	})
 
-	t.Run("should add required ht feature for discovery cpu", func(t *testing.T) {
-		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})
-		class := &v1alpha2.VirtualMachineClass{
-			Spec: v1alpha2.VirtualMachineClassSpec{
-				CPU: v1alpha2.CPU{Type: v1alpha2.CPUTypeDiscovery},
-			},
-			Status: v1alpha2.VirtualMachineClassStatus{
-				CpuFeatures: v1alpha2.CpuFeatures{Enabled: []string{"aes"}},
-			},
-		}
-
-		if err := builder.SetCPUModel(class); err != nil {
-			t.Fatalf("SetCPUModel() failed: %v", err)
-		}
-
-		features := builder.Resource.Spec.Template.Spec.Domain.CPU.Features
-		if !containsCPUFeature(features, virtv1.CPUFeature{Name: HTCPUFeature, Policy: "require"}) {
-			t.Fatalf("expected required ht feature to be added, got %#v", features)
-		}
-	})
 
 	t.Run("should keep existing ht feature policy when already present", func(t *testing.T) {
 		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})