Remove gateway.enableGrpc Helm value, use existing otel one, add configurable port to otel grpc values

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

Author: jdegendt

charts/tempo-distributed/README.md

@@ -502,7 +502,6 @@ The memcached default args are removed and should be provided manually. The sett
 | gateway.basicAuth.htpasswd | string | `"{{ htpasswd (required \"'gateway.basicAuth.username' is required\" .Values.gateway.basicAuth.username) (required \"'gateway.basicAuth.password' is required\" .Values.gateway.basicAuth.password) }}"` | Uses the specified username and password to compute a htpasswd using Sprig's `htpasswd` function. The value is templated using `tpl`. Override this to use a custom htpasswd, e.g. in case the default causes high CPU load. |
 | gateway.basicAuth.password | string | `nil` | The basic auth password for the gateway |
 | gateway.basicAuth.username | string | `nil` | The basic auth username for the gateway |
-| gateway.enableGrpc | bool | `false` | Enables the routes and ports that enable pushing traces using gRPC |
 | gateway.enabled | bool | `false` | Specifies whether the gateway should be enabled |
 | gateway.extraArgs | list | `[]` | Additional CLI args for the gateway |
 | gateway.extraContainers | list | `[]` | Containers to add to the gateway pods |
@@ -994,6 +993,7 @@ The memcached default args are removed and should be provided manually. The sett
 | traces.opencensus.enabled | bool | `false` | Enable Tempo to ingest Open Census traces |
 | traces.opencensus.receiverConfig | object | `{}` | Open Census receiver config |
 | traces.otlp.grpc.enabled | bool | `false` | Enable Tempo to ingest Open Telemetry GRPC traces |
+| traces.otlp.grpc.port | int | `4317` |  |
 | traces.otlp.grpc.receiverConfig | object | `{}` | GRPC receiver advanced config |
 | traces.otlp.http.enabled | bool | `false` | Enable Tempo to ingest Open Telemetry HTTP traces |
 | traces.otlp.http.receiverConfig | object | `{}` | HTTP receiver advanced config |

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

@@ -62,9 +62,9 @@ spec:
             - name: http-metrics
               containerPort: 8080
               protocol: TCP
-          {{- if .Values.gateway.enableGrpc }}
+          {{- if .Values.traces.oltp.grpc.enabled }}
             - name: grpc-otlp
-              containerPort: 4317
+              containerPort: {{ .Values.traces.otlp.grpc.port }}
               protocol: TCP
           {{- end }}
           {{- if or .Values.global.extraEnv .Values.gateway.extraEnv }}

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

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

charts/tempo-distributed/values.yaml

@@ -1210,6 +1210,7 @@ traces:
       enabled: false
       # -- GRPC receiver advanced config
       receiverConfig: {}
+      port: 4317
   opencensus:
     # -- Enable Tempo to ingest Open Census traces
     enabled: false
@@ -1965,8 +1966,6 @@ gateway:
   extraVolumes: []
   # -- Volume mounts to add to the gateway pods
   extraVolumeMounts: []
-  # -- Enables the routes and ports that enable pushing traces using gRPC
-  enableGrpc: false
   # -- Containers to add to the gateway pods
   extraContainers: []
   # -- Resource requests and limits for the gateway
@@ -2195,10 +2194,10 @@ gateway:
           {{- end }}
         }
 
-        {{- if .Values.gateway.enableGrpc }}
+        {{- if .Values.traces.oltp.grpc.enabled }}
         # OTLP gRPC
         server {
-          listen               4317 http2;
+          listen               {{ .Values.traces.otlp.grpc.port }} http2;
 
           {{- if .Values.gateway.basicAuth.enabled }}
           auth_basic           "Tempo";