Fix typo, make distributor port configurable as well

Signed-off-by: Jonas De Gendt <[email protected]>

Author: jdegendt

charts/tempo-distributed/templates/gateway/deployment-gateway.yaml

@@ -62,7 +62,7 @@ spec:
             - name: http-metrics
               containerPort: 8080
               protocol: TCP
-          {{- if .Values.traces.oltp.grpc.enabled }}
+          {{- if .Values.traces.otlp.grpc.enabled }}
             - name: grpc-otlp
               containerPort: {{ .Values.traces.otlp.grpc.port }}
               protocol: TCP

charts/tempo-distributed/templates/gateway/service-gateway.yaml

@@ -29,7 +29,7 @@ spec:
       nodePort: {{ .Values.gateway.service.nodePort }}
       {{- end }}
       protocol: TCP
-    {{- if .Values.traces.oltp.grpc.enabled }}
+    {{- if .Values.traces.otlp.grpc.enabled }}
     - name: grpc-otlp
       port: {{ .Values.traces.otlp.grpc.port }}
       targetPort: grpc-otlp

charts/tempo-distributed/values.yaml

@@ -1208,9 +1208,10 @@ traces:
       receiverConfig: {}
     grpc:
       # -- Enable Tempo to ingest Open Telemetry GRPC traces
-      enabled: false
+      enabled: true
       # -- GRPC receiver advanced config
       receiverConfig: {}
+      # -- Default OTLP gRPC port
       port: 4317
   opencensus:
     # -- Enable Tempo to ingest Open Census traces
@@ -1915,7 +1916,7 @@ minio:
 # Configuration for the gateway
 gateway:
   # -- Specifies whether the gateway should be enabled
-  enabled: false
+  enabled: true
   # -- Number of replicas for the gateway
   replicas: 1
   # -- hostAliases to add
@@ -2027,7 +2028,7 @@ gateway:
   # Gateway ingress configuration
   ingress:
     # -- Specifies whether an ingress for the gateway should be created
-    enabled: false
+    enabled: true
     # -- Labels for the gateway ingress
     labels: {}
     # -- Ingress Class Name. MAY be required for Kubernetes versions >= 1.18
@@ -2195,7 +2196,7 @@ gateway:
           {{- end }}
         }
 
-        {{- if .Values.traces.oltp.grpc.enabled }}
+        {{- if .Values.traces.otlp.grpc.enabled }}
         # OTLP gRPC
         server {
           listen               {{ .Values.traces.otlp.grpc.port }} http2;
@@ -2206,11 +2207,11 @@ gateway:
           {{- end }}
 
           location = /opentelemetry.proto.collector.trace.v1.TraceService/Export {
-            grpc_pass          grpc://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4317;
+            grpc_pass          grpc://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:{{ .Values.traces.otlp.grpc.port }};
           }
 
           location ~ /opentelemetry {
-            grpc_pass          grpc://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4317;
+            grpc_pass          grpc://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:{{ .Values.traces.otlp.grpc.port }};
           }
 
           {{- with .Values.gateway.nginxConfig.serverSnippet }}