allow TLS as optional for gateways

defenseunicorns · Nov 20, 2024 · a310342 · a310342
1 parent 871bdad
commit a310342
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/src/istio/chart/templates/gateway.yaml b/src/istio/chart/templates/gateway.yaml
@@ -27,6 +27,7 @@ spec:
         {{- range $server.hosts | default (list "*") }}
         - "{{ . }}.{{ $domain }}"
         {{- end }}
+      {{- if $.Values.tls.enabled }}
       port:
         name: "https-{{ $name }}"
         number: 443
@@ -38,5 +39,11 @@ spec:
         # if supportTLSV1_2 is both defined and true, use TLSV1_2, otherwise use TLSV1_3
         minProtocolVersion: {{ if $.Values.tls.supportTLSV1_2 }}TLSV1_2{{ else }}TLSV1_3{{ end }}
         {{- end }}
+      {{ else }}
+      port:
+        name: "https-{{ $name }}"
+        number: 443
+        protocol: HTTP
+      {{- end }}
     {{ end }}
 {{ end }}
diff --git a/src/istio/chart/templates/tls-cert.yaml b/src/istio/chart/templates/tls-cert.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
 {{- $tls := .Values.tls }}
-{{ if $tls.cert }}
+{{ if $tls.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/src/istio/values/config-admin.yaml b/src/istio/values/config-admin.yaml
@@ -4,6 +4,7 @@
 name: admin
 domain: "admin.###ZARF_VAR_DOMAIN###"
 tls:
+  enabled: true
   servers:
     keycloak:
       mode: OPTIONAL_MUTUAL

diff --git a/src/istio/values/config-passthrough.yaml b/src/istio/values/config-passthrough.yaml
@@ -4,6 +4,7 @@
 name: passthrough
 
 tls:
+  enabled: true
   servers:
     passthrough:
       mode: PASSTHROUGH
diff --git a/src/istio/values/config-tenant.yaml b/src/istio/values/config-tenant.yaml
@@ -3,6 +3,7 @@
 
 name: tenant
 tls:
+  enabled: true
   servers:
     keycloak:
       mode: OPTIONAL_MUTUAL