Merge pull request #600 from jlarriba/autoscaling_prom

Autoscaling should use the prometheus secret

Author: openshift-merge-bot[bot]

controllers/autoscaling_controller.go

@@ -19,6 +19,8 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"github.com/openstack-k8s-operators/telemetry-operator/pkg/metricstorage"
+	"strconv"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -425,13 +427,30 @@ func (r *AutoscalingReconciler) reconcileNormal(
 	// Get correct prometheus host, port and if TLS should be used
 	// NOTE: Always do this before calling the generateServiceConfig to get the newest values in the ServiceConfig
 	//
+	prometheusEndpointSecret := &corev1.Secret{}
+	err = r.Client.Get(ctx, client.ObjectKey{
+		Name:      autoscaling.PrometheusEndpointSecret,
+		Namespace: instance.Namespace,
+	}, prometheusEndpointSecret)
+	if err != nil {
+		Log.Info("No Prometheus Endpoint Secret found")
+	}
+
 	if instance.Spec.PrometheusHost == "" {
-		instance.Status.PrometheusHost = fmt.Sprintf("%s-prometheus.%s.svc", telemetryv1.DefaultServiceName, instance.Namespace)
+		if prometheusEndpointSecret.Data != nil {
+			instance.Status.PrometheusHost = string(prometheusEndpointSecret.Data[metricstorage.PrometheusHost])
+		}
 	} else {
 		instance.Status.PrometheusHost = instance.Spec.PrometheusHost
 	}
 	if instance.Spec.PrometheusPort == 0 {
-		instance.Status.PrometheusPort = telemetryv1.DefaultPrometheusPort
+		if prometheusEndpointSecret.Data != nil {
+			port, err := strconv.Atoi(string(prometheusEndpointSecret.Data[metricstorage.PrometheusPort]))
+			if err != nil {
+				return ctrlResult, err
+			}
+			instance.Status.PrometheusPort = int32(port)
+		}
 	} else {
 		instance.Status.PrometheusPort = instance.Spec.PrometheusPort
 	}
@@ -595,8 +614,6 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 		"AodhPassword":             string(ospSecret.Data[instance.Spec.Aodh.PasswordSelectors.AodhService]),
 		"KeystoneInternalURL":      keystoneInternalURL,
 		"TransportURL":             string(transportURLSecret.Data["transport_url"]),
-		"PrometheusHost":           instance.Status.PrometheusHost,
-		"PrometheusPort":           instance.Status.PrometheusPort,
 		"MemcachedServers":         mc.GetMemcachedServerListString(),
 		"MemcachedServersWithInet": mc.GetMemcachedServerListWithInetString(),
 		"DatabaseConnection": fmt.Sprintf("mysql+pymysql://%s:%s@%s/%s?read_default_file=/etc/my.cnf",

controllers/metricstorage_controller.go

@@ -633,8 +633,8 @@ func (r *MetricStorageReconciler) prometheusEndpointSecret(
 	}
 
 	secret.Data = map[string][]byte{
-		"host": []byte(fmt.Sprintf("%s-prometheus.%s.svc", telemetryv1.DefaultServiceName, instance.Namespace)),
-		"port": []byte(strconv.Itoa(telemetryv1.DefaultPrometheusPort)),
+		metricstorage.PrometheusHost: []byte(fmt.Sprintf("%s-prometheus.%s.svc", telemetryv1.DefaultServiceName, instance.Namespace)),
+		metricstorage.PrometheusPort: []byte(strconv.Itoa(telemetryv1.DefaultPrometheusPort)),
 	}
 
 	if _, err := controllerutil.CreateOrUpdate(context.TODO(), helper.GetClient(), secret, func() error {
@@ -653,8 +653,8 @@ func (r *MetricStorageReconciler) prometheusEndpointSecret(
 	if instance.Spec.PrometheusTLS.Enabled() {
 		tlsSecret := &corev1.Secret{
 			Data: map[string][]byte{
-				"ca_secret": []byte(*instance.Spec.PrometheusTLS.SecretName),
-				"ca_key":    []byte(tls.CAKey),
+				metricstorage.PrometheusCaCertSecret: []byte(*instance.Spec.PrometheusTLS.SecretName),
+				metricstorage.PrometheusCaCertKey:    []byte(tls.CAKey),
 			},
 		}
 
@@ -664,7 +664,7 @@ func (r *MetricStorageReconciler) prometheusEndpointSecret(
 		}
 
 		if err := r.Client.Patch(ctx, secret, client.RawPatch(types.StrategicMergePatchType, patch)); err != nil {
-			panic(err)
+			return err
 		}
 	}
 

pkg/autoscaling/const.go

@@ -41,6 +41,8 @@ const (
 
 	// CustomPrometheusCaCertFolderPath -
 	CustomPrometheusCaCertFolderPath = "/etc/pki/ca-trust/extracted/pem/"
+
+	PrometheusEndpointSecret = "metric-storage-prometheus-endpoint"
 )
 
 // PrometheusReplicas -

pkg/metricstorage/const.go

@@ -17,4 +17,9 @@ package metricstorage
 
 const (
 	RabbitMQPrometheusPort = 15691
+
+	PrometheusHost         = "host"
+	PrometheusPort         = "port"
+	PrometheusCaCertSecret = "ca_secret"
+	PrometheusCaCertKey    = "ca_key"
 )