Merge pull request #612 from jlarriba/watch_secret

Add watch to PrometheusEndpoint secret in Autoscaling

Author: jlarriba

controllers/autoscaling_controller.go

@@ -452,7 +452,7 @@ func (r *AutoscalingReconciler) reconcileNormal(
 		Namespace: instance.Namespace,
 	}, prometheusEndpointSecret)
 	if err != nil {
-		Log.Info("No Prometheus Endpoint Secret found")
+		Log.Info("Prometheus Endpoint Secret not found")
 	}
 
 	if instance.Spec.PrometheusHost == "" {
@@ -825,7 +825,7 @@ func (r *AutoscalingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M
 		}
 		return nil
 	}
-	metricStorageFn := func(_ context.Context, o client.Object) []reconcile.Request {
+	prometheusEndpointFn := func(_ context.Context, o client.Object) []reconcile.Request {
 		result := []reconcile.Request{}
 
 		// get all autoscaling CRs
@@ -840,14 +840,17 @@ func (r *AutoscalingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M
 
 		for _, cr := range autoscalings.Items {
 			if cr.Spec.PrometheusHost == "" {
-				// the autoscaling is using MetricStorage for metrics
-				name := client.ObjectKey{
-					Namespace: o.GetNamespace(),
-					Name:      cr.Name,
+				// the autoscaling is using PrometheusEndpoint secret for metrics
+				if o.GetName() == autoscaling.PrometheusEndpointSecret {
+					name := client.ObjectKey{
+						Namespace: o.GetNamespace(),
+						Name:      cr.Name,
+					}
+					Log.Info(fmt.Sprintf("Secret %s is used by Autoscaling CR %s", o.GetName(), cr.Name))
+					result = append(result, reconcile.Request{NamespacedName: name})
 				}
-				Log.Info(fmt.Sprintf("MetricStorage %s is used by Autoscaling CR %s", o.GetName(), cr.Name))
-				result = append(result, reconcile.Request{NamespacedName: name})
 			}
+
 		}
 		if len(result) > 0 {
 			return result
@@ -921,16 +924,12 @@ func (r *AutoscalingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M
 			handler.EnqueueRequestsFromMapFunc(transportURLSecretFn)).
 		Watches(&memcachedv1.Memcached{},
 			handler.EnqueueRequestsFromMapFunc(memcachedFn)).
-		Watches(
-			&corev1.Secret{},
+		Watches(&corev1.Secret{},
 			handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
 			builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
 		).
-		Watches(
-			&telemetryv1.MetricStorage{},
-			handler.EnqueueRequestsFromMapFunc(metricStorageFn),
-			builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
-		).
+		Watches(&corev1.Secret{},
+			handler.EnqueueRequestsFromMapFunc(prometheusEndpointFn)).
 		Watches(&topologyv1.Topology{},
 			handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
 			builder.WithPredicates(predicate.GenerationChangedPredicate{})).