From 9ee28b7e6e194485d2e07be2716ca1b17820e767 Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@nrfox.com>
Date: Thu, 8 Feb 2024 21:17:49 -0600
Subject: [PATCH] Use correct helm values for observability metrics (#245)

---
 kiali-server/templates/deployment.yaml | 8 ++++----
 kiali-server/templates/service.yaml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml
index e614333..863d3f2 100644
--- a/kiali-server/templates/deployment.yaml
+++ b/kiali-server/templates/deployment.yaml
@@ -26,9 +26,9 @@ spec:
         {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- if .Values.server.metrics_enabled }}
+        {{- if .Values.server.observability.metrics.enabled }}
         prometheus.io/scrape: "true"
-        prometheus.io/port: {{ .Values.server.metrics_port | quote }}
+        prometheus.io/port: {{ .Values.server.observability.metrics.port | quote }}
         {{- else }}
         prometheus.io/scrape: "false"
         prometheus.io/port: ""
@@ -75,9 +75,9 @@ spec:
         ports:
         - name: api-port
           containerPort: {{ .Values.server.port | default 20001 }}
-        {{- if .Values.server.metrics_enabled }}
+        {{- if .Values.server.observability.metrics.enabled }}
         - name: http-metrics
-          containerPort: {{ .Values.server.metrics_port | default 9090 }}
+          containerPort: {{ .Values.server.observability.metrics.port | default 9090 }}
         {{- end }}
         readinessProbe:
           httpGet:
diff --git a/kiali-server/templates/service.yaml b/kiali-server/templates/service.yaml
index 3acbc85..9c03447 100644
--- a/kiali-server/templates/service.yaml
+++ b/kiali-server/templates/service.yaml
@@ -34,11 +34,11 @@ spec:
   {{- end }}
     protocol: TCP
     port: {{ .Values.server.port }}
-  {{- if .Values.server.metrics_enabled }}
+  {{- if .Values.server.observability.metrics.enabled }}
   - name: http-metrics
     appProtocol: http
     protocol: TCP
-    port: {{ .Values.server.metrics_port }}
+    port: {{ .Values.server.observability.metrics.port }}
   {{- end }}
   selector:
     {{- include "kiali-server.selectorLabels" . | nindent 4 }}