From 1eedd7ef98a75129590726a3135195eb0f1f8e25 Mon Sep 17 00:00:00 2001
From: "joost.de.cupere@xenit.eu" <joost.de.cupere@xenit.eu>
Date: Tue, 30 Aug 2022 16:29:41 +0200
Subject: [PATCH 1/3] OUPDAUNTLE-31 add annotations also to the templates

---
 xenit-alfresco/templates/acs/acs-deployment.yaml              | 4 ++++
 xenit-alfresco/templates/active-mq/mq-deployement.yaml        | 4 ++++
 .../digital-workspace/digital-workspace-deployment.yaml       | 4 ++++
 xenit-alfresco/templates/postgres/postgresql-deployment.yaml  | 4 ++++
 xenit-alfresco/templates/share/share-deployment.yaml          | 4 ++++
 xenit-alfresco/templates/solr/solr-stateful-set.yaml          | 4 ++++
 .../templates/sync-service/sync-service-deployment.yaml       | 4 ++++
 .../shared-file-store/shared-file-store-deployment.yaml       | 4 ++++
 .../transform-core-aio/transform-core-aio-deployment.yaml     | 4 ++++
 .../transform-router/transform-router-deployment.yaml         | 4 ++++
 10 files changed, 40 insertions(+)

diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
index 2e7a0ca..90d0206 100644
--- a/xenit-alfresco/templates/acs/acs-deployment.yaml
+++ b/xenit-alfresco/templates/acs/acs-deployment.yaml
@@ -30,6 +30,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 }}
diff --git a/xenit-alfresco/templates/active-mq/mq-deployement.yaml b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
index 8c7b05c..032cd87 100644
--- a/xenit-alfresco/templates/active-mq/mq-deployement.yaml
+++ b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
@@ -32,6 +32,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
diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
index 948d69f..759cf6e 100644
--- a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
+++ b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
@@ -31,6 +31,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
diff --git a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
index 4830dd8..30ae649 100644
--- a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
+++ b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
@@ -33,6 +33,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
diff --git a/xenit-alfresco/templates/share/share-deployment.yaml b/xenit-alfresco/templates/share/share-deployment.yaml
index 402e9f6..6762c70 100644
--- a/xenit-alfresco/templates/share/share-deployment.yaml
+++ b/xenit-alfresco/templates/share/share-deployment.yaml
@@ -31,6 +31,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
diff --git a/xenit-alfresco/templates/solr/solr-stateful-set.yaml b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
index 3bdcf11..f334aed 100644
--- a/xenit-alfresco/templates/solr/solr-stateful-set.yaml
+++ b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
@@ -28,6 +28,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
diff --git a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
index cdbff47..3aa3762 100644
--- a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
+++ b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
@@ -33,6 +33,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
diff --git a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
index 9f9b547..1302bb2 100644
--- a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
+++ b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
@@ -31,6 +31,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
diff --git a/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml b/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
index 6528c2f..580c1b7 100644
--- a/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
+++ b/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
@@ -31,6 +31,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
diff --git a/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml b/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
index 7d46f0d..91e375f 100644
--- a/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
+++ b/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
@@ -31,6 +31,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

From 191b3680feef41a9de00ae833690e4b223e7544d Mon Sep 17 00:00:00 2001
From: "joost.de.cupere@xenit.eu" <joost.de.cupere@xenit.eu>
Date: Tue, 30 Aug 2022 16:34:11 +0200
Subject: [PATCH 2/3] OUPDAUNTLE-31 remove pod annotations from the deployment

---
 xenit-alfresco/templates/acs/acs-deployment.yaml             | 5 -----
 xenit-alfresco/templates/active-mq/mq-deployement.yaml       | 5 -----
 .../digital-workspace/digital-workspace-deployment.yaml      | 5 -----
 xenit-alfresco/templates/postgres/postgresql-deployment.yaml | 5 -----
 xenit-alfresco/templates/share/share-deployment.yaml         | 5 -----
 xenit-alfresco/templates/solr/solr-stateful-set.yaml         | 5 -----
 .../templates/sync-service/sync-service-deployment.yaml      | 5 -----
 .../shared-file-store/shared-file-store-deployment.yaml      | 5 -----
 .../transform-core-aio/transform-core-aio-deployment.yaml    | 5 -----
 .../transform-router/transform-router-deployment.yaml        | 5 -----
 10 files changed, 50 deletions(-)

diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
index 90d0206..16f4698 100644
--- a/xenit-alfresco/templates/acs/acs-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/active-mq/mq-deployement.yaml b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
index 032cd87..8c78e75 100644
--- a/xenit-alfresco/templates/active-mq/mq-deployement.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
index 759cf6e..4b5bfe4 100644
--- a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
index 30ae649..a6932ab 100644
--- a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/share/share-deployment.yaml b/xenit-alfresco/templates/share/share-deployment.yaml
index 6762c70..4f79867 100644
--- a/xenit-alfresco/templates/share/share-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/solr/solr-stateful-set.yaml b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
index f334aed..c2bf35c 100644
--- a/xenit-alfresco/templates/solr/solr-stateful-set.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
index 3aa3762..8dcb2e1 100644
--- a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
index 1302bb2..7bc13b4 100644
--- a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml b/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
index 580c1b7..d5f63c9 100644
--- a/xenit-alfresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
+++ b/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:
diff --git a/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml b/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
index 91e375f..3414925 100644
--- a/xenit-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
+++ b/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:

From 3850eebbfc9ce01f8ddaea869b437b2943615e59 Mon Sep 17 00:00:00 2001
From: "joost.de.cupere@xenit.eu" <joost.de.cupere@xenit.eu>
Date: Tue, 30 Aug 2022 16:46:42 +0200
Subject: [PATCH 3/3] OUPDAUNTLE-31 updated to version 0.1.4

---
 xenit-alfresco/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xenit-alfresco/Chart.yaml b/xenit-alfresco/Chart.yaml
index e1867de..cb84b6a 100644
--- a/xenit-alfresco/Chart.yaml
+++ b/xenit-alfresco/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to