From b80902b07b97b0e4dbd4ea5c3e415b617de06dc7 Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:00:34 -0400
Subject: [PATCH 01/10] Add metadata annotations from values to all pods

This will allow for disabling Istio that conflicts with pods communication.
---
 rocketchat/templates/microservices-account-deployment.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rocketchat/templates/microservices-account-deployment.yaml b/rocketchat/templates/microservices-account-deployment.yaml
index 7e2c6ea..40514db 100644
--- a/rocketchat/templates/microservices-account-deployment.yaml
+++ b/rocketchat/templates/microservices-account-deployment.yaml
@@ -30,6 +30,10 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
+      {{- if .Values.podAccountAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
       - name: account-service

From 8ce42f3d2207b4caae16099cbd2fa4852294e3cd Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:02:22 -0400
Subject: [PATCH 02/10] Add metadata annotations from values to all pods

---
 .../templates/microservices-authorization-deployment.yaml     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rocketchat/templates/microservices-authorization-deployment.yaml b/rocketchat/templates/microservices-authorization-deployment.yaml
index f7b151a..bc2b13e 100644
--- a/rocketchat/templates/microservices-authorization-deployment.yaml
+++ b/rocketchat/templates/microservices-authorization-deployment.yaml
@@ -31,6 +31,10 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
+      {{- if .Values.podAccountAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
       - name: authorization-service

From 2e39660e6225e39041845ab8b44bf04286a0e505 Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:03:02 -0400
Subject: [PATCH 03/10] Add metadata annotations from values to all pods

---
 .../templates/microservices-ddp-streamer-deployment.yaml      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rocketchat/templates/microservices-ddp-streamer-deployment.yaml b/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
index d489606..fcd2e60 100644
--- a/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
+++ b/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
@@ -30,6 +30,10 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
+      {{- if .Values.podAccountAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
       - name: ddp-streamer

From dee6f9abb12bfa20cc82a376d826a29782d71aa5 Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:03:27 -0400
Subject: [PATCH 04/10] Add metadata annotations from values to all pods

---
 rocketchat/templates/microservices-presence-deployment.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rocketchat/templates/microservices-presence-deployment.yaml b/rocketchat/templates/microservices-presence-deployment.yaml
index 6e03dfe..b9077b9 100644
--- a/rocketchat/templates/microservices-presence-deployment.yaml
+++ b/rocketchat/templates/microservices-presence-deployment.yaml
@@ -31,6 +31,10 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
+      {{- if .Values.podAccountAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
       - name: presence-service

From f54784ead11fd2290e241ddf9927006db342b2da Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:04:00 -0400
Subject: [PATCH 05/10] Add metadata annotations from values to all pods

---
 rocketchat/templates/microservices-stream-hub-deployment.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rocketchat/templates/microservices-stream-hub-deployment.yaml b/rocketchat/templates/microservices-stream-hub-deployment.yaml
index f41fb08..857e1cf 100644
--- a/rocketchat/templates/microservices-stream-hub-deployment.yaml
+++ b/rocketchat/templates/microservices-stream-hub-deployment.yaml
@@ -31,6 +31,10 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
+      {{- if .Values.podAccountAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
       - name: stream-hub

From b579f602c3e4c1ad4997b91aca2619748e3131ba Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:06:03 -0400
Subject: [PATCH 06/10] Fix values key

---
 .../templates/microservices-authorization-deployment.yaml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocketchat/templates/microservices-authorization-deployment.yaml b/rocketchat/templates/microservices-authorization-deployment.yaml
index bc2b13e..0147d7e 100644
--- a/rocketchat/templates/microservices-authorization-deployment.yaml
+++ b/rocketchat/templates/microservices-authorization-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAccountAnnotations }}
+      {{- if .Values.podAuthorizationAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}

From 4e25922f159e1b6a6f342c174637b9cb11400e36 Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:06:29 -0400
Subject: [PATCH 07/10] Fix values key

---
 rocketchat/templates/microservices-ddp-streamer-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocketchat/templates/microservices-ddp-streamer-deployment.yaml b/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
index fcd2e60..01219a3 100644
--- a/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
+++ b/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAccountAnnotations }}
+      {{- if .Values.podDdpStreamerAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}

From aca9833f8d06b6f8b45d1f8334ad125e0d83e4fe Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:06:53 -0400
Subject: [PATCH 08/10] Fix values key

---
 rocketchat/templates/microservices-presence-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocketchat/templates/microservices-presence-deployment.yaml b/rocketchat/templates/microservices-presence-deployment.yaml
index b9077b9..ca48f69 100644
--- a/rocketchat/templates/microservices-presence-deployment.yaml
+++ b/rocketchat/templates/microservices-presence-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAccountAnnotations }}
+      {{- if .Values.podPresenceAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}

From 680cfd58135b9ff46f94f4947d78ebc03be4d694 Mon Sep 17 00:00:00 2001
From: Pablo Andermann <104647012+pabloandermann@users.noreply.github.com>
Date: Fri, 25 Aug 2023 03:07:21 -0400
Subject: [PATCH 09/10] Fix values key

---
 rocketchat/templates/microservices-stream-hub-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocketchat/templates/microservices-stream-hub-deployment.yaml b/rocketchat/templates/microservices-stream-hub-deployment.yaml
index 857e1cf..131b5b0 100644
--- a/rocketchat/templates/microservices-stream-hub-deployment.yaml
+++ b/rocketchat/templates/microservices-stream-hub-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAccountAnnotations }}
+      {{- if .Values.podStreamHubAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}

From 594cb8bc08312c2e4ff22b2aad9c2216942224cb Mon Sep 17 00:00:00 2001
From: Tomas Ruiz <tomasruizr@gmail.com>
Date: Fri, 25 Aug 2023 17:24:58 -0300
Subject: [PATCH 10/10] fix: Values variable name

---
 rocketchat/templates/microservices-account-deployment.yaml  | 6 +++---
 .../templates/microservices-authorization-deployment.yaml   | 6 +++---
 .../templates/microservices-ddp-streamer-deployment.yaml    | 6 +++---
 rocketchat/templates/microservices-presence-deployment.yaml | 6 +++---
 .../templates/microservices-stream-hub-deployment.yaml      | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/rocketchat/templates/microservices-account-deployment.yaml b/rocketchat/templates/microservices-account-deployment.yaml
index 40514db..a795afe 100644
--- a/rocketchat/templates/microservices-account-deployment.yaml
+++ b/rocketchat/templates/microservices-account-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAccountAnnotations }}
+      {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
@@ -64,10 +64,10 @@ spec:
           value: 'yes'
         - name: MS_METRICS
           value: {{ .Values.prometheusScraping.enabled | default "false" | quote }}
-        volumeMounts: 
+        volumeMounts:
         {{- if .Values.extraVolumeMounts }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 8 }}
-        {{- end }}   
+        {{- end }}
         securityContext:
           {{- toYaml .Values.microservices.account.securityContext | nindent 10 }}
       volumes:
diff --git a/rocketchat/templates/microservices-authorization-deployment.yaml b/rocketchat/templates/microservices-authorization-deployment.yaml
index 0147d7e..6424663 100644
--- a/rocketchat/templates/microservices-authorization-deployment.yaml
+++ b/rocketchat/templates/microservices-authorization-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAuthorizationAnnotations }}
+      {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
@@ -65,10 +65,10 @@ spec:
           value: 'yes'
         - name: MS_METRICS
           value: {{ .Values.prometheusScraping.enabled | default "false" | quote }}
-        volumeMounts: 
+        volumeMounts:
         {{- if .Values.extraVolumeMounts }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 8 }}
-        {{- end }}   
+        {{- end }}
         securityContext:
           {{- toYaml .Values.microservices.authorization.securityContext | nindent 10 }}
       volumes:
diff --git a/rocketchat/templates/microservices-ddp-streamer-deployment.yaml b/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
index 01219a3..0d1553c 100644
--- a/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
+++ b/rocketchat/templates/microservices-ddp-streamer-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podDdpStreamerAnnotations }}
+      {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
@@ -66,10 +66,10 @@ spec:
           value: 'yes'
         - name: MS_METRICS
           value: {{ .Values.prometheusScraping.enabled | default "false" | quote }}
-        volumeMounts: 
+        volumeMounts:
         {{- if .Values.extraVolumeMounts }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 8 }}
-        {{- end }}   
+        {{- end }}
         securityContext:
           {{- toYaml .Values.microservices.ddpStreamer.securityContext | nindent 10 }}
       volumes:
diff --git a/rocketchat/templates/microservices-presence-deployment.yaml b/rocketchat/templates/microservices-presence-deployment.yaml
index ca48f69..73a3387 100644
--- a/rocketchat/templates/microservices-presence-deployment.yaml
+++ b/rocketchat/templates/microservices-presence-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podPresenceAnnotations }}
+      {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
@@ -65,10 +65,10 @@ spec:
           value: 'yes'
         - name: MS_METRICS
           value: {{ .Values.prometheusScraping.enabled | default "false" | quote }}
-        volumeMounts: 
+        volumeMounts:
         {{- if .Values.extraVolumeMounts }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 8 }}
-        {{- end }}   
+        {{- end }}
         securityContext:
           {{- toYaml .Values.microservices.presence.securityContext | nindent 10 }}
       volumes:
diff --git a/rocketchat/templates/microservices-stream-hub-deployment.yaml b/rocketchat/templates/microservices-stream-hub-deployment.yaml
index 131b5b0..5aaaaea 100644
--- a/rocketchat/templates/microservices-stream-hub-deployment.yaml
+++ b/rocketchat/templates/microservices-stream-hub-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         {{- if .Values.podLabels }}
           {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
-      {{- if .Values.podStreamHubAnnotations }}
+      {{- if .Values.podAnnotations }}
       annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
@@ -75,10 +75,10 @@ spec:
           value: 'yes'
         - name: MS_METRICS
           value: {{ .Values.prometheusScraping.enabled | default "false" | quote }}
-        volumeMounts: 
+        volumeMounts:
         {{- if .Values.extraVolumeMounts }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 8 }}
-        {{- end }}   
+        {{- end }}
         securityContext:
           {{- toYaml .Values.microservices.streamHub.securityContext | nindent 10 }}
       volumes: