From fddc5bf1c8168d13efc303b7cdc695993b4563a5 Mon Sep 17 00:00:00 2001
From: marcin-motyl <118439707+marcin-motyl@users.noreply.github.com>
Date: Tue, 25 Jul 2023 02:56:20 +0200
Subject: [PATCH] Fix deployment & service values in actionsMetrics (#2683)

---
 .../templates/actionsmetrics.deployment.yaml     | 16 ++++++++--------
 .../templates/actionsmetrics.service.yaml        |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml b/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml
index d7cb67b2..0658a07f 100644
--- a/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml
+++ b/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml
@@ -36,8 +36,8 @@ spec:
       {{- end }}
       containers:
       - args:
-        {{- $metricsHost := .Values.metrics.proxy.enabled | ternary "127.0.0.1" "0.0.0.0" }}
-        {{- $metricsPort := .Values.metrics.proxy.enabled | ternary "8080" .Values.metrics.port }}
+        {{- $metricsHost := .Values.actionsMetrics.proxy.enabled | ternary "127.0.0.1" "0.0.0.0" }}
+        {{- $metricsPort := .Values.actionsMetrics.proxy.enabled | ternary "8080" .Values.actionsMetrics.port }}
         - "--metrics-addr={{ $metricsHost }}:{{ $metricsPort }}"
         {{- if .Values.actionsMetricsServer.logLevel }}
         - "--log-level={{ .Values.actionsMetricsServer.logLevel }}"
@@ -122,8 +122,8 @@ spec:
         - containerPort: 8000
           name: http
           protocol: TCP
-        {{- if not .Values.metrics.proxy.enabled }}
-        - containerPort: {{ .Values.metrics.port }}
+        {{- if not .Values.actionsMetrics.proxy.enabled }}
+        - containerPort: {{ .Values.actionsMetrics.port }}
           name: metrics-port
           protocol: TCP
         {{- end }}
@@ -131,17 +131,17 @@ spec:
           {{- toYaml .Values.actionsMetricsServer.resources | nindent 12 }}
         securityContext:
           {{- toYaml .Values.actionsMetricsServer.securityContext | nindent 12 }}
-      {{- if .Values.metrics.proxy.enabled }}
+      {{- if .Values.actionsMetrics.proxy.enabled }}
       - args:
-        - "--secure-listen-address=0.0.0.0:{{ .Values.metrics.port }}"
+        - "--secure-listen-address=0.0.0.0:{{ .Values.actionsMetrics.port }}"
         - "--upstream=http://127.0.0.1:8080/"
         - "--logtostderr=true"
         - "--v=10"
-        image: "{{ .Values.metrics.proxy.image.repository }}:{{ .Values.metrics.proxy.image.tag }}"
+        image: "{{ .Values.actionsMetrics.proxy.image.repository }}:{{ .Values.actionsMetrics.proxy.image.tag }}"
         name: kube-rbac-proxy
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
-        - containerPort: {{ .Values.metrics.port }}
+        - containerPort: {{ .Values.actionsMetrics.port }}
           name: metrics-port
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
diff --git a/charts/actions-runner-controller/templates/actionsmetrics.service.yaml b/charts/actions-runner-controller/templates/actionsmetrics.service.yaml
index 0cfae32a..c465e677 100644
--- a/charts/actions-runner-controller/templates/actionsmetrics.service.yaml
+++ b/charts/actions-runner-controller/templates/actionsmetrics.service.yaml
@@ -16,9 +16,9 @@ spec:
     {{ range $_, $port := .Values.actionsMetricsServer.service.ports -}}
     - {{ $port | toYaml | nindent 6 }}
     {{- end }}
-    {{- if .Values.metrics.serviceMonitor }}
+    {{- if .Values.actionsMetrics.serviceMonitor }}
     - name: metrics-port
-      port: {{ .Values.metrics.port }}
+      port: {{ .Values.actionsMetrics.port }}
       targetPort: metrics-port
     {{- end }}
   selector: