Remove feature gate from MHC

Author: enxebre

pkg/operator/operator_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -175,116 +174,3 @@ func TestOperatorSync_NoOp(t *testing.T) {
 		})
 	}
 }
-
-func deploymentHasContainer(d *appsv1.Deployment, containerName string) bool {
-	for _, container := range d.Spec.Template.Spec.Containers {
-		if container.Name == containerName {
-			return true
-		}
-	}
-	return false
-}
-
-func TestOperatorSyncClusterAPIControllerHealthCheckController(t *testing.T) {
-	tests := []struct {
-		featureGate                          *v1.FeatureGate
-		expectedMachineHealthCheckController bool
-	}{{
-		featureGate:                          newFeatureGate(v1.Default),
-		expectedMachineHealthCheckController: false,
-	}, {
-		featureGate:                          &v1.FeatureGate{},
-		expectedMachineHealthCheckController: false,
-	}, {
-		featureGate:                          newFeatureGate(v1.TechPreviewNoUpgrade),
-		expectedMachineHealthCheckController: true,
-	}}
-
-	for _, tc := range tests {
-		infra := &v1.Infrastructure{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "cluster",
-			},
-			Status: v1.InfrastructureStatus{
-				Platform: v1.AWSPlatformType,
-			},
-		}
-
-		stopCh := make(<-chan struct{})
-		optr := newFakeOperator(nil, []runtime.Object{tc.featureGate, infra}, stopCh)
-		go optr.Run(2, stopCh)
-
-		if err := wait.PollImmediate(1*time.Second, 5*time.Second, func() (bool, error) {
-			d, err := optr.deployLister.Deployments(targetNamespace).Get(deploymentName)
-			if err != nil {
-				t.Logf("Failed to get %q deployment: %v", deploymentName, err)
-				return false, nil
-			}
-			if deploymentHasContainer(d, hcControllerName) != tc.expectedMachineHealthCheckController {
-				t.Logf("Expected deploymentHasContainer for %q container to be %t", hcControllerName, tc.expectedMachineHealthCheckController)
-				return false, nil
-			}
-			return true, nil
-		}); err != nil {
-			t.Errorf("Failed to verify %q deployment", deploymentName)
-		}
-	}
-}
-
-func TestEnableDisableOperatorSyncClusterAPIControllerHealthCheckController(t *testing.T) {
-	infra := &v1.Infrastructure{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "cluster",
-		},
-		Status: v1.InfrastructureStatus{
-			Platform: v1.AWSPlatformType,
-		},
-	}
-	stopCh := make(chan struct{})
-	defer close(stopCh)
-
-	optr := newFakeOperator(nil, []runtime.Object{newFeatureGate(v1.TechPreviewNoUpgrade), infra}, stopCh)
-	go optr.Run(2, stopCh)
-
-	if err := wait.PollImmediate(1*time.Second, 5*time.Second, func() (bool, error) {
-		d, err := optr.deployLister.Deployments(targetNamespace).Get(deploymentName)
-		if err != nil {
-			t.Logf("Failed to get %q deployment: %v", deploymentName, err)
-			return false, nil
-		}
-		if !deploymentHasContainer(d, hcControllerName) {
-			t.Logf("Failed to verify that deployment %q has container %q", deploymentName, hcControllerName)
-			return false, nil
-		}
-		return true, nil
-	}); err != nil {
-		t.Fatalf("Failed to verify that deployment %q has container %q", deploymentName, hcControllerName)
-	}
-
-	t.Logf("Found %q container in %q deployment", hcControllerName, deploymentName)
-
-	hcFeatureGate, err := optr.osClient.ConfigV1().FeatureGates().Get(MachineAPIFeatureGateName, metav1.GetOptions{})
-	if err != nil {
-		t.Fatalf("Unable to get %q feature gate: %v", MachineAPIFeatureGateName, err)
-	}
-	hcFeatureGate.Spec.FeatureSet = v1.Default
-	if _, err := optr.osClient.ConfigV1().FeatureGates().Update(hcFeatureGate); err != nil {
-		t.Fatalf("Unable to update %q feature gate and set default feature set: %v", MachineAPIFeatureGateName, err)
-	}
-
-	if err := wait.PollImmediate(1*time.Second, 15*time.Second, func() (bool, error) {
-		d, err := optr.deployLister.Deployments(targetNamespace).Get(deploymentName)
-		if err != nil {
-			t.Logf("Failed to get %q deployment: %v", deploymentName, err)
-			return false, nil
-		}
-		if deploymentHasContainer(d, hcControllerName) {
-			t.Logf("Failed to verify that deployment %q has no container with name %q", deploymentName, hcControllerName)
-			return false, nil
-		}
-		return true, nil
-	}); err != nil {
-		t.Errorf("Failed to verify that deployment %q has no container with name %q ", deploymentName, hcControllerName)
-	}
-
-}

pkg/operator/sync.go

@@ -253,16 +253,13 @@ func newContainers(config *OperatorConfig, features map[string]bool) []corev1.Co
 			Args:      args,
 			Resources: resources,
 		},
-	}
-	// add machine-health-check controller container if it exists and enabled under feature gates
-	if enabled, ok := features[FeatureGateMachineHealthCheck]; ok && enabled {
-		containers = append(containers, corev1.Container{
+		{
 			Name:      "machine-healthcheck-controller",
 			Image:     config.Controllers.MachineHealthCheck,
 			Command:   []string{"/machine-healthcheck"},
 			Args:      args,
 			Resources: resources,
-		})
+		},
 	}
 	return containers
 }