From 3475f96d923cf22fb0a3dc3f779e04fced1e06a6 Mon Sep 17 00:00:00 2001
From: Jon Bates <jonathan.bates@team.bumble.com>
Date: Fri, 23 Jun 2023 15:27:09 +0100
Subject: [PATCH] Make otlp ports configurable on deployment

Signed-off-by: Jon Bates <jonathan.bates@team.bumble.com>
---
 charts/jaeger/templates/collector-deploy.yaml | 4 ++--
 charts/jaeger/values.yaml                     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml
index 211dc3f9..4cd0bac0 100644
--- a/charts/jaeger/templates/collector-deploy.yaml
+++ b/charts/jaeger/templates/collector-deploy.yaml
@@ -119,10 +119,10 @@ spec:
         {{- end }}
         {{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
         - containerPort: {{ default 4317 .Values.collector.service.otlp.grpc.port }}
-          name: otlp-grpc
+          name: {{ .Values.collector.service.otlp.grpc.name }}
           protocol: TCP
         - containerPort: {{ default 4318 .Values.collector.service.otlp.http.port }}
-          name: otlp-http
+          name: {{ .Values.collector.service.otlp.http.name }}
           protocol: TCP
         {{- end }}
         readinessProbe:
diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
index cd3494c3..c3b8e866 100644
--- a/charts/jaeger/values.yaml
+++ b/charts/jaeger/values.yaml
@@ -36,9 +36,9 @@ allInOne:
     collector:
       otlp:
         grpc:
-          name: otlp-grpc
+          name: grpc-otlp
         http:
-          name: otlp-http
+          name: http-otlp
   ingress:
     enabled: false
     # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
@@ -383,7 +383,7 @@ collector:
         # port: 4317
         # nodePort:
       http:
-        name: otlp-grpc
+        name: otlp-http
         # port: 4318
         # nodePort:
   ingress: