From 0ecb9bf288e725a9f65d162afc74c49a4f85e38d Mon Sep 17 00:00:00 2001 From: "Smith, David (ds3330)" Date: Fri, 25 Jun 2021 13:47:07 +0000 Subject: [PATCH] kafka broker hosts should be defined with a comma separated list The broker attribute should use a comma separated list with the port definition included Example: kafka1:9092,kafka2:9092,kafka:9092 The kafka client will connect to the first available host this will provide resiliency if a host is not available Change-Id: I5f82e96f2aa274379b6d808291d4b5109709bf72 --- fluentd/Chart.yaml | 2 +- fluentd/templates/daemonset.yaml | 2 +- releasenotes/notes/fluentd.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fluentd/Chart.yaml b/fluentd/Chart.yaml index c62ac93a7..b56fbbb62 100644 --- a/fluentd/Chart.yaml +++ b/fluentd/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v1.10.1 description: OpenStack-Helm Fluentd name: fluentd -version: 0.1.4 +version: 0.1.5 home: https://www.fluentd.org/ sources: - https://github.com/fluent/fluentd diff --git a/fluentd/templates/daemonset.yaml b/fluentd/templates/daemonset.yaml index 544f79b5f..7ddbf6a21 100644 --- a/fluentd/templates/daemonset.yaml +++ b/fluentd/templates/daemonset.yaml @@ -26,7 +26,7 @@ tcpSocket: {{- $kafkaBroker := tuple "kafka" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} {{- $kafkaBrokerPort := tuple "kafka" "internal" "broker" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} -{{- $kafkaBrokerURI := printf "%s:%s" $kafkaBroker $kafkaBrokerPort }} +{{- $kafkaBrokerURI := printf "%s" $kafkaBroker }} {{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "fluentd" }} {{ tuple $envAll "fluentd" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/releasenotes/notes/fluentd.yaml b/releasenotes/notes/fluentd.yaml index 2ffaa2dd1..1644d1248 100644 --- a/releasenotes/notes/fluentd.yaml +++ b/releasenotes/notes/fluentd.yaml @@ -5,4 +5,5 @@ fluentd: - 0.1.2 Add Configurable Readiness and Liveness Probes - 0.1.3 Enable TLS path for output to Elasticsearch - 0.1.4 Use full image ref for docker official images + - 0.1.5 Kafka brokers defined as a list with port "kafka1:9092,kafka2:9020,kafka3:9092" ...