update fusionauth. allow deployment annotations and pod annotations

FusionAuth · Aug 18, 2020 · ab6abcb · ab6abcb
1 parent 72ecc62
commit ab6abcb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -73,6 +73,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `nodeSelector`                                                                                                      |                                                   Node labels for pod assignment                                                   |                                                                                 `{}` |
 | `tolerations`                                                                                                       |                                                Toleration labels for pod assignment                                                |                                                                                 `[]` |
 | `affinity`                                                                                                          |                                                         Affinity settings                                                          |                                                                                 `{}` |
+| `annotations`                                                                                                       |                                               Annotations for the deployment object                                                |                                                                                 `{}` |
+| `podAnnotations`                                                                                                    |                                                  Annotations for the pod objects                                                   |                                                                                 `{}` |
 | `livenessProbe`                                                                                                     |                                              Configures liveness probe for deployment                                              |                        `{"httpGet": {"path":"/","port":"http"}, "periodSeconds":30}` |
 | `readinessProbe`                                                                                                    |                                             Configures readiness probe for deployment                                              |                                            `{"httpGet": {"path":"/","port":"http"}}` |
 | `startupProbe`                                                                                                      |                                              Configures startup probe for deployment                                               | `{"httpGet": {"path":"/","port":"http"}, "failureThreshold":20, "periodSeconds":10}` |
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.18.5"
+appVersion: "1.18.7"
 description: Helm chart for fusionauth
 name: fusionauth
 version: 0.0.0+dev
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -7,6 +7,10 @@ metadata:
     helm.sh/chart: {{ include "fusionauth.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -18,6 +22,10 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "fusionauth.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 4 }}
+      {{- end }}
     spec:
       initContainers:
         - name: wait-for-db

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 image:
   repository: fusionauth/fusionauth-app
-  tag: 1.18.5
+  tag: 1.18.7
   pullPolicy: IfNotPresent
 
 # This image should contain `nc` and a shell of some kind to do a simple loop.
@@ -127,6 +127,10 @@ tolerations: []
 
 affinity: {}
 
+annotations: {}
+podAnnotations:
+  test: test
+
 livenessProbe:
   httpGet:
     path: /