From 2e566731a65e8e44eca45a5feebd0062e91763ba Mon Sep 17 00:00:00 2001 From: Mike Terhar Date: Thu, 29 Jul 2021 14:54:36 -0400 Subject: [PATCH 1/5] Separate ingress.usedefault from .enable This change allows ingress.enabled to create the ingress object for use with another ingress controller. used in conjunction with coderd.serviceSpec.type=ClusterIP, coderd.devurlsHost, and ingress.host to get the full ingress experience --- templates/ingress.yaml | 2 ++ 1 file changed, 2 insertions(+) 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: From 137c1c9fbf987f27840ed31dbc396e6dc67aa6f1 Mon Sep 17 00:00:00 2001 From: Mike Terhar Date: Thu, 29 Jul 2021 15:52:33 -0400 Subject: [PATCH 2/5] Make coderd service simpler if ingress.enable --- templates/coderd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/coderd.yaml b/templates/coderd.yaml index 76b94dd0..52b11db2 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) ) }} --- apiVersion: v1 kind: Service From f4dd6579046435ffc2fec988d22e61c31a356a8f Mon Sep 17 00:00:00 2001 From: Mike Terhar Date: Thu, 29 Jul 2021 15:57:20 -0400 Subject: [PATCH 3/5] use value instead of eq for coderd.service --- templates/coderd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/coderd.yaml b/templates/coderd.yaml index 52b11db2..58dbfcba 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -230,7 +230,7 @@ data: privateKey: {{ genPrivateKey "ecdsa" | b64enc }} {{- end }} {{- end }} -{{- if and ( eq (include "coder.useServiceNext" .) "true" ) ) ( eq (merge .Values dict | dig "ingress" "enable" false) ) }} +{{- if and ( eq (include "coder.useServiceNext" .) "true" ) ) (merge .Values dict | dig "ingress" "enable" false) }} --- apiVersion: v1 kind: Service From b8693b5271e4c4ef2853bd6a9f7ab9be33a95765 Mon Sep 17 00:00:00 2001 From: Mike Terhar Date: Thu, 29 Jul 2021 15:59:01 -0400 Subject: [PATCH 4/5] Got rid of extra close parens --- templates/coderd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/coderd.yaml b/templates/coderd.yaml index 58dbfcba..a3c7578d 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -230,7 +230,7 @@ data: privateKey: {{ genPrivateKey "ecdsa" | b64enc }} {{- end }} {{- end }} -{{- if and ( eq (include "coder.useServiceNext" .) "true" ) ) (merge .Values dict | dig "ingress" "enable" false) }} +{{- if and ( eq (include "coder.useServiceNext" .) "true" ) (merge .Values dict | dig "ingress" "enable" false) }} --- apiVersion: v1 kind: Service From 7ffbdc91bf119f9b730120072453fe59c03f60c8 Mon Sep 17 00:00:00 2001 From: Mike Terhar Date: Thu, 29 Jul 2021 16:35:31 -0400 Subject: [PATCH 5/5] skip fancy LB for ingress.enable true --- templates/coderd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/coderd.yaml b/templates/coderd.yaml index a3c7578d..e6710d58 100644 --- a/templates/coderd.yaml +++ b/templates/coderd.yaml @@ -230,7 +230,7 @@ data: privateKey: {{ genPrivateKey "ecdsa" | b64enc }} {{- end }} {{- end }} -{{- if and ( eq (include "coder.useServiceNext" .) "true" ) (merge .Values dict | dig "ingress" "enable" false) }} +{{- if and ( eq (include "coder.useServiceNext" .) "true" ) ( eq (merge .Values dict | dig "ingress" "enable" false) false ) }} --- apiVersion: v1 kind: Service