Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tempo): queryEnabled not needed with grafana integration (#1011) #1018

Merged
merged 5 commits into from
Jan 24, 2025

Conversation

jkleinlercher
Copy link
Contributor

No description provided.

Copy link
Contributor

Changes Rendered Chart
Only in out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates: configmap-tempo-query.yaml
diff -U 4 -r out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml
--- out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml	2025-01-24 19:47:35.947623794 +0000
+++ out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml	2025-01-24 19:47:02.091264819 +0000
@@ -25,15 +25,8 @@
   - name: tempo-prom-metrics
     port: 3100
     protocol: TCP
     targetPort: 3100
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: 16687
-  - name: tempo-query-jaeger-ui
-    port: 16686
-    targetPort: 16686
   - name: tempo-jaeger-thrift-http
     port: 14268
     protocol: TCP
     targetPort: 14268
diff -U 4 -r out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml
--- out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml	2025-01-24 19:47:35.947623794 +0000
+++ out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml	2025-01-24 19:47:02.091264819 +0000
@@ -85,35 +85,15 @@
         - mountPath: /conf
           name: tempo-conf
         - mountPath: /tmp
           name: tmp
-      - args:
-        - --query.base-path=/
-        - --grpc-storage-plugin.configuration-file=/conf/tempo-query.yaml
-        image: grafana/tempo-query:2.7.0
-        imagePullPolicy: IfNotPresent
-        name: tempo-query
-        ports:
-        - containerPort: 16686
-          name: jaeger-ui
-        - containerPort: 16687
-          name: jaeger-metrics
-        env:
-        resources:
-          {}
-        volumeMounts:
-        - mountPath: /conf
-          name: tempo-query-conf
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       volumes:
       - configMap:
-          name: tempo-query
-        name: tempo-query-conf
-      - configMap:
           name: tempo
         name: tempo-conf
       - name: tmp
         emptyDir: {}

Copy link
Contributor

Changes Default Values

Copy link
Contributor

Changes Rendered Chart
Only in out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates: configmap-tempo-query.yaml
diff -U 4 -r out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml
--- out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml	2025-01-24 20:46:26.361377992 +0000
+++ out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml	2025-01-24 20:45:48.023545597 +0000
@@ -25,15 +25,8 @@
   - name: tempo-prom-metrics
     port: 3100
     protocol: TCP
     targetPort: 3100
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: 16687
-  - name: tempo-query-jaeger-ui
-    port: 16686
-    targetPort: 16686
   - name: tempo-jaeger-thrift-http
     port: 14268
     protocol: TCP
     targetPort: 14268
diff -U 4 -r out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml
--- out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml	2025-01-24 20:46:26.361377992 +0000
+++ out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml	2025-01-24 20:45:48.023545597 +0000
@@ -85,35 +85,15 @@
         - mountPath: /conf
           name: tempo-conf
         - mountPath: /tmp
           name: tmp
-      - args:
-        - --query.base-path=/
-        - --grpc-storage-plugin.configuration-file=/conf/tempo-query.yaml
-        image: grafana/tempo-query:2.7.0
-        imagePullPolicy: IfNotPresent
-        name: tempo-query
-        ports:
-        - containerPort: 16686
-          name: jaeger-ui
-        - containerPort: 16687
-          name: jaeger-metrics
-        env:
-        resources:
-          {}
-        volumeMounts:
-        - mountPath: /conf
-          name: tempo-query-conf
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       volumes:
       - configMap:
-          name: tempo-query
-        name: tempo-query-conf
-      - configMap:
           name: tempo
         name: tempo-conf
       - name: tmp
         emptyDir: {}

Copy link
Contributor

Changes Default Values

Copy link
Contributor

Changes Default Values

Copy link
Contributor

Changes Rendered Chart
Only in out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates: configmap-tempo-query.yaml
diff -U 4 -r out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml
--- out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml	2025-01-24 20:55:05.725468094 +0000
+++ out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/service.yaml	2025-01-24 20:54:35.662562229 +0000
@@ -25,15 +25,8 @@
   - name: tempo-prom-metrics
     port: 3100
     protocol: TCP
     targetPort: 3100
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: 16687
-  - name: tempo-query-jaeger-ui
-    port: 16686
-    targetPort: 16686
   - name: tempo-jaeger-thrift-http
     port: 14268
     protocol: TCP
     targetPort: 14268
diff -U 4 -r out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml
--- out/target/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml	2025-01-24 20:55:05.725468094 +0000
+++ out/pr/tempo/values-k3d.yaml/sx-tempo/charts/tempo/templates/statefulset.yaml	2025-01-24 20:54:35.663562225 +0000
@@ -85,35 +85,15 @@
         - mountPath: /conf
           name: tempo-conf
         - mountPath: /tmp
           name: tmp
-      - args:
-        - --query.base-path=/
-        - --grpc-storage-plugin.configuration-file=/conf/tempo-query.yaml
-        image: grafana/tempo-query:2.7.0
-        imagePullPolicy: IfNotPresent
-        name: tempo-query
-        ports:
-        - containerPort: 16686
-          name: jaeger-ui
-        - containerPort: 16687
-          name: jaeger-metrics
-        env:
-        resources:
-          {}
-        volumeMounts:
-        - mountPath: /conf
-          name: tempo-query-conf
       securityContext:
         fsGroup: 10001
         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       volumes:
       - configMap:
-          name: tempo-query
-        name: tempo-query-conf
-      - configMap:
           name: tempo
         name: tempo-conf
       - name: tmp
         emptyDir: {}

@jkleinlercher jkleinlercher merged commit 3956c4a into main Jan 24, 2025
14 checks passed
@jkleinlercher jkleinlercher deleted the fix/tempo-query branch January 24, 2025 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant