Merge branch 'feature/matrix-media-repo-labels-annotations' into 'master'

matrix media repo: add option to define deployment labels and annotations

See merge request ananace/charts!43

charts/matrix-media-repo/templates/deployment.yaml

@@ -2,8 +2,16 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "matrix-media-repo.fullname" . }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "matrix-media-repo.labels" . | nindent 4 }}
+    {{- with .Values.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+
 spec:
 {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}

charts/matrix-media-repo/values.yaml

@@ -225,3 +225,11 @@ tolerations: []
 ## Affinities to set on the application.
 ##
 affinity: {}
+
+## Deployment annotations
+##
+annotations: {}
+
+## Deployment labels
+##
+labels: {}