[sda-svc] simplify BROKER_SSL handling

neicnordic · Dec 22, 2021 · 7ed3091 · 7ed3091
1 parent ecde460
commit 7ed3091
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 35 deletions.
diff --git a/charts/sda-svc/templates/backup-deploy.yaml b/charts/sda-svc/templates/backup-deploy.yaml
@@ -133,9 +133,9 @@ spec:
           value: {{ .Values.global.broker.vhost | quote }}
         - name: BROKER_SERVERNAME
           value: {{ .Values.global.broker.host | quote }}
-  {{- if and .Values.global.broker.ssl  .Values.global.tls.enabled }}
         - name: BROKER_SSL
-          value: "true"
+          value: {{ .Values.global.tls.enabled | quote }}
+    {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
         - name: BROKER_CACERT
@@ -146,9 +146,6 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ include "tlsPath" . }}/{{ .Values.backup.tls.keyFile }}
     {{- end }}
-  {{- else }}
-        - name: BROKER_SSL
-          value: "false"
   {{- end }}
   {{- if .Values.global.tls.enabled }}
     {{- if or (eq "verify-ca" .Values.global.db.sslMode) (eq "verify-full" .Values.global.db.sslMode) }}

diff --git a/charts/sda-svc/templates/finalize-deploy.yaml b/charts/sda-svc/templates/finalize-deploy.yaml
@@ -84,9 +84,9 @@ spec:
           value: {{ .Values.global.broker.vhost | quote }}
         - name: BROKER_SERVERNAME
           value: {{ .Values.global.broker.host | quote }}
-      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_SSL
-          value: "true"
+          value: {{ .Values.global.tls.enabled | quote }}
+        {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
         - name: BROKER_CACERT
@@ -97,9 +97,6 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ include "tlsPath" . }}/{{ .Values.finalize.tls.keyFile }}
         {{- end }}
-      {{- else }}
-        - name: BROKER_SSL
-          value: "false"
       {{- end }}
       {{- if .Values.global.tls.enabled }}
         {{- if or (eq "verify-ca" .Values.global.db.sslMode) (eq "verify-full" .Values.global.db.sslMode) }}

diff --git a/charts/sda-svc/templates/ingest-deploy.yaml b/charts/sda-svc/templates/ingest-deploy.yaml
@@ -91,6 +91,8 @@ spec:
         - name: ARCHIVE_LOCATION
           value: "{{ .Values.global.archive.volumePath }}/"
       {{- end }}
+        - name: BROKER_SSL
+          value: {{ .Values.global.tls.enabled | quote }}
       {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_CACERT
           value: {{ template "tlsPath" . }}/{{ .Values.ingest.tls.caCert }}
@@ -100,13 +102,8 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ template "tlsPath" . }}/{{ .Values.ingest.tls.keyFile }}
         {{- end }}
-        - name: BROKER_SSL
-          value: "true"
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
-      {{- else }}
-        - name: BROKER_SSL
-          value: "false"
       {{- end }}
         - name: BROKER_DURABLE
           value: {{ .Values.global.broker.durable | quote }}

diff --git a/charts/sda-svc/templates/intercept-deploy.yaml b/charts/sda-svc/templates/intercept-deploy.yaml
@@ -68,6 +68,8 @@ spec:
         - name: CONFIGFILE
           value: {{ template "confFile" . }}
       {{- end }}
+        - name: BROKER_SSL
+          value: {{ .Values.global.tls.enabled | quote }}
       {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_CACERT
           value: {{ template "tlsPath" . }}/{{ .Values.intercept.tls.caCert }}
@@ -77,13 +79,8 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ template "tlsPath" . }}/{{ .Values.intercept.tls.keyFile }}
         {{- end }}
-        - name: BROKER_SSL
-          value: {{ .Values.global.broker.ssl | quote}}
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
-      {{- else }}
-        - name: BROKER_SSL
-          value: "false"
       {{- end }}
         - name: BROKER_DURABLE
           value: "true"

diff --git a/charts/sda-svc/templates/mapper-deploy.yaml b/charts/sda-svc/templates/mapper-deploy.yaml
@@ -82,9 +82,9 @@ spec:
           value: {{ .Values.global.broker.vhost | quote }}
         - name: BROKER_SERVERNAME
           value: {{ .Values.global.broker.host | quote }}
-      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_SSL
-          value: "true"
+          value: {{ .Values.global.tls.enabled | quote }}
+      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
         - name: BROKER_CACERT
@@ -95,9 +95,6 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ template "tlsPath" . }}/{{ .Values.mapper.tls.keyFile }}
         {{- end }}
-      {{- else }}
-        - name: BROKER_SSL
-          value: "false"
       {{- end }}
       {{- if .Values.global.tls.enabled }}
       {{- if or (eq "verify-ca" .Values.global.db.sslMode) (eq "verify-full" .Values.global.db.sslMode) }}

diff --git a/charts/sda-svc/templates/s3-inbox-deploy.yaml b/charts/sda-svc/templates/s3-inbox-deploy.yaml
@@ -101,9 +101,9 @@ spec:
           value: {{ .Values.global.broker.exchange | quote }}
         - name: BROKER_ROUTINGKEY
           value: "inbox"
-      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_SSL
-          value: "true"
+          value: {{ .Values.global.tls.enabled | quote }}
+      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
         - name: BROKER_CACERT
@@ -114,9 +114,6 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ include "tlsPath" . }}/{{.Values.s3Inbox.tls.keyFile }}
         {{- end }}
-      {{- else }}
-        - name: BROKER_SSL
-          value: "false"
       {{- end }}
       {{- if .Values.global.tls.enabled }}
         - name: SERVER_CERT

diff --git a/charts/sda-svc/templates/verify-deploy.yaml b/charts/sda-svc/templates/verify-deploy.yaml
@@ -91,9 +91,9 @@ spec:
         - name: ARCHIVE_LOCATION
           value: "{{ .Values.global.archive.volumePath }}"
       {{- end }}
-      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_SSL
-          value: "true"
+          value: {{ .Values.global.tls.enabled | quote }}
+      {{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
         - name: BROKER_VERIFYPEER
           value: {{ .Values.global.broker.verifyPeer | quote }}
         - name: BROKER_CACERT
@@ -104,9 +104,6 @@ spec:
         - name: BROKER_CLIENTKEY
           value: {{ template "tlsPath" . }}/{{.Values.verify.tls.keyFile }}
         {{- end }}
-      {{- else }}
-        - name: BROKER_SSL
-          value: "false"
       {{- end }}
         - name: BROKER_DURABLE
           value: {{ .Values.global.broker.durable | quote }}