Prometheus scraper config from service -> pod (#11916)

Signed-off-by: Ian Hoegen <ianhoegen@gmail.com>

stable/kuberhealthy/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "v1.0.2"
 home: https://comcast.github.io/kuberhealthy/
 description: The official Helm chart for Kuberhealthy.
 name: kuberhealthy
-version: 1.2.2
+version: 1.2.3
 maintainers:
   - name: integrii
     email: eric.greer@comcast.com
@@ -19,6 +19,7 @@ keywords:
 - comcast
 - health
 - cluster
+- prometheus
 sources:
 - https://github.com/Comcast/kuberhealthy
 - https://github.com/helm/charts/tree/master/stable/kuberhealthy

stable/kuberhealthy/templates/deployment.yaml

@@ -26,6 +26,13 @@ spec:
         {{ $key }}: {{ $value | quote }}
       {{- end }}
       {{- end }}
+      {{- if .Values.prometheus.enabled -}}
+      {{- if .Values.prometheus.enableScraping -}}
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "/metrics"
+        prometheus.io/port: "8080"
+      {{- end }}
+      {{- end }}
       labels:
         app: {{ template "kuberhealthy.name" . }}
         chart: {{ .Chart.Name }}

stable/kuberhealthy/templates/service.yaml

@@ -4,13 +4,6 @@ metadata:
   labels:
     app: {{ template "kuberhealthy.name" . }}
     release: {{ .Release.Name }}
-  {{ if .Values.prometheus.enabled -}}
-  {{ if .Values.prometheus.enableScraping -}}
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/path: "/metrics"
-  {{ end -}}
-  {{ end -}}
   name: {{ template "kuberhealthy.name" . }}
 spec:
   type: {{ .Values.service.type }}