From ef6d1f70ad6293334024d660b1683cf80f43ad31 Mon Sep 17 00:00:00 2001
From: Jonathan Yu <jonathan@coder.com>
Date: Tue, 24 Aug 2021 00:02:42 +0000
Subject: [PATCH] Revert "Load balancer TLS termination (#144)"

This reverts commit be5b7f6e8872517d24eda0fffdc1373a7e3bc78e.
---
 templates/coderd.yaml | 16 +++++++---------
 values.yaml           |  5 -----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/templates/coderd.yaml b/templates/coderd.yaml
index e4442f4b..ff5623a4 100644
--- a/templates/coderd.yaml
+++ b/templates/coderd.yaml
@@ -247,22 +247,20 @@ spec:
   selector:
     coder.deployment: {{ include "coder.serviceName" . }}
   ports:
-    - name: tcp-{{ include "coder.serviceName" . }}-https
-      port: 443
-      {{- if .Values.coderd.httpsToHttp }}¬
-      targetPort: 8443
-      protocol: TCP
-      {{ if .Values.coderd.serviceNodePorts.https }}
-      nodePort: {{ .Values.coderd.serviceNodePorts.https }}
-      {{ end }}
     - name: tcp-{{ include "coder.serviceName" . }}
       port: 80
-      {{- end }}
       targetPort: 8080
       protocol: TCP
       {{ if .Values.coderd.serviceNodePorts.http }}
       nodePort: {{  .Values.coderd.serviceNodePorts.http  }}
       {{ end }}
+    - name: tcp-{{ include "coder.serviceName" . }}-https
+      port: 443
+      targetPort: 8443
+      protocol: TCP
+      {{ if .Values.coderd.serviceNodePorts.https }}
+      nodePort: {{ .Values.coderd.serviceNodePorts.https }}
+      {{ end }}
 {{- else }}
 ---
 apiVersion: v1
diff --git a/values.yaml b/values.yaml
index 48b93eff..36d5e31e 100644
--- a/values.yaml
+++ b/values.yaml
@@ -36,11 +36,6 @@ coderd:
   # coderd.serviceAnnotations -- Extra annotations to apply to the coderd service.
   serviceAnnotations: {}
 
-  # coderd.httpsToHttp -- eliminates the external http port and routes traffic from
-  # the external https port to the internal http port. Useful for when the load balancer
-  # performs TLS termination (like Amazon's ACM)
-  httpsToHttp: false
-
   # coderd.trustProxyIP -- Whether Coder should trust X-Real-IP and/or
   # X-Forwarded-For headers from your reverse proxy. This should only be turned
   # on if you're using a reverse proxy that sets both of these headers. This is