From e0c9570b45e641b3b114128399ea23c8b2ccc15a Mon Sep 17 00:00:00 2001
From: vijtrip2 <62766875+vijtrip2@users.noreply.github.com>
Date: Wed, 2 Jun 2021 08:58:40 -0700
Subject: [PATCH] Explicitly mentioning 'metrics' for the ACK controller
 service.

---
 .../templates/{service.yaml => metrics-service.yaml}  |  6 +++---
 templates/helm/values.yaml.tpl                        | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)
 rename templates/helm/templates/{service.yaml => metrics-service.yaml} (86%)

diff --git a/templates/helm/templates/service.yaml b/templates/helm/templates/metrics-service.yaml
similarity index 86%
rename from templates/helm/templates/service.yaml
rename to templates/helm/templates/metrics-service.yaml
index e886d249..24cf69f3 100644
--- a/templates/helm/templates/service.yaml
+++ b/templates/helm/templates/metrics-service.yaml
@@ -1,8 +1,8 @@
-{{- if .Values.service.create }}
+{{- if .Values.metrics.service.create }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "app.fullname" . }}
+  name: {{ include "app.fullname" . }}-metrics
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ include "app.name" . }}
@@ -21,7 +21,7 @@ spec:
 {{- range $key, $value := .Values.deployment.labels }}
     {{ $key }}: {{ $value | quote }}
 {{- end }}
-  type: {{ .Values.service.type }}
+  type: {{ .Values.metrics.service.type }}
   ports:
   - name: metricsport
     port: 8080
diff --git a/templates/helm/values.yaml.tpl b/templates/helm/values.yaml.tpl
index 2e87855a..c87f7583 100644
--- a/templates/helm/values.yaml.tpl
+++ b/templates/helm/values.yaml.tpl
@@ -16,9 +16,14 @@ deployment:
   labels: {}
   containerPort: 8080
 
-service:
-  create: false
-  type: "ClusterIP"
+metrics:
+  service:
+    # Set to true to automatically create a Kubernetes Service resource for the
+    # Prometheus metrics server endpoint in controller
+    create: false
+    # Which Type to use for the Kubernetes Service?
+    # See: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
+    type: "ClusterIP"
 
 resources:
   requests: