From d330f999bd11d2eeba25aef9ac20b32a62427e85 Mon Sep 17 00:00:00 2001
From: "fabio.d.mota" <fabio.d.mota@cgi.com>
Date: Tue, 19 Sep 2023 10:11:30 +0100
Subject: [PATCH] feat(Cleaning): Add new workflow for cleaning service module
 on build

---
 .../templates/_helpers.tpl                    |  7 +-
 .../templates/configMap.yaml                  |  7 --
 .../templates/deployment.yaml                 | 74 +++++++++----------
 3 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/_helpers.tpl b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/_helpers.tpl
index 34a5b3a62..2d51ab042 100644
--- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/_helpers.tpl
+++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/_helpers.tpl
@@ -116,12 +116,7 @@ Create name of application secret
 {{- printf "%s-application" (include "bpdm.fullname" .) }}
 {{- end }}
 
-{/*
-Determine postgres service/host name to connect to
-*/}}
-{{- define "bpdm.postgresDependency" -}}
-        {{- include "includeWithPostgresContext" (list $ "postgresql.primary.fullname") }}
-{{- end }}}
+
 
 
 {{/*
diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/configMap.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/configMap.yaml
index b15a7f3c7..64753c422 100644
--- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/configMap.yaml
+++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/configMap.yaml
@@ -28,13 +28,6 @@ data:
   deployment.yml: |-
     # Place for putting standard deployment configuration
     # which can be overwritten by external.yml
-  #    bpdm:
-  #      datasource:
-  #        host: {{ include "bpdm.postgresDependency" . }}
-  #      pool:
-  #        base-url: {{include "bpdm-bridge.poolServiceName" .}}
-  #      gate:
-  #        base-url: {{include "bpdm-bridge.gateServiceName" .}}
   external.yml: |-
     # External properties for overwriting application config
     {{- if .Values.applicationConfig }}
diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/deployment.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/deployment.yaml
index 2c8d26dd0..5e9cbb4eb 100644
--- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/deployment.yaml
+++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/deployment.yaml
@@ -58,40 +58,40 @@ spec:
               value: {{.Values.springProfiles | join ","  }}
             - name: SPRING_CONFIG_IMPORT
               value: "/etc/conf/deployment.yml,/etc/conf/external.yml,/etc/conf/secrets.yml"
-                ports:
-                  - name: http
-                    containerPort: 8084
-                    protocol: TCP
-                  # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-setting-up-health-checks-with-readiness-and-liveness-probes
-                  livenessProbe:
-                    {{- toYaml .Values.livenessProbe | nindent 12}}
-                  readinessProbe:
-                    {{- toYaml .Values.readinessProbe | nindent 12}}
-                  startupProbe:
-                    {{- toYaml .Values.startupProbe | nindent 12}}
-                  resources:
-                    {{- toYaml .Values.resources | nindent 12}}
-                  volumeMounts:
-                    - mountPath: /etc/conf
-                      name: config
-                      readOnly: true
-                  {{- with .Values.nodeSelector}}
-                  nodeSelector:
-                    {{- toYaml . | nindent 8}}
-                  {{- end}}
-                  {{- with .Values.affinity}}
-                  affinity:
-                    {{- toYaml . | nindent 8}}
-                  {{- end}}
-                  {{- with .Values.tolerations}}
-                  tolerations:
-                    {{- toYaml . | nindent 8}}
-                  {{- end}}
-                  volumes:
-                    - name: config
-                      projected:
-                        sources:
-                          - configMap:
-                              name: {{include "bpdm.fullname" .}}
-                          - secret:
-                              name: {{include "bpdm.fullname" .}}
\ No newline at end of file
+          ports:
+            - name: http
+              containerPort: 8084
+              protocol: TCP
+          # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-setting-up-health-checks-with-readiness-and-liveness-probes
+          livenessProbe:
+            {{- toYaml .Values.livenessProbe | nindent 12}}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12}}
+          startupProbe:
+            {{- toYaml .Values.startupProbe | nindent 12}}
+          resources:
+            {{- toYaml .Values.resources | nindent 12}}
+          volumeMounts:
+            - mountPath: /etc/conf
+              name: config
+              readOnly: true
+      {{- with .Values.nodeSelector}}
+      nodeSelector:
+        {{- toYaml . | nindent 8}}
+      {{- end}}
+      {{- with .Values.affinity}}
+      affinity:
+        {{- toYaml . | nindent 8}}
+      {{- end}}
+      {{- with .Values.tolerations}}
+      tolerations:
+        {{- toYaml . | nindent 8}}
+      {{- end}}
+      volumes:
+        - name: config
+          projected:
+            sources:
+              - configMap:
+                  name: {{include "bpdm.fullname" .}}
+              - secret:
+                  name: {{include "bpdm.fullname" .}}