Merge pull request #3 from hellspawn679/jaeger-v2-test

Jaeger v2 test
hellspawn679 · Oct 1, 2024 · 9cf70cb · 9cf70cb
2 parents 8fed143 + 82e4839
commit 9cf70cb
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 61 deletions.
diff --git 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
@@ -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 }}
-      adaptive_sampling: {{ toYaml .Values.processors.adaptive_sampling | indent 6 }}
 
     exporters:
-      jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }}
+      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
@@ -4,6 +4,7 @@ metadata:
   name: jaeger
   labels:
     app: jaeger
+    namespace: default
 spec: 
   replicas: 1
   selector:

diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml
@@ -1,71 +1,63 @@
-
-  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
+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: {}
+
+  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
+
+  remote_sampling:
+    adaptive:
+      sampling_store: some_store
+      initial_sampling_probability: 0.1
+    http: {}
+    grpc: {}
+
+receivers:
+  otlp:
+    protocols:
+      grpc: {}
       http: {}
 
-    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
-
-    remote_sampling:
-      adaptive:
-        sampling_store: some_store
-        initial_sampling_probability: 0.1
-      http: {}
+  jaeger:
+    protocols:
       grpc: {}
+      thrift_binary: {}
+      thrift_compact: {}
+      thrift_http: {}
 
-  receivers:
-    otlp:
-      protocols:
-        grpc: {}
-        http: {}
-
-    jaeger:
-      protocols:
-        grpc: {}
-        thrift_binary: {}
-        thrift_compact: {}
-        thrift_http: {}
+  zipkin: {}
 
-    zipkin: {}
+processors:
+  batch: {}
 
-  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
   elasticsearch: false
   kafka: false
-