From 063fde4a60a9da7e9a9ada9c9f7a891e2a84d789 Mon Sep 17 00:00:00 2001 From: Balint Molnar Date: Mon, 3 Jun 2019 12:51:46 +0200 Subject: [PATCH] Use generated headless service name for Cruise Control --- pkg/resources/cruisecontrol/configmap.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/resources/cruisecontrol/configmap.go b/pkg/resources/cruisecontrol/configmap.go index 5d72ad44c..44eee4812 100644 --- a/pkg/resources/cruisecontrol/configmap.go +++ b/pkg/resources/cruisecontrol/configmap.go @@ -18,6 +18,7 @@ import ( "fmt" "strings" + "github.com/banzaicloud/kafka-operator/pkg/resources/kafka" "github.com/banzaicloud/kafka-operator/pkg/resources/templates" "github.com/banzaicloud/kafka-operator/pkg/util" "github.com/go-logr/logr" @@ -38,7 +39,7 @@ func (r *Reconciler) configMap(log logr.Logger) runtime.Object { # Configuration for the metadata client. # ======================================= # The Kafka cluster to control. - bootstrap.servers=kafka-headless:29092 + bootstrap.servers=%s:%d # The maximum interval in milliseconds between two metadata refreshes. #metadata.max.age.ms=300000 # Client id for the Cruise Control. It is used for the metadata client. @@ -220,7 +221,7 @@ func (r *Reconciler) configMap(log logr.Logger) runtime.Object { webserver.accesslog.path=access.log # HTTP Request Log retention days webserver.accesslog.retention.days=14 -`, strings.Join(r.KafkaCluster.Spec.ZKAddresses, ",")) + +`, fmt.Sprintf(kafka.HeadlessServiceTemplate, r.KafkaCluster.Name), r.KafkaCluster.Spec.ListenersConfig.InternalListeners[0].ContainerPort, strings.Join(r.KafkaCluster.Spec.ZKAddresses, ",")) + generateSSLConfig(&r.KafkaCluster.Spec.ListenersConfig), "capacity.json": ` {