BUG: always configure metricsProviders with RelieveAndMigrate

RelieveAndMigrate is now (after #510) trying to consume
by default a Prometheous query so metricsProviders should
always appear in the descheduler configuration when
RelieveAndMigrate profile is in use, even without any
profileCustomizations.

Signed-off-by: Simone Tiraboschi <[email protected]>

Author: tiraboschi

pkg/operator/target_config_reconciler.go

@@ -1301,19 +1301,19 @@ func (c *TargetConfigReconciler) manageConfigMap(descheduler *deschedulerv1.Kube
 		}
 	}
 
-	if descheduler.Spec.ProfileCustomizations != nil && descheduler.Spec.ProfileCustomizations.DevActualUtilizationProfile != "" {
+	if c.isPrometheusAsMetricsProviderForProfiles(descheduler) {
 		// detect the prometheus server url
 		route, err := c.routeRouteLister.Routes("openshift-monitoring").Get("prometheus-k8s")
 		if err != nil {
-			return nil, false, fmt.Errorf("unable to get openshift-monitoring/prometheus-k8s route: %v", err)
+			return nil, true, fmt.Errorf("unable to get openshift-monitoring/prometheus-k8s route: %v", err)
 		}
 		if len(route.Status.Ingress) == 0 {
-			return nil, false, fmt.Errorf("No ingress found in openshift-monitoring/prometheus-k8s route")
+			return nil, true, fmt.Errorf("No ingress found in openshift-monitoring/prometheus-k8s route")
 		}
 		if route.Status.Ingress[0].Host == "" {
-			return nil, false, fmt.Errorf("Host for status.ingress[0] in openshift-monitoring/prometheus-k8s route is empty")
+			return nil, true, fmt.Errorf("Host for status.ingress[0] in openshift-monitoring/prometheus-k8s route is empty")
 		}
-		err = c.checkNamepsaceMonitoringLabel()
+		err = c.checkNamespaceMonitoringLabel()
 		if err != nil {
 			return nil, false, err
 		}
@@ -1640,7 +1640,7 @@ func (c *TargetConfigReconciler) eventHandler() cache.ResourceEventHandler {
 	}
 }
 
-func (c *TargetConfigReconciler) checkNamepsaceMonitoringLabel() error {
+func (c *TargetConfigReconciler) checkNamespaceMonitoringLabel() error {
 	operatorNamespace, err := c.namespaceLister.Get(operatorclient.OperatorNamespace)
 	if err != nil {
 		klog.ErrorS(err, "error fetching operator namespace")
@@ -1714,3 +1714,14 @@ func (c *TargetConfigReconciler) isSoftTainterNeeded(descheduler *deschedulerv1.
 	}
 	return leftoverSoftTaints, nil
 }
+
+// isPrometheusAsMetricsProviderForProfiles returns true when at least a profile that by default relies on PrometheusMetrics is in use
+// or the user is explicitly configuring DevActualUtilizationProfile profile customization
+func (c *TargetConfigReconciler) isPrometheusAsMetricsProviderForProfiles(descheduler *deschedulerv1.KubeDescheduler) bool {
+	if descheduler != nil &&
+		(slices.Contains(descheduler.Spec.Profiles, deschedulerv1.RelieveAndMigrate) ||
+			(descheduler.Spec.ProfileCustomizations != nil && descheduler.Spec.ProfileCustomizations.DevActualUtilizationProfile != "")) {
+		return true
+	}
+	return false
+}