[mattermost-enterprise-edition] Allowing Annotation on MM Pods (#143)

* Allowing Annotation on MM Pods
mattermost · Jul 1, 2020 · 391701c · 391701c
1 parent 7e8f614
commit 391701c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/charts/mattermost-enterprise-edition/Chart.yaml b/charts/mattermost-enterprise-edition/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Mattermost Enterprise server with high availitibity.
 name: mattermost-enterprise-edition
-version: 1.4.2
+version: 1.5.0
 appVersion: 5.24.2
 keywords:
 - mattermost

diff --git a/charts/mattermost-enterprise-edition/templates/deployment-mattermost-app.yaml b/charts/mattermost-enterprise-edition/templates/deployment-mattermost-app.yaml
@@ -33,6 +33,9 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "{{ .Values.mattermostApp.service.metricsPort }}"
         prometheus.io/path: "/metrics"
+        {{- if .Values.mattermostApp.extraPodAnnotations }}
+        {{- .Values.mattermostApp.extraPodAnnotations | toYaml | nindent 8 }}
+        {{- end }}
     spec:
       {{ if .Values.serviceAccount.create }}
       serviceAccountName: {{ .Values.serviceAccount.name }}

diff --git a/charts/mattermost-enterprise-edition/templates/deployment-mattermost-jobserver.yaml b/charts/mattermost-enterprise-edition/templates/deployment-mattermost-jobserver.yaml
@@ -30,6 +30,10 @@ spec:
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/component: {{ .Values.global.features.jobserver.name }}
         helm.sh/chart: {{ include "mattermost-enterprise-edition.chart" . }}
+      annotations:
+        {{- if .Values.mattermostApp.extraPodAnnotations }}
+        {{- .Values.mattermostApp.extraPodAnnotations | toYaml | nindent 8 }}
+        {{- end }}
     spec:
       initContainers:
       - name: "init-mattermost-app"

diff --git a/charts/mattermost-enterprise-edition/values.yaml b/charts/mattermost-enterprise-edition/values.yaml
@@ -177,7 +177,8 @@ mattermostApp:
     #   value: "true"
     # - name: MM_SERVICESETTINGS_ENABLECUSTOMEMOJI
     #   value: "true"
-
+  ## Additional pod annotations
+  extraPodAnnotations: {}
 # MySQL HA Section. Use this to configure MySQL.
 # If you are using an external DB, disable this.
 mysqlha: