fix(AAE-1223): Removed Postgres init container (#295)

* fix: Removed Postgres init container

* fix: Externalized RabbitMq name and port via tpl

* fix(chart): Corrected extraEnv formatting

* fix(chart):  unexpected "(" in operand

* fix(chart): remove whitespace in tpl

Author: igdianov

charts/activiti-cloud-notifications-graphql/templates/_helpers.tpl

@@ -28,11 +28,15 @@ Create a default service name.
 {{- end -}}
 
 
-{{- define "notifications.rabbitmq-name" -}}
-{{- if .Values.global.rabbitmq.host.value }}
-{{ .Values.global.rabbitmq.host.value }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name (.Values.rabbitmq.name | default "rabbitmq") -}}
-{{- end }}
+{{- define "activiti.notifications.rabbitmq-name" -}}
+{{- if .Values.global.rabbitmq.host.value -}}
+{{ tpl .Values.global.rabbitmq.host.value . }}
+{{- else -}}
+{{ tpl .Values.rabbitmq.name . }}
+{{- end -}}
+{{- end -}}
+
+{{- define "activiti.notifications.rabbitmq-port" -}}
+{{ tpl (toString .Values.rabbitmq.port) . }}
 {{- end -}}
 

charts/activiti-cloud-notifications-graphql/templates/deployment.yaml

@@ -4,28 +4,20 @@ spec:
   template:
     spec:
       initContainers:
-      {{- if .Values.postgres.enabled }}
-        - name: wait-for-postgresql
-          image: {{ .Values.init.container.image | quote }}
-          imagePullPolicy: {{ .Values.init.container.imagePullPolicy }}
-          command:
-            - sh
-            - -c
-            - |
-              until printf "." && nc -z -w 2 {{ .Release.Name }}-{{ .Values.postgres.name }} {{ .Values.postgres.port }}; do
-                  sleep 2;
-              done;
-              echo 'PostgreSQL OK ✓'
-      {{- end }}
       {{- if .Values.rabbitmq.enabled }}
         - name: wait-for-rabbitmq
           image: {{ .Values.init.container.image | quote }}
           imagePullPolicy: {{ .Values.init.container.imagePullPolicy }}
+          env: 
+            - name: RABBITMQ_HOST
+              value: {{ include "activiti.notifications.rabbitmq-name" . | quote }}
+            - name: RABBITMQ_PORT
+              value: {{ include "activiti.notifications.rabbitmq-port" . | quote }}
           command:
             - sh
             - -c
             - |
-              until printf "." && nc -z -w 2 {{ include "notifications.rabbitmq-name" . }} {{ .Values.rabbitmq.port | default 5672 }}; do
+              until printf "." && nc -z -w 2 $RABBITMQ_HOST $RABBITMQ_PORT; do
                   sleep 2;
               done;
               echo 'RabbitMq OK ✓'

charts/activiti-cloud-notifications-graphql/values.yaml

@@ -42,7 +42,7 @@ postgres:
 
 rabbitmq:
   enabled: true
-  name: "rabbitmq" 
+  name: "{{ .Release.Name }}-rabbitmq" 
   port: 5672
 
 javaOpts:
@@ -55,7 +55,7 @@ extraEnv: |
   {{- if include "common.ingress-path" . }}
   - name: SERVER_SERVLET_CONTEXTPATH
     value: {{ include "common.ingress-path" . | quote }}
-  {{- end }} 
+  {{- end }}
   # - name: ACT_KEYCLOAK_URL
   #   valueFrom:
   #     configMapKeyRef: