[stable/kiam] Adding Prometheus metrics service endpoints (#7762)

* Prometheus endpoints in agent/server services

Signed-off-by: Scott Crooks <scott.crooks@gmail.com>

* Dots and 'and' condition for agent service

Signed-off-by: Scott Crooks <scott.crooks@gmail.com>

* Bumping version to 1.3.0

Signed-off-by: Scott Crooks <scott.crooks@gmail.com>

* Changing agent service template to match other templates

Signed-off-by: Scott Crooks <scott.crooks@gmail.com>

stable/kiam/Chart.yaml

@@ -1,5 +1,5 @@
 name: kiam
-version: 2.0.1-rc5
+version: 2.0.1-rc6
 appVersion: 3.0-rc1
 description: Integrate AWS IAM with Kubernetes
 keywords:

stable/kiam/templates/agent-service.yaml

@@ -0,0 +1,25 @@
+{{- if .Values.agent.enabled -}}
+{{- if .Values.agent.prometheus.scrape -}}
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ template "kiam.name" . }}
+    chart: {{ template "kiam.chart" . }}
+    component: "{{ .Values.agent.name }}"
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "kiam.fullname" . }}-agent
+spec:
+  clusterIP: None
+  selector:
+    app: {{ template "kiam.name" . }}
+    component: "{{ .Values.agent.name }}"
+    release: {{ .Release.Name }}
+  ports:
+    - name: metrics
+      port: {{ .Values.agent.prometheus.port }}
+      targetPort: {{ .Values.agent.prometheus.port }}
+      protocol: TCP
+{{- end -}}
+{{- end }}

stable/kiam/templates/server-service.yaml

@@ -16,6 +16,12 @@ spec:
     component: "{{ .Values.server.name }}"
     release: {{ .Release.Name }}
   ports:
+    {{- if .Values.server.prometheus.scrape }}
+    - name: metrics
+      port: {{ .Values.server.prometheus.port }}
+      targetPort: {{ .Values.server.prometheus.port }}
+      protocol: TCP
+    {{- end }}
     - name: grpclb
       port: {{ .Values.server.service.port }}
       targetPort: {{ .Values.server.service.targetPort }}