From c11bc3bcc4e32810f8668b1956d61081014448b9 Mon Sep 17 00:00:00 2001
From: Aroosha Pervaiz <apervaiz@lxplus805.cern.ch>
Date: Fri, 3 Sep 2021 10:35:28 +0200
Subject: [PATCH 1/2] adding changes to config maps

---
 helm/crabcache/Chart.yaml                                | 2 +-
 helm/crabcache/templates/configMap.yaml                  | 6 +++---
 helm/crabcache/templates/deployment.yaml                 | 4 ++--
 helm/crabserver/Chart.yaml                               | 2 +-
 helm/crabserver/templates/configMap.yaml                 | 4 ++--
 helm/crabserver/templates/deployment.yaml                | 4 ++--
 helm/das-mongo-exporter/Chart.yaml                       | 2 +-
 helm/das-mongo/Chart.yaml                                | 2 +-
 helm/das-server/Chart.yaml                               | 2 +-
 helm/das-server/templates/configMap.yaml                 | 4 ++--
 helm/das-server/templates/deployment.yaml                | 4 ++--
 helm/dbs-global-r/Chart.yaml                             | 2 +-
 helm/dbs-global-r/templates/configMap.yaml               | 4 ++--
 helm/dbs-global-r/templates/deployment.yaml              | 4 ++--
 helm/dbs-global-w/Chart.yaml                             | 2 +-
 helm/dbs-global-w/templates/configMap.yaml               | 4 ++--
 helm/dbs-global-w/templates/deployment.yaml              | 4 ++--
 helm/dbs-migrate/Chart.yaml                              | 2 +-
 helm/dbs-migrate/templates/configMap.yaml                | 4 ++--
 helm/dbs-migrate/templates/deployment.yaml               | 4 ++--
 helm/dbs-migrate/templates/service.yaml                  | 2 +-
 helm/dbs-phys03-r/Chart.yaml                             | 2 +-
 helm/dbs-phys03-r/templates/configMap.yaml               | 4 ++--
 helm/dbs-phys03-r/templates/deployment.yaml              | 4 ++--
 helm/dbs-phys03-w/Chart.yaml                             | 2 +-
 helm/dbs-phys03-w/templates/configMap.yaml               | 5 +++--
 helm/dbs-phys03-w/templates/deployment.yaml              | 4 ++--
 helm/dbs2go/Chart.yaml                                   | 2 +-
 helm/dbs2go/templates/configMap.yaml                     | 2 +-
 helm/dbs2go/templates/deployment.yaml                    | 4 ++--
 helm/dbsmigration/Chart.yaml                             | 2 +-
 helm/dbsmigration/templates/configMap.yaml               | 5 +++--
 helm/dbsmigration/templates/deployment.yaml              | 4 ++--
 helm/dbsmigration/templates/service.yaml                 | 4 ++--
 helm/exitcodes/Chart.yaml                                | 2 +-
 helm/httpgo/Chart.yaml                                   | 2 +-
 helm/ms-output-mongo/Chart.yaml                          | 2 +-
 helm/reqmgr2-tasks/Chart.yaml                            | 2 +-
 helm/reqmgr2-tasks/templates/deployment.yaml             | 4 ++--
 helm/reqmgr2/Chart.yaml                                  | 2 +-
 helm/reqmgr2/templates/configMap.yaml                    | 4 ++--
 helm/reqmgr2/templates/deployment.yaml                   | 4 ++--
 helm/reqmgr2ms-monitor/Chart.yaml                        | 2 +-
 helm/reqmgr2ms-monitor/templates/configMap.yaml          | 5 +++--
 helm/reqmgr2ms-monitor/templates/deployment.yaml         | 4 ++--
 helm/reqmgr2ms-output/Chart.yaml                         | 2 +-
 helm/reqmgr2ms-output/templates/configMap.yaml           | 4 ++--
 helm/reqmgr2ms-output/templates/deployment.yaml          | 4 ++--
 helm/reqmgr2ms-rulecleaner/Chart.yaml                    | 2 +-
 helm/reqmgr2ms-rulecleaner/templates/configMap.yaml      | 4 ++--
 helm/reqmgr2ms-rulecleaner/templates/deployment.yaml     | 4 ++--
 helm/reqmgr2ms-transferor/Chart.yaml                     | 2 +-
 helm/reqmgr2ms-transferor/templates/configMap.yaml       | 4 ++--
 helm/reqmgr2ms-transferor/templates/deployment.yaml      | 4 ++--
 helm/reqmgr2ms-unmerged-t1/Chart.yaml                    | 2 +-
 helm/reqmgr2ms-unmerged-t1/templates/configMap.yaml      | 5 ++---
 helm/reqmgr2ms-unmerged-t1/templates/deployment.yaml     | 4 ++--
 helm/reqmgr2ms-unmerged-t2t3/Chart.yaml                  | 2 +-
 helm/reqmgr2ms-unmerged-t2t3/templates/configMap.yaml    | 5 ++---
 helm/reqmgr2ms-unmerged-t2t3/templates/deployment.yaml   | 4 ++--
 helm/reqmgr2ms-unmerged-t2t3us/Chart.yaml                | 2 +-
 helm/reqmgr2ms-unmerged-t2t3us/templates/configMap.yaml  | 5 ++---
 helm/reqmgr2ms-unmerged-t2t3us/templates/deployment.yaml | 4 ++--
 helm/reqmon-tasks/Chart.yaml                             | 2 +-
 helm/reqmon-tasks/templates/configMap.yaml               | 4 ++--
 helm/reqmon-tasks/templates/deployment.yaml              | 4 ++--
 helm/reqmon/Chart.yaml                                   | 2 +-
 helm/reqmon/templates/configMap.yaml                     | 4 ++--
 helm/reqmon/templates/deployment.yaml                    | 4 ++--
 helm/t0reqmon-tasks/Chart.yaml                           | 2 +-
 helm/t0reqmon-tasks/templates/deployment.yaml            | 4 ++--
 helm/t0reqmon/Chart.yaml                                 | 2 +-
 helm/t0reqmon/templates/configMap.yaml                   | 4 ++--
 helm/t0reqmon/templates/deployment.yaml                  | 4 ++--
 helm/t0wmadatasvc/Chart.yaml                             | 2 +-
 helm/t0wmadatasvc/templates/configMap.yaml               | 4 ++--
 helm/t0wmadatasvc/templates/deployment.yaml              | 4 ++--
 helm/wmarchive/Chart.yaml                                | 2 +-
 helm/wmarchive/templates/configMap.yaml                  | 4 ++--
 helm/wmarchive/templates/deployment.yaml                 | 4 ++--
 helm/workqueue/Chart.yaml                                | 2 +-
 helm/workqueue/templates/configMap.yaml                  | 4 ++--
 helm/workqueue/templates/deployment.yaml                 | 4 ++--
 83 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/helm/crabcache/Chart.yaml b/helm/crabcache/Chart.yaml
index 6753606bc..0775c7c90 100644
--- a/helm/crabcache/Chart.yaml
+++ b/helm/crabcache/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.6
+version: 0.1.8
 
 # 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
diff --git a/helm/crabcache/templates/configMap.yaml b/helm/crabcache/templates/configMap.yaml
index c512a0dd8..4c3f37236 100644
--- a/helm/crabcache/templates/configMap.yaml
+++ b/helm/crabcache/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: crabcache-filebeat-config
+  name: '{{ include "crabcache.fullname" . }}-filebeat-config'
   namespace: crab
   labels:
     k8s-app: filebeat
@@ -27,10 +27,10 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: crabcache
+  name: {{ include "crabcache.fullname" . }}
+  namespace: crab
   labels:
     app: crabcache
-  namespace: crab
 data:
   setup-certs-and-run.sh: |
     #!/bin/bash
diff --git a/helm/crabcache/templates/deployment.yaml b/helm/crabcache/templates/deployment.yaml
index a51dafeec..1e1578ed3 100644
--- a/helm/crabcache/templates/deployment.yaml
+++ b/helm/crabcache/templates/deployment.yaml
@@ -128,7 +128,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: crabcache
+          name: {{ include "crabcache.fullname" .}}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: crabcache-storage
         persistentVolumeClaim:
@@ -150,7 +150,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: crabcache-filebeat-config
+          name: {{ include "crabcache.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/crabserver/Chart.yaml b/helm/crabserver/Chart.yaml
index 3eb424b61..1a4c112b1 100644
--- a/helm/crabserver/Chart.yaml
+++ b/helm/crabserver/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/crabserver/templates/configMap.yaml b/helm/crabserver/templates/configMap.yaml
index b1e63d810..7b989eede 100644
--- a/helm/crabserver/templates/configMap.yaml
+++ b/helm/crabserver/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: crabserver-filebeat-config
+  name: '{{ include "crabserver.fullname" . }}-filebeat-config'
   namespace: crab
   labels:
     k8s-app: filebeat
@@ -28,7 +28,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: crabserver
+  name: {{ include "crabserver.fullname" . }}
   labels:
     app: crabserver
   namespace: crab
diff --git a/helm/crabserver/templates/deployment.yaml b/helm/crabserver/templates/deployment.yaml
index bcadd421e..6489555b7 100644
--- a/helm/crabserver/templates/deployment.yaml
+++ b/helm/crabserver/templates/deployment.yaml
@@ -134,7 +134,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: crabserver
+          name: {{ include "crabserver.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -153,7 +153,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: crabserver-filebeat-config
+          name: {{ include "crabserver.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/das-mongo-exporter/Chart.yaml b/helm/das-mongo-exporter/Chart.yaml
index 8894de67f..b61c77785 100644
--- a/helm/das-mongo-exporter/Chart.yaml
+++ b/helm/das-mongo-exporter/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/das-mongo/Chart.yaml b/helm/das-mongo/Chart.yaml
index 8b41578c6..b9d51c14e 100644
--- a/helm/das-mongo/Chart.yaml
+++ b/helm/das-mongo/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/das-server/Chart.yaml b/helm/das-server/Chart.yaml
index 77554f9f3..8a8850456 100644
--- a/helm/das-server/Chart.yaml
+++ b/helm/das-server/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/das-server/templates/configMap.yaml b/helm/das-server/templates/configMap.yaml
index 09fb7be76..2ca54b731 100644
--- a/helm/das-server/templates/configMap.yaml
+++ b/helm/das-server/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: das-server-filebeat-config
+  name: '{{ include "das-server.fullname" . }}-filebeat-config'
   namespace: das
   labels:
     k8s-app: filebeat
@@ -29,7 +29,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: das-server-promtail
+  name: {{ include "das-server.fullname" . }}
   labels:
     app: das-server-promtail
   namespace: das
diff --git a/helm/das-server/templates/deployment.yaml b/helm/das-server/templates/deployment.yaml
index e7821acee..f1bd4cdde 100644
--- a/helm/das-server/templates/deployment.yaml
+++ b/helm/das-server/templates/deployment.yaml
@@ -148,7 +148,7 @@ spec:
           claimName: logs-cephfs-claim-das
       - name: promtail-secrets
         configMap:
-          name: das-server-promtail
+          name: {{ include "das-server.fullname" . }}-promtail 
       - name: varlog
         hostPath:
           path: /var/log
@@ -158,7 +158,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: das-server-filebeat-config
+          name: {{ include "das-server.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}       
       {{- end }}
diff --git a/helm/dbs-global-r/Chart.yaml b/helm/dbs-global-r/Chart.yaml
index 85712aa81..d94ca74c0 100644
--- a/helm/dbs-global-r/Chart.yaml
+++ b/helm/dbs-global-r/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbs-global-r/templates/configMap.yaml b/helm/dbs-global-r/templates/configMap.yaml
index b31560e98..932c08fe1 100644
--- a/helm/dbs-global-r/templates/configMap.yaml
+++ b/helm/dbs-global-r/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-global-r-filebeat-config
+  name: '{{ include "dbs-global-r.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-global-r
+  name: {{ include "dbs-global-r.fullname" . }}
   labels:
     app: dbs-global-r
   namespace: dbs
diff --git a/helm/dbs-global-r/templates/deployment.yaml b/helm/dbs-global-r/templates/deployment.yaml
index adb9c9508..f910065e9 100644
--- a/helm/dbs-global-r/templates/deployment.yaml
+++ b/helm/dbs-global-r/templates/deployment.yaml
@@ -128,7 +128,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-global-r
+          name: {{ include "dbs-global-r.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -147,7 +147,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-global-r-filebeat-config
+          name: {{ include "dbs-global-r.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}       
 {{- end }}
diff --git a/helm/dbs-global-w/Chart.yaml b/helm/dbs-global-w/Chart.yaml
index bb77eba0e..c290fd6df 100644
--- a/helm/dbs-global-w/Chart.yaml
+++ b/helm/dbs-global-w/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbs-global-w/templates/configMap.yaml b/helm/dbs-global-w/templates/configMap.yaml
index ad5f04c8f..a3b644d3e 100644
--- a/helm/dbs-global-w/templates/configMap.yaml
+++ b/helm/dbs-global-w/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-global-w-filebeat-config
+  name: '{{ include "dbs-global-w.fullname" .}}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-global-w
+  name: {{ include "dbs-global-w.fullname" . }}
   labels:
     app: dbs-global-w
   namespace: dbs
diff --git a/helm/dbs-global-w/templates/deployment.yaml b/helm/dbs-global-w/templates/deployment.yaml
index 2acd8373a..6c47fa2ff 100644
--- a/helm/dbs-global-w/templates/deployment.yaml
+++ b/helm/dbs-global-w/templates/deployment.yaml
@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-global-w
+          name: {{ include "dbs-global-w.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-global-w-filebeat-config
+          name: {{ include "dbs-global-w.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/dbs-migrate/Chart.yaml b/helm/dbs-migrate/Chart.yaml
index ae74ebcc2..c2c2e725f 100644
--- a/helm/dbs-migrate/Chart.yaml
+++ b/helm/dbs-migrate/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbs-migrate/templates/configMap.yaml b/helm/dbs-migrate/templates/configMap.yaml
index b2dbac79b..8b7a15468 100644
--- a/helm/dbs-migrate/templates/configMap.yaml
+++ b/helm/dbs-migrate/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-migrate-filebeat-config
+  name: '{{ include "dbs-migrate.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-migrate
+  name: {{ include "dbs-migrate.fullname" . }}
   labels:
     app: dbs-migrate
   namespace: dbs
diff --git a/helm/dbs-migrate/templates/deployment.yaml b/helm/dbs-migrate/templates/deployment.yaml
index 5b6bdd3a7..30ebf5a09 100644
--- a/helm/dbs-migrate/templates/deployment.yaml
+++ b/helm/dbs-migrate/templates/deployment.yaml
@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-migrate
+          name: {{ include "dbs-migrate.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-migrate-filebeat-config
+          name: {{ include "dbs-migrate.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/dbs-migrate/templates/service.yaml b/helm/dbs-migrate/templates/service.yaml
index 25b9a1e20..5d4a55003 100644
--- a/helm/dbs-migrate/templates/service.yaml
+++ b/helm/dbs-migrate/templates/service.yaml
@@ -1,7 +1,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: dbs-migrate
+  name: {{ include "dbs-migrate.fullname" . }}
   namespace: dbs
 spec:
   selector:
diff --git a/helm/dbs-phys03-r/Chart.yaml b/helm/dbs-phys03-r/Chart.yaml
index 75e2d8577..49b357b0f 100644
--- a/helm/dbs-phys03-r/Chart.yaml
+++ b/helm/dbs-phys03-r/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbs-phys03-r/templates/configMap.yaml b/helm/dbs-phys03-r/templates/configMap.yaml
index a924acf68..9fbc5abab 100644
--- a/helm/dbs-phys03-r/templates/configMap.yaml
+++ b/helm/dbs-phys03-r/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-phys03-r-filebeat-config
+  name: '{{ include "dbs-phys03-r.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-phys03-r
+  name: {{ include "dbs-phys03-r.fullname" . }}
   labels:
     app: dbs-phys03-r
   namespace: dbs
diff --git a/helm/dbs-phys03-r/templates/deployment.yaml b/helm/dbs-phys03-r/templates/deployment.yaml
index f487918ae..8b0fb813d 100644
--- a/helm/dbs-phys03-r/templates/deployment.yaml
+++ b/helm/dbs-phys03-r/templates/deployment.yaml
@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-phys03-r
+          name: {{ include "dbs-phys03-r.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-phys03-r-filebeat-config
+          name: {{ include "dbs-phys03-r.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/dbs-phys03-w/Chart.yaml b/helm/dbs-phys03-w/Chart.yaml
index e57185843..35427971f 100644
--- a/helm/dbs-phys03-w/Chart.yaml
+++ b/helm/dbs-phys03-w/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbs-phys03-w/templates/configMap.yaml b/helm/dbs-phys03-w/templates/configMap.yaml
index f06f112ca..05fc7f0ec 100644
--- a/helm/dbs-phys03-w/templates/configMap.yaml
+++ b/helm/dbs-phys03-w/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-phys03-w-filebeat-config
+  name: '{{ include "dbs-phys03-w.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,8 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-phys03-w
+  name: {{ include "dbs-phys03-w.fullname" . }}
+  namespace: dbs
   labels:
     app: dbs-phys03-w
   namespace: dbs
diff --git a/helm/dbs-phys03-w/templates/deployment.yaml b/helm/dbs-phys03-w/templates/deployment.yaml
index cd80d4a75..f270b4ee2 100644
--- a/helm/dbs-phys03-w/templates/deployment.yaml
+++ b/helm/dbs-phys03-w/templates/deployment.yaml
@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-phys03-w
+          name: {{ include "dbs-phys03-w.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-phys03-w-filebeat-config
+          name: {{ include "dbs-phys03-w.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/dbs2go/Chart.yaml b/helm/dbs2go/Chart.yaml
index b83d43f3f..881aa5878 100644
--- a/helm/dbs2go/Chart.yaml
+++ b/helm/dbs2go/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbs2go/templates/configMap.yaml b/helm/dbs2go/templates/configMap.yaml
index fd6a53465..06b110b4b 100644
--- a/helm/dbs2go/templates/configMap.yaml
+++ b/helm/dbs2go/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs2go-filebeat-config
+  name: '{{ include "dbs2go.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
diff --git a/helm/dbs2go/templates/deployment.yaml b/helm/dbs2go/templates/deployment.yaml
index 4bf034a0c..2d3d63488 100644
--- a/helm/dbs2go/templates/deployment.yaml
+++ b/helm/dbs2go/templates/deployment.yaml
@@ -112,7 +112,7 @@ spec:
           secretName: hmac-secrets
       - name: secrets
         configMap:
-          name: dbs2go-config
+          name: {{ include "dbs2go.fullname" .}}-config
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -131,7 +131,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs2go-filebeat-config
+          name: {{ include "dbs2go.fullname" .}}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/dbsmigration/Chart.yaml b/helm/dbsmigration/Chart.yaml
index d8ba23fe0..64003fddc 100644
--- a/helm/dbsmigration/Chart.yaml
+++ b/helm/dbsmigration/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.1
+version: 0.1.2
 
 # 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
diff --git a/helm/dbsmigration/templates/configMap.yaml b/helm/dbsmigration/templates/configMap.yaml
index fbd6457e9..211a73266 100644
--- a/helm/dbsmigration/templates/configMap.yaml
+++ b/helm/dbsmigration/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbsmigration-filebeat-config
+  name: '{{ include "dbsmigration.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,8 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbsmigration
+  name: {{ include "dbsmigration.fullname" . }}
+  namespace: dbs
   labels:
     app: dbsmigration
   namespace: dbs
diff --git a/helm/dbsmigration/templates/deployment.yaml b/helm/dbsmigration/templates/deployment.yaml
index 18426c3d4..cc55938bb 100644
--- a/helm/dbsmigration/templates/deployment.yaml
+++ b/helm/dbsmigration/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbsmigration
+          name: {{ include "dbsmigration.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -142,7 +142,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbsmigration-filebeat-config
+          name: {{ include "dbsmigration.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/dbsmigration/templates/service.yaml b/helm/dbsmigration/templates/service.yaml
index 3ee49a366..dc267a5e0 100644
--- a/helm/dbsmigration/templates/service.yaml
+++ b/helm/dbsmigration/templates/service.yaml
@@ -1,8 +1,8 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: dbsmigration
-  namespace: dbs
+ name: {{ include "dbsmigration.fullname" . }}
+ namespace: dbs
 spec:
   selector:
     app: dbsmigration
diff --git a/helm/exitcodes/Chart.yaml b/helm/exitcodes/Chart.yaml
index 302c598f1..b38077cf2 100644
--- a/helm/exitcodes/Chart.yaml
+++ b/helm/exitcodes/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for Exitcodes
 
 type: application
 
-version: 0.1.0
+version: 0.1.1
 
 appVersion: 1.16.0
diff --git a/helm/httpgo/Chart.yaml b/helm/httpgo/Chart.yaml
index 21caf0dae..89d044671 100644
--- a/helm/httpgo/Chart.yaml
+++ b/helm/httpgo/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: httpgo
 description: A Helm chart for HTTPGO service
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: 1.16.0
diff --git a/helm/ms-output-mongo/Chart.yaml b/helm/ms-output-mongo/Chart.yaml
index 2b4a22393..0358256e4 100644
--- a/helm/ms-output-mongo/Chart.yaml
+++ b/helm/ms-output-mongo/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2-tasks/Chart.yaml b/helm/reqmgr2-tasks/Chart.yaml
index 03d47b629..71438de86 100644
--- a/helm/reqmgr2-tasks/Chart.yaml
+++ b/helm/reqmgr2-tasks/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2-tasks/templates/deployment.yaml b/helm/reqmgr2-tasks/templates/deployment.yaml
index 75532e0f2..479a8d8fe 100644
--- a/helm/reqmgr2-tasks/templates/deployment.yaml
+++ b/helm/reqmgr2-tasks/templates/deployment.yaml
@@ -111,7 +111,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: reqmgr2-tasks
+          name: {{ include "reqmgr2-tasks.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -130,7 +130,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: reqmgr2-tasks-filebeat-config
+          name: {{ include "reqmgr2-tasks.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2/Chart.yaml b/helm/reqmgr2/Chart.yaml
index 90911abfc..b40718a1f 100644
--- a/helm/reqmgr2/Chart.yaml
+++ b/helm/reqmgr2/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2/templates/configMap.yaml b/helm/reqmgr2/templates/configMap.yaml
index acefc59f1..c538a38b9 100644
--- a/helm/reqmgr2/templates/configMap.yaml
+++ b/helm/reqmgr2/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: reqmgr2-filebeat-config
+  name: '{{ include "reqmgr2.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: reqmgr2
+  name: {{ include "reqmgr2.fullname" . }}
   labels:
     app: reqmgr2
   namespace: dmwm
diff --git a/helm/reqmgr2/templates/deployment.yaml b/helm/reqmgr2/templates/deployment.yaml
index 1085aa3e0..34694f791 100644
--- a/helm/reqmgr2/templates/deployment.yaml
+++ b/helm/reqmgr2/templates/deployment.yaml
@@ -124,7 +124,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: reqmgr2
+          name: {{ include "reqmgr2.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -143,7 +143,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: reqmgr2-filebeat-config
+          name: {{ include "reqmgr2.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-monitor/Chart.yaml b/helm/reqmgr2ms-monitor/Chart.yaml
index edb42ccc6..ee65b8ba7 100644
--- a/helm/reqmgr2ms-monitor/Chart.yaml
+++ b/helm/reqmgr2ms-monitor/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-monitor/templates/configMap.yaml b/helm/reqmgr2ms-monitor/templates/configMap.yaml
index 1a633573d..23d247af8 100644
--- a/helm/reqmgr2ms-monitor/templates/configMap.yaml
+++ b/helm/reqmgr2ms-monitor/templates/configMap.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-monitor-filebeat-config
+  name: ms-monitor
+  name: '{{ include "reqmgr2ms-monitor.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +28,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-monitor
+  name: {{ include "reqmgr2ms-monitor.fullname" . }}
   labels:
     app: ms-monitor
   namespace: dmwm
diff --git a/helm/reqmgr2ms-monitor/templates/deployment.yaml b/helm/reqmgr2ms-monitor/templates/deployment.yaml
index 55b67b3c5..80f86de42 100644
--- a/helm/reqmgr2ms-monitor/templates/deployment.yaml
+++ b/helm/reqmgr2ms-monitor/templates/deployment.yaml
@@ -120,7 +120,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-monitor
+          name: {{ include "reqmgr2ms-monitor.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -139,7 +139,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-monitor-filebeat-config
+          name: {{ include "reqmgr2ms-monitor.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-output/Chart.yaml b/helm/reqmgr2ms-output/Chart.yaml
index eb6130aef..76c788768 100644
--- a/helm/reqmgr2ms-output/Chart.yaml
+++ b/helm/reqmgr2ms-output/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-output/templates/configMap.yaml b/helm/reqmgr2ms-output/templates/configMap.yaml
index 6b689bb92..4603d2124 100644
--- a/helm/reqmgr2ms-output/templates/configMap.yaml
+++ b/helm/reqmgr2ms-output/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-output-filebeat-config
+  name: '{{ include "reqmgr2ms-output.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-output
+  name: {{ include "reqmgr2ms-output.fullname" . }}
   labels:
     app: ms-output
   namespace: dmwm
diff --git a/helm/reqmgr2ms-output/templates/deployment.yaml b/helm/reqmgr2ms-output/templates/deployment.yaml
index 8dbe60fd1..c9fee656c 100644
--- a/helm/reqmgr2ms-output/templates/deployment.yaml
+++ b/helm/reqmgr2ms-output/templates/deployment.yaml
@@ -122,7 +122,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-output
+          name: {{ include "reqmgr2ms-output.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -141,7 +141,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-output-filebeat-config
+          name: {{ include "reqmgr2ms-output.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-rulecleaner/Chart.yaml b/helm/reqmgr2ms-rulecleaner/Chart.yaml
index 89e4d97b8..5e42faf7e 100644
--- a/helm/reqmgr2ms-rulecleaner/Chart.yaml
+++ b/helm/reqmgr2ms-rulecleaner/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-rulecleaner/templates/configMap.yaml b/helm/reqmgr2ms-rulecleaner/templates/configMap.yaml
index e0ea81d67..690be4ce3 100644
--- a/helm/reqmgr2ms-rulecleaner/templates/configMap.yaml
+++ b/helm/reqmgr2ms-rulecleaner/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-rulecleaner-filebeat-config
+  name: '{{ include "reqmgr2ms-rulecleaner.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-rulecleaner
+  name: {{ include "reqmgr2ms-rulecleaner.fullname" . }}
   labels:
     app: ms-rulecleaner
   namespace: dmwm
diff --git a/helm/reqmgr2ms-rulecleaner/templates/deployment.yaml b/helm/reqmgr2ms-rulecleaner/templates/deployment.yaml
index f24cb7ab5..b156c2ec5 100644
--- a/helm/reqmgr2ms-rulecleaner/templates/deployment.yaml
+++ b/helm/reqmgr2ms-rulecleaner/templates/deployment.yaml
@@ -118,7 +118,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-rulecleaner
+           name: {{ include "reqmgr2ms-rulecleaner.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -137,7 +137,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-rulecleaner-filebeat-config
+          name: {{ include "reqmgr2ms-rulecleaner.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-transferor/Chart.yaml b/helm/reqmgr2ms-transferor/Chart.yaml
index 962a7399b..5f66a500c 100644
--- a/helm/reqmgr2ms-transferor/Chart.yaml
+++ b/helm/reqmgr2ms-transferor/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-transferor/templates/configMap.yaml b/helm/reqmgr2ms-transferor/templates/configMap.yaml
index c5dbe21e0..a07e1ebaf 100644
--- a/helm/reqmgr2ms-transferor/templates/configMap.yaml
+++ b/helm/reqmgr2ms-transferor/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-transferor-filebeat-config
+  name: '{{ include "reqmgr2ms-transferor.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-transferor
+  name: {{ include "reqmgr2ms-rulecleaner.fullname" . }}
   labels:
     app: ms-transferor
   namespace: dmwm
diff --git a/helm/reqmgr2ms-transferor/templates/deployment.yaml b/helm/reqmgr2ms-transferor/templates/deployment.yaml
index 9e4ccda01..35a60a5b3 100644
--- a/helm/reqmgr2ms-transferor/templates/deployment.yaml
+++ b/helm/reqmgr2ms-transferor/templates/deployment.yaml
@@ -118,7 +118,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-transferor
+          name: {{ include "reqmgr2ms-transferor.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -137,7 +137,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-transferor-filebeat-config
+          name: {{ include "reqmgr2ms-transferor.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-unmerged-t1/Chart.yaml b/helm/reqmgr2ms-unmerged-t1/Chart.yaml
index b17cf489a..24cbccfba 100644
--- a/helm/reqmgr2ms-unmerged-t1/Chart.yaml
+++ b/helm/reqmgr2ms-unmerged-t1/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-unmerged-t1/templates/configMap.yaml b/helm/reqmgr2ms-unmerged-t1/templates/configMap.yaml
index cdb04090b..56b9618ea 100644
--- a/helm/reqmgr2ms-unmerged-t1/templates/configMap.yaml
+++ b/helm/reqmgr2ms-unmerged-t1/templates/configMap.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-unmer-t1-filebeat-config
+  name: '{{ include "reqmgr2ms-unmerged-t1.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -28,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-unmer-t1
+  name: {{ include "reqmgr2ms-unmerged-t1.fullname" . }}
   labels:
     app: ms-unmer-t1
   namespace: dmwm
diff --git a/helm/reqmgr2ms-unmerged-t1/templates/deployment.yaml b/helm/reqmgr2ms-unmerged-t1/templates/deployment.yaml
index 003e48fb6..5ce93b88b 100644
--- a/helm/reqmgr2ms-unmerged-t1/templates/deployment.yaml
+++ b/helm/reqmgr2ms-unmerged-t1/templates/deployment.yaml
@@ -120,7 +120,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-unmer-t1
+          name: {{ include "reqmgr2ms-unmerged-t1.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -139,7 +139,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-unmer-t1-filebeat-config
+          name: {{ include "reqmgr2ms-unmerged-t1.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-unmerged-t2t3/Chart.yaml b/helm/reqmgr2ms-unmerged-t2t3/Chart.yaml
index 533b273a8..234872a62 100644
--- a/helm/reqmgr2ms-unmerged-t2t3/Chart.yaml
+++ b/helm/reqmgr2ms-unmerged-t2t3/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-unmerged-t2t3/templates/configMap.yaml b/helm/reqmgr2ms-unmerged-t2t3/templates/configMap.yaml
index a77c10cb4..e3adb7bc4 100644
--- a/helm/reqmgr2ms-unmerged-t2t3/templates/configMap.yaml
+++ b/helm/reqmgr2ms-unmerged-t2t3/templates/configMap.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-unmer-t2t3-filebeat-config
+  name: '{{ include "reqmgr2ms-unmerged-t2t3.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -28,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-unmer-t2t3
+  name: {{ include "reqmgr2ms-unmerged-t2t3.fullname" . }}
   labels:
     app: ms-unmer-t2t3
   namespace: dmwm
diff --git a/helm/reqmgr2ms-unmerged-t2t3/templates/deployment.yaml b/helm/reqmgr2ms-unmerged-t2t3/templates/deployment.yaml
index 697e6fa90..d772f4d3e 100644
--- a/helm/reqmgr2ms-unmerged-t2t3/templates/deployment.yaml
+++ b/helm/reqmgr2ms-unmerged-t2t3/templates/deployment.yaml
@@ -120,7 +120,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-unmer-t2t3
+          name: {{ include "reqmgr2ms-unmerged-t2t3.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -139,7 +139,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-unmer-t2t3-filebeat-config
+          name: {{ include "reqmgr2ms-unmerged-t2t3.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmgr2ms-unmerged-t2t3us/Chart.yaml b/helm/reqmgr2ms-unmerged-t2t3us/Chart.yaml
index aa2ff2d85..215242325 100644
--- a/helm/reqmgr2ms-unmerged-t2t3us/Chart.yaml
+++ b/helm/reqmgr2ms-unmerged-t2t3us/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmgr2ms-unmerged-t2t3us/templates/configMap.yaml b/helm/reqmgr2ms-unmerged-t2t3us/templates/configMap.yaml
index c6a9abfa8..45ad93bf0 100644
--- a/helm/reqmgr2ms-unmerged-t2t3us/templates/configMap.yaml
+++ b/helm/reqmgr2ms-unmerged-t2t3us/templates/configMap.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ms-unmer-t2t3us-filebeat-config
+  name: '{{- include "reqmgr2ms-unmerged-t2t3us.fullname" . | nindent 4 }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -28,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: ms-unmer-t2t3us
+  name: {{ include "reqmgr2ms-unmerged-t2t3us.fullname" . }}
   labels:
     app: ms-unmer-t2t3us
   namespace: dmwm
diff --git a/helm/reqmgr2ms-unmerged-t2t3us/templates/deployment.yaml b/helm/reqmgr2ms-unmerged-t2t3us/templates/deployment.yaml
index 0bac6949e..afdaba372 100644
--- a/helm/reqmgr2ms-unmerged-t2t3us/templates/deployment.yaml
+++ b/helm/reqmgr2ms-unmerged-t2t3us/templates/deployment.yaml
@@ -120,7 +120,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: ms-unmer-t2t3us
+          name: {{ include "reqmgr2ms-unmerged-t2t3us.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -139,7 +139,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: ms-unmer-t2t3us-filebeat-config
+          name: {{ include "reqmgr2ms-unmerged-t2t3us.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmon-tasks/Chart.yaml b/helm/reqmon-tasks/Chart.yaml
index 80c96e1f1..43baef087 100644
--- a/helm/reqmon-tasks/Chart.yaml
+++ b/helm/reqmon-tasks/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmon-tasks/templates/configMap.yaml b/helm/reqmon-tasks/templates/configMap.yaml
index 4f15b007a..1ea936e87 100644
--- a/helm/reqmon-tasks/templates/configMap.yaml
+++ b/helm/reqmon-tasks/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: reqmon-tasks-filebeat-config
+  name: {{ include "reqmon-tasks.fullname" . }}-filebeat-config
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: reqmon-tasks
+  name: {{ include "reqmon-tasks.fullname" . }}
   labels:
     app: reqmon-tasks
   namespace: dmwm
diff --git a/helm/reqmon-tasks/templates/deployment.yaml b/helm/reqmon-tasks/templates/deployment.yaml
index b4c4f2826..69b7fa70d 100644
--- a/helm/reqmon-tasks/templates/deployment.yaml
+++ b/helm/reqmon-tasks/templates/deployment.yaml
@@ -102,7 +102,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: reqmon-tasks
+          name: {{ include "reqmon-tasks.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -121,7 +121,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: reqmon-tasks-filebeat-config
+          name: {{ include "reqmon-tasks.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/reqmon/Chart.yaml b/helm/reqmon/Chart.yaml
index 098d31054..9e1fa871d 100644
--- a/helm/reqmon/Chart.yaml
+++ b/helm/reqmon/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/reqmon/templates/configMap.yaml b/helm/reqmon/templates/configMap.yaml
index 60dfe0c26..72e341f35 100644
--- a/helm/reqmon/templates/configMap.yaml
+++ b/helm/reqmon/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: reqmon-filebeat-config
+  name: '{{ include "reqmon.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: reqmon
+  name: {{ include "reqmon.fullname" . }}
   labels:
     app: reqmon
   namespace: dmwm
diff --git a/helm/reqmon/templates/deployment.yaml b/helm/reqmon/templates/deployment.yaml
index ec675a468..e0f4d0ce2 100644
--- a/helm/reqmon/templates/deployment.yaml
+++ b/helm/reqmon/templates/deployment.yaml
@@ -122,7 +122,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: reqmon
+          name: {{ include "reqmon.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -141,7 +141,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: reqmon-filebeat-config
+          name: {{ include "reqmon.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/t0reqmon-tasks/Chart.yaml b/helm/t0reqmon-tasks/Chart.yaml
index 91612cec3..7a6309cff 100644
--- a/helm/t0reqmon-tasks/Chart.yaml
+++ b/helm/t0reqmon-tasks/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/t0reqmon-tasks/templates/deployment.yaml b/helm/t0reqmon-tasks/templates/deployment.yaml
index cd47ffbfc..bf3e35325 100644
--- a/helm/t0reqmon-tasks/templates/deployment.yaml
+++ b/helm/t0reqmon-tasks/templates/deployment.yaml
@@ -113,7 +113,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: t0reqmon-tasks
+          name: {{ include "t0reqmon-tasks.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -132,7 +132,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: t0reqmon-tasks-filebeat-config
+          name: {{ include "t0reqmon-tasks.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/t0reqmon/Chart.yaml b/helm/t0reqmon/Chart.yaml
index e4a00b31d..7aa390075 100644
--- a/helm/t0reqmon/Chart.yaml
+++ b/helm/t0reqmon/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/t0reqmon/templates/configMap.yaml b/helm/t0reqmon/templates/configMap.yaml
index fc1a503fd..8d2abb585 100644
--- a/helm/t0reqmon/templates/configMap.yaml
+++ b/helm/t0reqmon/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: t0reqmon-filebeat-config
+  name: '{{ include "t0reqmon.fullname" . }}-filebeat-config'
   namespace: tzero
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: t0reqmon
+  name: {{ include "t0reqmon.fullname" . }}
   labels:
     app: t0reqmon
   namespace: tzero
diff --git a/helm/t0reqmon/templates/deployment.yaml b/helm/t0reqmon/templates/deployment.yaml
index 806756110..861370cb4 100644
--- a/helm/t0reqmon/templates/deployment.yaml
+++ b/helm/t0reqmon/templates/deployment.yaml
@@ -124,7 +124,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: t0reqmon
+          name: {{ include "t0reqmon.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -143,7 +143,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: t0reqmon-filebeat-config
+          name: {{ include "t0reqmon.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/t0wmadatasvc/Chart.yaml b/helm/t0wmadatasvc/Chart.yaml
index 65b11723b..dff6b76bb 100644
--- a/helm/t0wmadatasvc/Chart.yaml
+++ b/helm/t0wmadatasvc/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/t0wmadatasvc/templates/configMap.yaml b/helm/t0wmadatasvc/templates/configMap.yaml
index b57d9463e..9f1f1ab04 100644
--- a/helm/t0wmadatasvc/templates/configMap.yaml
+++ b/helm/t0wmadatasvc/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: t0wmadatasvc-filebeat-config
+  name: '{{ include "t0wmadatasvc.fullname" . }}-filebeat-config'
   namespace: tzero
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: t0wmadatasvc
+  name: {{ include "t0wmadatasvc.fullname" . }}
   labels:
     app: t0wmadatasvc
   namespace: tzero
diff --git a/helm/t0wmadatasvc/templates/deployment.yaml b/helm/t0wmadatasvc/templates/deployment.yaml
index c5b096f6a..c1006aeaa 100644
--- a/helm/t0wmadatasvc/templates/deployment.yaml
+++ b/helm/t0wmadatasvc/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: t0wmadatasvc
+          name: {{ include "t0wmadatasvc.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -142,7 +142,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: t0wmadatasvc-filebeat-config
+          name: {{ include "t0wmadatasvc.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/wmarchive/Chart.yaml b/helm/wmarchive/Chart.yaml
index 23ca24756..a083a5d8a 100644
--- a/helm/wmarchive/Chart.yaml
+++ b/helm/wmarchive/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/wmarchive/templates/configMap.yaml b/helm/wmarchive/templates/configMap.yaml
index 3d3171386..c25664fb6 100644
--- a/helm/wmarchive/templates/configMap.yaml
+++ b/helm/wmarchive/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: wmarchive-filebeat-config
+  name: '{{ include "wmarchive.fullname" . }}-filebeat-config'
   namespace: wma
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: wmarchive
+  name: {{ include "wmarchive.fullname" . }}
   labels:
     app: wmarchive
   namespace: wma
diff --git a/helm/wmarchive/templates/deployment.yaml b/helm/wmarchive/templates/deployment.yaml
index 31ceecd41..aa7620d50 100644
--- a/helm/wmarchive/templates/deployment.yaml
+++ b/helm/wmarchive/templates/deployment.yaml
@@ -120,7 +120,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: wmarchive
+          name: {{ include "wmarchive.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -139,7 +139,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: wmarchive-filebeat-config
+          name: {{ include "wmarchive.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}
diff --git a/helm/workqueue/Chart.yaml b/helm/workqueue/Chart.yaml
index 7423d0d3d..d88a66702 100644
--- a/helm/workqueue/Chart.yaml
+++ b/helm/workqueue/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.0
+version: 0.1.1
 
 # 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
diff --git a/helm/workqueue/templates/configMap.yaml b/helm/workqueue/templates/configMap.yaml
index d4468bdc5..817f40834 100644
--- a/helm/workqueue/templates/configMap.yaml
+++ b/helm/workqueue/templates/configMap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: workqueue-filebeat-config
+  name: '{{ include "workqueue.fullname" . }}-filebeat-config'
   namespace: dmwm
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: workqueue
+  name: {{ include "workqueue.fullname" . }}
   labels:
     app: workqueue
   namespace: dmwm
diff --git a/helm/workqueue/templates/deployment.yaml b/helm/workqueue/templates/deployment.yaml
index 7f775056a..6b97a1495 100644
--- a/helm/workqueue/templates/deployment.yaml
+++ b/helm/workqueue/templates/deployment.yaml
@@ -116,7 +116,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: workqueue
+          name: {{ include "workqueue.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -135,7 +135,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: workqueue-filebeat-config
+          name: {{ include "workqueue.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}

From 637c0382149abd2c5dfdf47e4523d57f59bb795a Mon Sep 17 00:00:00 2001
From: Aroosha Pervaiz <apervaiz@lxplus805.cern.ch>
Date: Fri, 3 Sep 2021 10:43:27 +0200
Subject: [PATCH 2/2] indentation changes

---
 helm/dbsmigration/templates/service.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/dbsmigration/templates/service.yaml b/helm/dbsmigration/templates/service.yaml
index dc267a5e0..7c4453046 100644
--- a/helm/dbsmigration/templates/service.yaml
+++ b/helm/dbsmigration/templates/service.yaml
@@ -1,8 +1,8 @@
 kind: Service
 apiVersion: v1
 metadata:
- name: {{ include "dbsmigration.fullname" . }}
- namespace: dbs
+  name: {{ include "dbsmigration.fullname" . }}
+  namespace: dbs
 spec:
   selector:
     app: dbsmigration