[stable/kiam] Add metadata on services

stable/kiam/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kiam
-version: 2.2.4
+version: 2.2.5
 appVersion: 3.2
 description: Integrate AWS IAM with Kubernetes
 keywords:

stable/kiam/README.md

@@ -115,6 +115,8 @@ Parameter | Description | Default
 `agent.podLabels` | Labels to be added to agent pods | `{}`
 `agent.priorityClassName` | Agent pods priority class name | `""`
 `agent.resources` | Agent container resources | `{}`
+`agent.serviceAnnotations` | Annotations to be added to agent service | `{}`
+`agent.serviceLabels` | Labels to be added to agent service | `{}`
 `agent.tlsSecret` | Secret name for the agent's TLS certificates | `null`
 `agent.tlsFiles.ca` | Base64 encoded string for the agent's CA certificate(s) | `null`
 `agent.tlsFiles.cert` | Base64 encoded strings for the agent's certificate | `null`
@@ -146,6 +148,8 @@ Parameter | Description | Default
 `server.resources` | Server container resources | `{}`
 `server.roleBaseArn` | Base ARN for IAM roles. If not specified use EC2 metadata service to detect ARN prefix | `null`
 `server.sessionDuration` | Session duration for STS tokens generated by the server | `15m`
+`server.serviceAnnotations` | Annotations to be added to server service | `{}`
+`server.serviceLabels` | Labels to be added to server service | `{}`
 `server.service.port` | Server service port | `443`
 `server.service.targetPort` | Server service target port | `443`
 `server.tlsSecret` | Secret name for the server's TLS certificates | `null`

stable/kiam/templates/agent-service.yaml

@@ -3,13 +3,26 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: {{ template "kiam.fullname" . }}-agent
   labels:
     app: {{ template "kiam.name" . }}
     chart: {{ template "kiam.chart" . }}
     component: "{{ .Values.agent.name }}"
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "kiam.fullname" . }}-agent
+    {{- range $key, $value := .Values.agent.serviceLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- if or .Values.agent.serviceAnnotations .Values.agent.prometheus.scrape }}
+  annotations:
+    {{- range $key, $value := .Values.agent.serviceAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+    {{- if .Values.agent.prometheus.scrape }}
+    prometheus.io/scrape: "true"
+    prometheus.io/port: {{ .Values.agent.prometheus.port | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   clusterIP: None
   selector:

stable/kiam/templates/server-service.yaml

@@ -2,13 +2,26 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: {{ template "kiam.fullname" . }}-server
   labels:
     app: {{ template "kiam.name" . }}
     chart: {{ template "kiam.chart" . }}
     component: "{{ .Values.server.name }}"
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "kiam.fullname" . }}-server
+    {{- range $key, $value := .Values.server.serviceLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- if or .Values.server.serviceAnnotations .Values.server.prometheus.scrape }}
+  annotations:
+    {{- range $key, $value := .Values.server.serviceAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+    {{- if .Values.server.prometheus.scrape }}
+    prometheus.io/scrape: "true"
+    prometheus.io/port: {{ .Values.server.prometheus.port | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   clusterIP: None
   selector:

stable/kiam/values.yaml

@@ -37,6 +37,12 @@ agent:
   ## Labels to be added to pods
   ##
   podLabels: {}
+  ## Annotations to be added to service
+  ##
+  serviceAnnotations: {}
+  ## Labels to be added to service
+  ##
+  serviceLabels: {}
   ## Used to assign priority to agent pods
   ## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   ##
@@ -143,6 +149,15 @@ server:
   ## Annotations to be added to pods
   ##
   podAnnotations: {}
+  ## Labels to be added to pods
+  ##
+  podLabels: {}
+  ## Annotations to be added to service
+  ##
+  serviceAnnotations: {}
+  ## Labels to be added to service
+  ##
+  serviceLabels: {}
   ## Used to assign priority to server pods
   ## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   ##