Merge pull request #382 from csibbitt/OSPRH-6664/DashboardPrometheusR…

…ule_no_selector_required Remove unused selector on DashboardPrometheusRule
openstack-k8s-operators · Apr 30, 2024 · f5c888b · f5c888b
2 parents 2b08ec0 + 96be208
commit f5c888b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -553,10 +553,7 @@ func (r *MetricStorageReconciler) reconcileNormal(
 			},
 		}
 		op, err = controllerutil.CreateOrPatch(ctx, r.Client, prometheusRule, func() error {
-			ruleLabels := map[string]string{
-				common.AppSelector: telemetryv1.DefaultServiceName,
-			}
-			desiredPrometheusRule := metricstorage.DashboardPrometheusRule(instance, serviceLabels, ruleLabels)
+			desiredPrometheusRule := metricstorage.DashboardPrometheusRule(instance, serviceLabels)
 			desiredPrometheusRule.Spec.DeepCopyInto(&prometheusRule.Spec)
 			prometheusRule.ObjectMeta.Labels = desiredPrometheusRule.ObjectMeta.Labels
 			err = controllerutil.SetControllerReference(instance, prometheusRule, r.Scheme)

diff --git a/pkg/metricstorage/dashboard_prometheus_rule.go b/pkg/metricstorage/dashboard_prometheus_rule.go
@@ -26,7 +26,6 @@ import (
 func DashboardPrometheusRule(
 	instance *telemetryv1.MetricStorage,
 	labels map[string]string,
-	_ map[string]string,
 ) *monv1.PrometheusRule {
 
 	prometheusRule := &monv1.PrometheusRule{