From dc7bf2786e5b03cd4ba4bf3c3c3587a14e70b081 Mon Sep 17 00:00:00 2001 From: myan Date: Thu, 8 Aug 2024 06:25:48 +0000 Subject: [PATCH] d Signed-off-by: myan --- .../controllers/addon/addon_controller_manifests.go | 8 ++++---- ...lticluster-global-hub-agent-kafka-certs-secret.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/operator/pkg/controllers/addon/addon_controller_manifests.go b/operator/pkg/controllers/addon/addon_controller_manifests.go index 48b873daa..36ce0381b 100644 --- a/operator/pkg/controllers/addon/addon_controller_manifests.go +++ b/operator/pkg/controllers/addon/addon_controller_manifests.go @@ -230,10 +230,10 @@ func (a *HohAgentAddon) GetValues(cluster *clusterv1.ManagedCluster, KafkaCACert: kafkaConnection.CACert, KafkaClientCert: kafkaConnection.ClientCert, KafkaClientKey: kafkaConnection.ClientKey, - KafkaClientCertSecret: commonutils.AgentCertificateSecretName(), - KafkaSpecTopic: clusterTopic.SpecTopic, - KafkaStatusTopic: clusterTopic.StatusTopic, - TransportType: string(transport.Kafka), + KafkaClientCertSecret: base64.StdEncoding.EncodeToString([]byte(commonutils.AgentCertificateSecretName())), + KafkaSpecTopic: base64.StdEncoding.EncodeToString([]byte(clusterTopic.SpecTopic)), + KafkaStatusTopic: base64.StdEncoding.EncodeToString([]byte(clusterTopic.StatusTopic)), + TransportType: base64.StdEncoding.EncodeToString([]byte(transport.Kafka)), LeaseDuration: strconv.Itoa(electionConfig.LeaseDuration), RenewDeadline: strconv.Itoa(electionConfig.RenewDeadline), RetryPeriod: strconv.Itoa(electionConfig.RetryPeriod), diff --git a/operator/pkg/controllers/addon/manifests/templates/agent/multicluster-global-hub-agent-kafka-certs-secret.yaml b/operator/pkg/controllers/addon/manifests/templates/agent/multicluster-global-hub-agent-kafka-certs-secret.yaml index 7285f8f64..9c220d43c 100644 --- a/operator/pkg/controllers/addon/manifests/templates/agent/multicluster-global-hub-agent-kafka-certs-secret.yaml +++ b/operator/pkg/controllers/addon/manifests/templates/agent/multicluster-global-hub-agent-kafka-certs-secret.yaml @@ -12,9 +12,9 @@ data: "ca.crt": "{{.KafkaCACert}}" "client.crt": "{{.KafkaClientCert}}" "client.key": "{{.KafkaClientKey}}" - # "bootstrap_server": "{{.KafkaBootstrapServer}}" - # "type": "{{.TransportType}}" - # "status_topic": "{{.KafkaStatusTopic}}" - # "spec_topic": "{{.KafkaSpecTopic}}" - # "client_secret": "{{.KafkaClientCertSecret}}" + "bootstrap_server": "{{.KafkaBootstrapServer}}" + "type": "{{.TransportType}}" + "status_topic": "{{.KafkaStatusTopic}}" + "spec_topic": "{{.KafkaSpecTopic}}" + "client_secret": "{{.KafkaClientCertSecret}}" {{- end -}}