From 783ab93d8d94ce445e3efbdb544dcd734ace5c8d Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 16:54:13 +0000 Subject: [PATCH 1/5] lint fix Signed-off-by: Mehul --- charts/jaeger-v2/values.yaml | 100 ++++++++++++++++------------------- 1 file changed, 47 insertions(+), 53 deletions(-) diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml index af0e338f..15b12550 100644 --- a/charts/jaeger-v2/values.yaml +++ b/charts/jaeger-v2/values.yaml @@ -1,68 +1,62 @@ +service: + extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] + pipelines: + traces: + receivers: [otlp, jaeger, zipkin] + processors: [batch, adaptive_sampling] + exporters: [jaeger_storage_exporter] - service: - extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] - pipelines: - traces: - receivers: [otlp, jaeger, zipkin] - processors: [batch, adaptive_sampling] - exporters: [jaeger_storage_exporter] +extensions: + healthcheckv2: + use_v2: true + http: {} - extensions: - healthcheckv2: - use_v2: true - http: {} + jaeger_query: + storage: + traces: some_store + traces_archive: another_store + ui: + config_file: ./cmd/jaeger/config-ui.json - jaeger_query: - storage: - traces: some_store - traces_archive: another_store - ui: - config_file: ./cmd/jaeger/config-ui.json + jaeger_storage: + backends: + some_store: + memory: + max_traces: 100000 + another_store: + memory: + max_traces: 100000 - jaeger_storage: - backends: - some_store: - memory: - max_traces: 100000 - another_store: - memory: - max_traces: 100000 + remote_sampling: + adaptive: + sampling_store: some_store + initial_sampling_probability: 0.1 + http: {} + grpc: {} - remote_sampling: - adaptive: - sampling_store: some_store - initial_sampling_probability: 0.1 - http: {} +receivers: + otlp: + protocols: grpc: {} + http: {} - receivers: - otlp: - protocols: - grpc: {} - http: {} - - jaeger: - protocols: - grpc: {} - thrift_binary: {} - thrift_compact: {} - thrift_http: {} + jaeger: + protocols: + grpc: {} + thrift_binary: {} + thrift_compact: {} + thrift_http: {} - zipkin: {} + zipkin: {} - processors: - batch: {} - adaptive_sampling: {} +processors: + batch: {} + adaptive_sampling: {} - exporters: - jaeger_storage_exporter: {} +exporters: + jaeger_storage_exporter: {} image: "jaegertracing/jaeger:latest" -ports: - - name: http - port: 4317 - - name: grpc - port: 4318 provisionDataStore: cassandra: false From 6dba3c90ed7ad8a21627ad43e063db4b4fc5f2dc Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 17:32:04 +0000 Subject: [PATCH 2/5] fixed Signed-off-by: Mehul --- charts/jaeger-v2/Chart.yaml | 1 - charts/jaeger-v2/templates/config-map.yaml | 2 +- charts/jaeger-v2/values.yaml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml index 7b103ab6..32112d67 100644 --- a/charts/jaeger-v2/Chart.yaml +++ b/charts/jaeger-v2/Chart.yaml @@ -10,7 +10,6 @@ keywords: - jaeger - opentracing - tracing - - instrumentation home: https://jaegertracing.io icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg sources: diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml index c3ba5821..c0a77f1b 100644 --- a/charts/jaeger-v2/templates/config-map.yaml +++ b/charts/jaeger-v2/templates/config-map.yaml @@ -29,7 +29,7 @@ data: processors: batch: {{ toYaml .Values.processors.batch | indent 6 }} - adaptive_sampling: {{ toYaml .Values.processors.adaptive_sampling | indent 6 }} + exporters: jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }} \ No newline at end of file diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml index 15b12550..6bf797d2 100644 --- a/charts/jaeger-v2/values.yaml +++ b/charts/jaeger-v2/values.yaml @@ -51,7 +51,6 @@ receivers: processors: batch: {} - adaptive_sampling: {} exporters: jaeger_storage_exporter: {} From f858e8af8de26e80ee615e1ce786cd157c4983b8 Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 17:34:26 +0000 Subject: [PATCH 3/5] lint fix Signed-off-by: Mehul --- charts/jaeger-v2/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml index 6bf797d2..11a1daa3 100644 --- a/charts/jaeger-v2/values.yaml +++ b/charts/jaeger-v2/values.yaml @@ -60,5 +60,4 @@ image: "jaegertracing/jaeger:latest" provisionDataStore: cassandra: false elasticsearch: false - kafka: false - + kafka: false \ No newline at end of file From 9439e21d3bd715a8dc3ccf6b85ffb42b2664630a Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 17:36:12 +0000 Subject: [PATCH 4/5] lint fix Signed-off-by: Mehul --- charts/jaeger-v2/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml index 11a1daa3..f1b8f862 100644 --- a/charts/jaeger-v2/values.yaml +++ b/charts/jaeger-v2/values.yaml @@ -60,4 +60,4 @@ image: "jaegertracing/jaeger:latest" provisionDataStore: cassandra: false elasticsearch: false - kafka: false \ No newline at end of file + kafka: false From 82e4839addae435713fd70db7bcce39df9160ff2 Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 18:13:13 +0000 Subject: [PATCH 5/5] fixed using pre-hook Signed-off-by: Mehul --- charts/jaeger-v2/templates/config-map.yaml | 6 ++++-- charts/jaeger-v2/templates/deployment.yaml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml index c0a77f1b..701904f0 100644 --- a/charts/jaeger-v2/templates/config-map.yaml +++ b/charts/jaeger-v2/templates/config-map.yaml @@ -3,6 +3,9 @@ kind: ConfigMap metadata: name: my-config namespace: default + annotations: + "helm.sh/hook": pre-install + "helm.sh/hook-delete-policy": before-hook-creation # Optional: Deletes the hook before the next installation data: config.yaml: | service: @@ -29,7 +32,6 @@ data: processors: batch: {{ toYaml .Values.processors.batch | indent 6 }} - exporters: - jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }} \ No newline at end of file + jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }} diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml index 0fe8cf91..82b1d153 100644 --- a/charts/jaeger-v2/templates/deployment.yaml +++ b/charts/jaeger-v2/templates/deployment.yaml @@ -4,6 +4,7 @@ metadata: name: jaeger labels: app: jaeger + namespace: default spec: replicas: 1 selector: