eventrouter: Various chart improvements

* Add ingress NetworkPolicy and Prometheus annotations.
* Add config checksum to recreate pods on changes
* Add a emptyDir volume for /tmp to work arround Issue 114 [1]
* Add the option to overwrite kubernetes master/api environment
variables to work arround IP SAN limitation of puppet CA

[1] vmware-archive/eventrouter#114

Bug: T262675
Change-Id: Ia1632157971c6bee5eadb94be3ed81a058e64466

charts/eventrouter/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for eventrouter (https://github.com/heptiolabs/eventrouter)
 name: eventrouter
-version: 0.3.0
+version: 0.3.1
 appVersion: 0.3
 home: https://github.com/heptiolabs/eventrouter
 sources:

charts/eventrouter/templates/_helpers.tpl

@@ -51,4 +51,24 @@ Create the name of the service account to use
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Create kubernetes master/api environment variables
+*/}}
+{{- define "kubernetesApiEnv" -}}
+- name: KUBERNETES_PORT_443_TCP_ADDR
+  value: "{{ .Values.kubernetesApi.host }}"
+- name: KUBERNETES_SERVICE_HOST
+  value: "{{ .Values.kubernetesApi.host }}"
+- name: KUBERNETES_SERVICE_PORT
+  value: "{{ .Values.kubernetesApi.port }}"
+- name: KUBERNETES_SERVICE_PORT_HTTPS
+  value: "{{ .Values.kubernetesApi.port }}"
+- name: KUBERNETES_PORT
+  value: "{{ printf "tcp://%s:%s" .Values.kubernetesApi.host .Values.kubernetesApi.port}}"
+- name: KUBERNETES_PORT_443_TCP
+  value: "{{ printf "tcp://%s:%s" .Values.kubernetesApi.host .Values.kubernetesApi.port}}"
+- name: KUBERNETES_PORT_443_TCP_PORT
+  value: "{{ .Values.kubernetesApi.port }}"
+{{- end -}}

charts/eventrouter/templates/deployment.yaml

@@ -19,16 +19,27 @@ spec:
       labels:
         app: {{ template "eventrouter.name" . }}
         release: {{ .Release.Name }}
-    {{- if .Values.podAnnotations }}
       annotations:
+        checksum/config: {{ printf "%s-%s" .Values.sink .Values.enablePrometheus | sha256sum }}
+      {{- if .Values.enablePrometheus }}
+        prometheus.io/port: "8080"
+        prometheus.io/scrape: "true"
+      {{- end }}
+    {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
     {{- end }}
     spec:
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if and .Values.kubernetesApi.host .Values.kubernetesApi.port }}
+        env:
+          {{- include "kubernetesApiEnv" . | nindent 10 }}
+        {{- end }}
         volumeMounts:
+          - name: tmp
+            mountPath: /tmp
           - name: config-volume
             mountPath: /etc/eventrouter
     {{- if .Values.containerPorts }}
@@ -54,3 +65,5 @@ spec:
         - name: config-volume
           configMap:
             name: {{ template "eventrouter.fullname" . }}
+        - name: tmp
+          emptyDir: {}

charts/eventrouter/templates/networkpolicy.yaml

@@ -0,0 +1,17 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  labels: {{ include "eventrouter.labels" . | indent 4 }}
+  name: {{ template "eventrouter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ template "eventrouter.name" . }}
+      release: {{ .Release.Name }}
+  policyTypes:
+    - Ingress
+  ingress:
+    - ports:
+      - port: 8080
+        protocol: TCP

charts/eventrouter/values.yaml

@@ -1,8 +1,8 @@
 # Default values for eventrouter.
 
 image:
-  repository: gcr.io/heptio-images/eventrouter
-  tag: v0.3
+  repository: docker-registry.discovery.wmnet/eventrouter
+  tag: 0.3.0-3
   pullPolicy: IfNotPresent
 
 replicaCount: 1
@@ -40,3 +40,9 @@ securityContext: {}
   # runAsUser: 1000
 
 enablePrometheus: true
+
+# Overwrite the default KUBERNETES_ environment variables for the container
+# to work around the IP SAN limitation of puppet CA
+kubernetesApi:
+  host: ""
+  port: ""