diff --git a/templates/coderd.yaml b/templates/coderd.yaml index 76b94dd0..e6710d58 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -230,7 +230,7 @@ data: privateKey: {{ genPrivateKey "ecdsa" | b64enc }} {{- end }} {{- end }} -{{ if eq (include "coder.useServiceNext" .) "true" }} +{{- if and ( eq (include "coder.useServiceNext" .) "true" ) ( eq (merge .Values dict | dig "ingress" "enable" false) false ) }} --- apiVersion: v1 kind: Service diff --git a/templates/ingress.yaml b/templates/ingress.yaml index 66f987a5..c1e42227 100644 --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -335,6 +335,8 @@ spec: protocol: TCP {{- end }} --- +{{- end }} +{{- if (merge .Values dict | dig "ingress" "enable" true) }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: