Merge pull request #2425 from machine424/metrics-server-cl

MON-3900: follow-up: clean up operator logic and some tests now that metrics-server is the default Metrics API backend

Author: openshift-merge-bot[bot]

pkg/operator/operator.go

@@ -168,7 +168,6 @@ type Operator struct {
 	telemetryMatches          []string
 	remoteWrite               bool
 	userWorkloadEnabled       bool
-	metricsServerEnabled      bool
 	collectionProfilesEnabled bool
 
 	lastKnowInfrastructureConfig *InfrastructureConfig
@@ -266,7 +265,6 @@ func New(
 		userWorkloadConfigMapName: userWorkloadConfigMapName,
 		remoteWrite:               remoteWrite,
 		userWorkloadEnabled:       false,
-		metricsServerEnabled:      false,
 		collectionProfilesEnabled: false,
 		namespace:                 namespace,
 		namespaceUserWorkload:     namespaceUserWorkload,
@@ -472,16 +470,11 @@ func New(
 		if err != nil {
 			return nil, err
 		}
-		o.metricsServerEnabled = featureGates.Enabled(features.FeatureGateMetricsServer)
 		o.collectionProfilesEnabled = featureGates.Enabled(features.FeatureGateMetricsCollectionProfiles)
 	case <-time.After(1 * time.Minute):
 		return nil, fmt.Errorf("timed out waiting for FeatureGate detection")
 	}
 
-	if o.metricsServerEnabled {
-		klog.Info("Metrics Server enabled")
-	}
-
 	// csrController runs a controller that requests a client TLS certificate
 	// for Prometheus k8s. This certificate is used to authenticate against the
 	// /metrics endpoint of the targets.
@@ -819,7 +812,7 @@ func (o *Operator) sync(ctx context.Context, key string) error {
 				newTaskSpec("NodeExporter", tasks.NewNodeExporterTask(o.client, factory)),
 				newTaskSpec("KubeStateMetrics", tasks.NewKubeStateMetricsTask(o.client, factory, *o.lastKnownVPACustomResourceDefinitionPresent)),
 				newTaskSpec("OpenshiftStateMetrics", tasks.NewOpenShiftStateMetricsTask(o.client, factory)),
-				newTaskSpec("MetricsServer", tasks.NewMetricsServerTask(ctx, o.namespace, o.client, o.metricsServerEnabled, factory, config)),
+				newTaskSpec("MetricsServer", tasks.NewMetricsServerTask(ctx, o.namespace, o.client, factory, config)),
 				newTaskSpec("TelemeterClient", tasks.NewTelemeterClientTask(o.client, factory, config)),
 				newTaskSpec("ThanosQuerier", tasks.NewThanosQuerierTask(o.client, factory, config)),
 				newTaskSpec("ControlPlaneComponents", tasks.NewControlPlaneTask(o.client, factory, config)),

pkg/tasks/metricsserver.go

@@ -13,17 +13,15 @@ import (
 
 type MetricsServerTask struct {
 	client    *client.Client
-	enabled   bool
 	ctx       context.Context
 	factory   *manifests.Factory
 	config    *manifests.Config
 	namespace string
 }
 
-func NewMetricsServerTask(ctx context.Context, namespace string, client *client.Client, metricsServerEnabled bool, factory *manifests.Factory, config *manifests.Config) *MetricsServerTask {
+func NewMetricsServerTask(ctx context.Context, namespace string, client *client.Client, factory *manifests.Factory, config *manifests.Config) *MetricsServerTask {
 	return &MetricsServerTask{
 		client:    client,
-		enabled:   metricsServerEnabled,
 		factory:   factory,
 		config:    config,
 		namespace: namespace,
@@ -32,13 +30,6 @@ func NewMetricsServerTask(ctx context.Context, namespace string, client *client.
 }
 
 func (t *MetricsServerTask) Run(ctx context.Context) error {
-	if t.enabled {
-		return t.create(ctx)
-	}
-	return nil
-}
-
-func (t *MetricsServerTask) create(ctx context.Context) error {
 	{
 		// TODO: This is a temporary workaround until the requirements for https://github.com/openshift/cluster-monitoring-operator/pull/2329
 		// are ready.

test/e2e/framework/helpers.go

@@ -197,41 +197,6 @@ func (f *Framework) GetClusterVersion(name string) (*configv1.ClusterVersion, er
 	return f.OpenShiftConfigClient.ConfigV1().ClusterVersions().Get(context.Background(), name, metav1.GetOptions{})
 }
 
-func (f *Framework) IsFeatureGateEnabled(t *testing.T, name string) bool {
-	t.Helper()
-	var enabledFeatureGates []configv1.FeatureGateAttributes
-	// Get cluster version
-	clusterVersion, err := f.GetClusterVersion("version")
-	if err != nil {
-		t.Fatalf("failed to get cluster version: %s", err.Error())
-	}
-
-	// Get the desired cluster version
-	version := clusterVersion.Status.Desired.Version
-
-	// Get FeatureGates
-	featureGates, err := f.OpenShiftConfigClient.ConfigV1().FeatureGates().Get(context.Background(), "cluster", metav1.GetOptions{})
-	if err != nil {
-		t.Fatalf("failed to get featuregate `cluster`: %s", err.Error())
-	}
-
-	// Get Enabled FeatureGates for the desired cluster version
-	for _, fg := range featureGates.Status.FeatureGates {
-		if fg.Version == version {
-			enabledFeatureGates = fg.Enabled
-			break
-		}
-	}
-
-	for _, g := range enabledFeatureGates {
-		if g.Name == configv1.FeatureGateName(name) {
-			return true
-		}
-	}
-
-	return false
-}
-
 func ensureCreatedByTestLabel(obj metav1.Object) {
 	// only add the label if it doesn't exist yet, leave existing values
 	// untouched

test/e2e/metrics_adapter_test.go

@@ -30,18 +30,6 @@ import (
 	apiservicesv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 )
 
-const MetricsServerFeatureGate string = "MetricsServer"
-
-func skipMetricsServerTests(t *testing.T) {
-	if !f.IsFeatureGateEnabled(t, MetricsServerFeatureGate) {
-		t.Skip("Skipping Metrics Server test")
-	}
-}
-
-func isAPIServicePointingToRightMetricsService(t *testing.T, metricsService *apiservicesv1.APIService) bool {
-	return metricsService.Spec.Service.Name == "metrics-server"
-}
-
 func isNodeInNodesList(node string, nodes []corev1.Node) bool {
 	for _, n := range nodes {
 		if n.Name == node {
@@ -242,7 +230,6 @@ func TestAggregatedMetricPermissions(t *testing.T) {
 }
 
 func TestMetricsServerRollout(t *testing.T) {
-	skipMetricsServerTests(t)
 	for _, test := range []scenario{
 		{
 			name:      "assert metrics-server deployment is rolled out",
@@ -266,18 +253,6 @@ func TestMetricsServerRollout(t *testing.T) {
 				},
 			),
 		},
-		{
-			name:      "assert prometheus-adapter service monitor is deleted",
-			assertion: f.AssertServiceMonitorDoesNotExist("prometheus-adapter", f.Ns),
-		},
-		{
-			name:      "assert prometheus-adapter service is deleted",
-			assertion: f.AssertServiceDoesNotExist("prometheus-adapter", f.Ns),
-		},
-		{
-			name:      "assert prometheus-adapter deployment is deleted",
-			assertion: f.AssertDeploymentDoesNotExist("prometheus-adapter", f.Ns),
-		},
 	} {
 		t.Run(test.name, test.assertion)
 	}

test/e2e/tls_security_profile_test.go

@@ -124,11 +124,9 @@ func TestTLSSecurityProfileConfiguration(t *testing.T) {
 			assertCorrectTLSConfiguration(t, "prometheus-k8s", "statefulset",
 				manifests.KubeRbacProxyTLSCipherSuitesFlag,
 				manifests.KubeRbacProxyMinTLSVersionFlag, tt.expectedCipherSuite, tt.expectedMinTLSVersion)
-			if f.IsFeatureGateEnabled(t, MetricsServerFeatureGate) {
-				assertCorrectTLSConfiguration(t, "metrics-server", "deployment",
-					manifests.MetricsServerTLSCipherSuitesFlag,
-					manifests.MetricsServerTLSMinTLSVersionFlag, tt.expectedCipherSuite, tt.expectedMinTLSVersion)
-			}
+			assertCorrectTLSConfiguration(t, "metrics-server", "deployment",
+				manifests.MetricsServerTLSCipherSuitesFlag,
+				manifests.MetricsServerTLSMinTLSVersionFlag, tt.expectedCipherSuite, tt.expectedMinTLSVersion)
 		})
 	}
 }