Fix conditional TLS config

RADAR-base · Apr 5, 2024 · 14b3227 · 14b3227
1 parent 2820c39
commit 14b3227
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/helmfile.d/00-init.yaml b/helmfile.d/00-init.yaml
@@ -45,7 +45,9 @@ releases:
         value: {{ .Values.maintainer_email }}
       - name: graylog.ingress.hosts
         values: [graylog.{{ .Values.server_name }}]
-        {{- if .Values.graylog.ingress.tls }}
+        {{- $values := .Values.graylog }}
+        {{- $useTLS := and (hasKey $values ".ingress") (ne kindIs "invalid" .Values.ingress.tls true) }}
+        {{- if $useTLS }}
       - name: graylog.ingress.tls[0].secretName
         value: radar-base-tls
       - name: graylog.ingress.tls[0].hosts
@@ -81,16 +83,15 @@ releases:
         value: {{ .Values.server_name }}
       - name: kube-prometheus-stack.prometheus.ingress.hosts
         values: ["prometheus.{{ .Values.server_name }}"]
-        {{- if .Values.kube_prometheus_stack.ingress.tls }}
+        {{- $values := .Values.kube_prometheus_stack }}
+        {{- $useTLS := and (hasKey $values ".ingress") (ne kindIs "invalid" .Values.ingress.tls true) }}
+        {{- if $useTLS }}
       - name: kube-prometheus-stack.prometheus.ingress.tls[0].secretName
         value: radar-base-tls-prometheus
       - name: kube-prometheus-stack.prometheus.ingress.tls[0].hosts
         values: ["prometheus.{{ .Values.server_name }}"]
-        {{ end }}
-
       - name: kube-prometheus-stack.alertmanager.ingress.hosts
         values: ["alertmanager.{{ .Values.server_name }}"]
-        {{- if .Values.kube_prometheus_stack.alertmanager.ingress.tls }}
       - name: kube-prometheus-stack.alertmanager.ingress.tls[0].secretName
         value: radar-base-tls-alertmanager
       - name: kube-prometheus-stack.alertmanager.ingress.tls[0].hosts
@@ -99,7 +100,9 @@ releases:
 
       - name: kube-prometheus-stack.grafana.ingress.hosts
         values: ["grafana.{{ .Values.server_name }}"]
-        {{- if .Values.kube_prometheus_stack.grafana.ingress.tls }}
+        {{- $values := .Values.kube_prometheus_stack.grafana }}
+        {{- $useTLS := and (hasKey $values ".ingress") (ne kindIs "invalid" .Values.ingress.tls true) }}
+        {{- if $useTLS }}
       - name: kube-prometheus-stack.grafana.ingress.tls[0].secretName
         value: radar-base-tls-grafana
       - name: kube-prometheus-stack.grafana.ingress.tls[0].hosts

diff --git a/helmfile.d/10-base.yaml b/helmfile.d/10-base.yaml
@@ -57,12 +57,14 @@ releases:
         value: "{{ .Values.server_name }}"
       - name: ingress.hosts[0].paths
         values: ["/schema/?(.*)"]
-        {{- if .Values.cp_schema_registry.ingress.tls }}
+      {{- $values := .Values.cp_schema_registry }}
+      {{- $useTLS := and (hasKey $values ".ingress") (ne kindIs "invalid" .Values.ingress.tls true) }}
+      {{- if $useTLS }}
       - name: ingress.tls[0].secretName
         value: radar-base-tls
       - name: ingress.tls[0].hosts
         values: ["{{ .Values.server_name }}"]
-        {{ end }}
+      {{ end }}
 
   - name: catalog-server
     chart: radar/catalog-server