From 7883d61920f329e2ee818d0c37ec56a91d3ae0ad Mon Sep 17 00:00:00 2001 From: Naseem Date: Fri, 13 Mar 2020 06:34:24 -0400 Subject: [PATCH 1/2] Add kafka authentication option. Signed-off-by: Naseem --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/README.md | 3 ++- charts/jaeger/templates/collector-deploy.yaml | 2 ++ charts/jaeger/templates/ingester-deploy.yaml | 2 ++ charts/jaeger/values.yaml | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index e5db21b8..07fd7587 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.17.0 description: A Jaeger Helm chart for Kubernetes name: jaeger -version: 0.23.0 +version: 0.23.1 keywords: - jaeger - opentracing diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md index 0b462218..545958a5 100644 --- a/charts/jaeger/README.md +++ b/charts/jaeger/README.md @@ -327,7 +327,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `esIndexCleaner.enabled` | Enables the ElasticSearch indices cleanup job| `false` | | `esIndexCleaner.image` | Image for the ElasticSearch indices cleanup job| `jaegertracing/jaeger-es-index-cleaner` | | `esIndexCleaner.pullPolicy` | Image pull policy of the ES cleanup image | `Always` | -| `esIndexCleaner.numberOfDays` | ElasticSearch indicess older than this number (Number of days) would be deleted by the CronJob | `7` +| `esIndexCleaner.numberOfDays` | ElasticSearch indices older than this number (Number of days) would be deleted by the CronJob | `7` | `esIndexCleaner.schedule` | Schedule of the cron job | `"55 23 * * *"` | | `esIndexCleaner.successfulJobsHistoryLimit` | successfulJobsHistoryLimit for ElasticSearch indices cleanup CronJob | `5` | | `esIndexCleaner.failedJobsHistoryLimit` | failedJobsHistoryLimit for ElasticSearch indices cleanup CronJob | `5` | @@ -356,6 +356,7 @@ The following table lists the configurable parameters of the Jaeger chart and th | `storage.elasticsearch.user` | Provisioned elasticsearch user| `elastic` | | `storage.elasticsearch.indexPrefix` | Index Prefix for elasticsearch | `nil` | | `storage.elasticsearch.nodesWanOnly` | Only access specified es host | `false` | +| `storage.kafka.authentication` | Authentication type used to authenticate with kafka cluster. e.g. none, kerberos, tls | `none` | | `storage.kafka.brokers` | Broker List for Kafka with port | `kafka:9092` | | `storage.kafka.topic` | Topic name for Kafka | `jaeger_v1_test` | | `storage.type` | Storage type (ES or Cassandra)| `cassandra` | diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml index d78ab49b..8d587526 100644 --- a/charts/jaeger/templates/collector-deploy.yaml +++ b/charts/jaeger/templates/collector-deploy.yaml @@ -70,6 +70,8 @@ spec: value: {{ include "helm-toolkit.utils.joinListWithComma" .Values.storage.kafka.brokers }} - name: KAFKA_PRODUCER_TOPIC value: {{ .Values.storage.kafka.topic }} + - name: KAFKA_PRODUCER_AUTHENTICATION + value: {{ .Values.storage.kafka.authentication }} {{ else }} - name: SPAN_STORAGE_TYPE value: {{ .Values.storage.type }} diff --git a/charts/jaeger/templates/ingester-deploy.yaml b/charts/jaeger/templates/ingester-deploy.yaml index 2e55f189..bfc9892a 100644 --- a/charts/jaeger/templates/ingester-deploy.yaml +++ b/charts/jaeger/templates/ingester-deploy.yaml @@ -64,6 +64,8 @@ spec: value: {{ include "helm-toolkit.utils.joinListWithComma" .Values.storage.kafka.brokers }} - name: KAFKA_CONSUMER_TOPIC value: {{ .Values.storage.kafka.topic }} + - name: KAFKA_CONSUMER_AUTHENTICATION + value: {{ .Values.storage.kafka.authentication }} ports: - containerPort: 14270 name: admin diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 6b319835..0fe55836 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -64,6 +64,7 @@ storage: brokers: - kafka:9092 topic: jaeger_v1_test + authentication: none # Begin: Override values on the Cassandra subchart to customize for Jaeger cassandra: From f00578c1ee0ebe8437b130168e68177184f92bee Mon Sep 17 00:00:00 2001 From: Naseem Date: Fri, 13 Mar 2020 07:16:08 -0400 Subject: [PATCH 2/2] Increase timeout to 10m Deploying Cassandra is time consuming and test does not always complete within 500s Signed-off-by: Naseem --- ct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index d409ba8a..cc21102b 100644 --- a/ct.yaml +++ b/ct.yaml @@ -5,4 +5,4 @@ chart-dirs: chart-repos: - incubator=https://kubernetes-charts-incubator.storage.googleapis.com - elastic=https://helm.elastic.co -helm-extra-args: --timeout=500 +helm-extra-args: --timeout=600