OUPDAUNTLE-31 add annotations also to the templates

xenit-alfresco/templates/acs/acs-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: acs
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.acs.podAnnotations }}
-    {{ toYaml .Values.acs.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: acs
 spec:
@@ -30,6 +25,10 @@ spec:
         checksum/acs-config: {{ include (print $.Template.BasePath "/acs/acs-config.yaml") . | sha256sum }}
         checksum/mq-secret: {{ include (print $.Template.BasePath "/active-mq/mq-secret.yaml") . | sha256sum }}
         checksum/db-secret: {{ include (print $.Template.BasePath "/db-secret.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.acs.podAnnotations }}
+        {{ toYaml .Values.acs.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       {{- if .Values.acs.serviceAccount }}
       serviceAccountName: {{ .Values.acs.serviceAccount }}

xenit-alfresco/templates/active-mq/mq-deployement.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: mq
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.mq.podAnnotations }}
-    {{ toYaml .Values.mq.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: mq
 spec:
@@ -32,6 +27,10 @@ spec:
       annotations:
         checksum/mq-config: {{ include (print $.Template.BasePath "/active-mq/mq-config.yaml") . | sha256sum }}
         checksum/mq-secret: {{ include (print $.Template.BasePath "/active-mq/mq-secret.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.mq.podAnnotations }}
+        {{ toYaml .Values.mq.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
         - name: activemq

xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: digital-workspace
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.digitalWorkspace.podAnnotations }}
-    {{ toYaml .Values.digitalWorkspace.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: digital-workspace
 spec:
@@ -31,6 +26,10 @@ spec:
         app: digital-workspace
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/digital-workspace/digital-workspace-config.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.digitalWorkspace.podAnnotations }}
+        {{ toYaml .Values.digitalWorkspace.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
         - name: digital-workspace-container

xenit-alfresco/templates/postgres/postgresql-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: postgresql
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.postgresql.podAnnotations }}
-    {{ toYaml .Values.postgresql.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: postgresql
 spec:
@@ -33,6 +28,10 @@ spec:
         checksum/postgresql-config: {{ include (print $.Template.BasePath "/postgres/postgresql-config.yaml") . | sha256sum }}
         checksum/mq-secret: {{ include (print $.Template.BasePath "/active-mq/mq-secret.yaml") . | sha256sum }}
         checksum/db-secret: {{ include (print $.Template.BasePath "/db-secret.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.postgresql.podAnnotations }}
+        {{ toYaml .Values.postgresql.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
       - name: postgresql-container

xenit-alfresco/templates/share/share-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: share
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.share.podAnnotations }}
-    {{ toYaml .Values.share.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: share
 spec:
@@ -31,6 +26,10 @@ spec:
         app: share
       annotations:
         checksum/share-config: {{ include (print $.Template.BasePath "/share/share-config.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.share.podAnnotations }}
+        {{ toYaml .Values.share.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
       - name: share-container

xenit-alfresco/templates/solr/solr-stateful-set.yaml

@@ -4,11 +4,6 @@ kind: StatefulSet
 metadata:
   name: solr
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.solr.podAnnotations }}
-    {{ toYaml .Values.solr.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: solr
 spec:
@@ -28,6 +23,10 @@ spec:
         app: solr
       annotations:
         checksum/solr-config: {{ include (print $.Template.BasePath "/solr/solr-config.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.solr.podAnnotations }}
+        {{ toYaml .Values.solr.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
       - name: solr-container

xenit-alfresco/templates/sync-service/sync-service-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: sync-service
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.syncService.podAnnotations }}
-    {{ toYaml .Values.syncService.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: sync-service
 spec:
@@ -33,6 +28,10 @@ spec:
         checksum/sync-service-config: {{ include (print $.Template.BasePath "/sync-service/sync-service-config.yaml") . | sha256sum }}
         checksum/mq-secret: {{ include (print $.Template.BasePath "/active-mq/mq-secret.yaml") . | sha256sum }}
         checksum/db-secret: {{ include (print $.Template.BasePath "/db-secret.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.syncService.podAnnotations }}
+        {{ toYaml .Values.syncService.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
         - name: sync-service-container

xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: shared-file-store
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.transformServices.sharedFileStore.podAnnotations }}
-    {{ toYaml .Values.transformServices.sharedFileStore.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: shared-file-store
 spec:
@@ -31,6 +26,10 @@ spec:
         app: shared-file-store
       annotations:
         checksum/shared-file-store-config: {{ include (print $.Template.BasePath "/transform-services/shared-file-store/shared-file-store-config.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.transformServices.sharedFileStore.podAnnotations }}
+        {{ toYaml .Values.transformServices.sharedFileStore.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
         - name: shared-file-store-container

xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: transform-core-aio
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.transformServices.transformCoreAio.podAnnotations }}
-    {{ toYaml .Values.transformServices.transformCoreAio.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: transform-core-aio
 spec:
@@ -31,6 +26,10 @@ spec:
         app: transform-core-aio
       annotations:
         checksum/transform-core-aio-config: {{ include (print $.Template.BasePath "/transform-services/transform-core-aio/transform-core-aio-config.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.transformServices.transformCoreAio.podAnnotations }}
+        {{ toYaml .Values.transformServices.transformCoreAio.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
         - name: transform-core-aio-container

xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml

@@ -4,11 +4,6 @@ kind: Deployment
 metadata:
   name: transform-router
   namespace: {{ .Release.Namespace | quote }}
-  annotations:
-    {{- include "globalPodAnnotations" . | indent 4 }}
-    {{- if .Values.transformServices.transformRouter.podAnnotations }}
-    {{ toYaml .Values.transformServices.transformRouter.podAnnotations | nindent 4 }}
-    {{- end }}
   labels:
     app: transform-router
 spec:
@@ -31,6 +26,10 @@ spec:
         app: transform-router
       annotations:
         checksum/transform-router-config: {{ include (print $.Template.BasePath "/transform-services/transform-router/transform-router-config.yaml") . | sha256sum }}
+        {{- include "globalPodAnnotations" . | indent 8 }}
+        {{- if .Values.transformServices.transformRouter.podAnnotations }}
+        {{ toYaml .Values.transformServices.transformRouter.podAnnotations | nindent 8 }}
+        {{- end }}
     spec:
       containers:
         - name: transform-router-container