From 7eabf48b2d305d10f937059a817833738815ad2d Mon Sep 17 00:00:00 2001
From: mehul <mehulsharma4786@gmail.com>
Date: Tue, 19 Nov 2024 20:39:22 +0530
Subject: [PATCH] fixed

Signed-off-by: mehul <mehulsharma4786@gmail.com>
---
 charts/jaeger/templates/collector-deploy.yaml         | 6 +++---
 charts/jaeger/templates/collector-servicemonitor.yaml | 2 +-
 charts/jaeger/templates/es-configmap.yaml             | 4 ++--
 charts/jaeger/templates/query-deploy.yaml             | 6 +++---
 charts/jaeger/values.yaml                             | 6 ++++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml
index 2d06f756..b2c911ff 100644
--- a/charts/jaeger/templates/collector-deploy.yaml
+++ b/charts/jaeger/templates/collector-deploy.yaml
@@ -127,7 +127,7 @@ spec:
           name: http
           protocol: TCP
         - containerPort: 13133
-          name: admin
+          name: healthcheck
           protocol: TCP
         {{- if .Values.collector.service.zipkin }}
         - containerPort: {{ .Values.collector.service.zipkin.port }}
@@ -145,12 +145,12 @@ spec:
         readinessProbe:
           httpGet:
             path: /status
-            port: admin
+            port: healthcheck
             scheme: HTTP
         livenessProbe:
           httpGet:
             path: /status
-            port: admin
+            port: healthcheck
             scheme: HTTP
         resources:
           {{- toYaml .Values.collector.resources | nindent 10 }}
diff --git a/charts/jaeger/templates/collector-servicemonitor.yaml b/charts/jaeger/templates/collector-servicemonitor.yaml
index fbd94fe5..8ddc3c9c 100644
--- a/charts/jaeger/templates/collector-servicemonitor.yaml
+++ b/charts/jaeger/templates/collector-servicemonitor.yaml
@@ -18,7 +18,7 @@ metadata:
   {{- end }}
 spec:
   endpoints:
-    - port: admin
+    - port: healthcheck
       path: /metrics
       {{- if .Values.collector.serviceMonitor.interval }}
       interval: {{ .Values.collector.serviceMonitor.interval }}
diff --git a/charts/jaeger/templates/es-configmap.yaml b/charts/jaeger/templates/es-configmap.yaml
index 59f2662d..5b9ec174 100644
--- a/charts/jaeger/templates/es-configmap.yaml
+++ b/charts/jaeger/templates/es-configmap.yaml
@@ -51,9 +51,9 @@ data:
       otlp:
         protocols:
           grpc:
-            endpoint:{{ .Values.config.receivers.otlp.protocols.grpc | indent 1 }}
+            endpoint:{{ .Values.config.receivers.otlp.protocols.endpoints.grpc | indent 1 }}
           http: 
-            endpoint:{{ .Values.config.receivers.otlp.protocols.http | indent 1 }}
+            endpoint:{{ .Values.config.receivers.otlp.protocols.endpoints.http | indent 1 }}
 
     processors:
       batch:
diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml
index e6999238..dd4f3eaf 100644
--- a/charts/jaeger/templates/query-deploy.yaml
+++ b/charts/jaeger/templates/query-deploy.yaml
@@ -101,7 +101,7 @@ spec:
         - name: grpc
           containerPort: 16685
           protocol: TCP
-        - name: admin
+        - name: healthcheck
           containerPort: 13133
           protocol: TCP
         resources:
@@ -148,12 +148,12 @@ spec:
         livenessProbe:
           httpGet:
             path: /status
-            port: admin
+            port: healthcheck
             scheme: HTTP
         readinessProbe:
           httpGet:
             path: /status
-            port: admin
+            port: healthcheck
             scheme: HTTP
 {{- if .Values.query.oAuthSidecar.enabled }}
       - name: {{ template "jaeger.agent.name" . }}-oauth2-sidecar
diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
index 5896271a..43791ec7 100644
--- a/charts/jaeger/values.yaml
+++ b/charts/jaeger/values.yaml
@@ -52,8 +52,10 @@ config:
   receivers:
     otlp:
       protocols:
-        grpc: 0.0.0.0:4317
-        http: 0.0.0.0:4318
+        grpc:
+          endpoint: 0.0.0.0:4317
+        http:
+          endpoint: 0.0.0.0:4318
     jaeger:
       protocols:
         grpc: