remove envproxy references from chart (#142)

* remove envproxy references from chart

* Fix cluster address

Author: f0ssel

templates/NOTES.txt

@@ -41,11 +41,6 @@ Deprecated: The "dashboard" Kubernetes Service has been merged with "coderd".
 {{- end }}
 {{ end }}
 
-{{- if gt (len (keys (.Values.envproxy | dict))) 1 }}
-Deprecated: The "envproxy" Kubernetes Service has been merged with "coderd".
-  ✗ All "envproxy.*" values can be safely removed.
-  ✗ Workspaces will need to be rebuilt after this change.
-{{ end }}
 {{- else }}
 {{- if eq (include "coder.hasNginxIngress" .) "true" }}
 Deprecated: The "nginx" ingress controller will be removed in a future release.

templates/_common.tpl

@@ -117,31 +117,11 @@ tolerations:
 {{- end }}
 {{- end }}
 {{- end }}
-{{/*
-  coder.envproxy.accessURL is a URL for accessing the envproxy.
-*/}}
-{{- define "coder.envproxy.accessURL" }}
-{{- if ne (merge .Values dict | dig "envproxy" "accessURL" "") "" }}
-{{- .Values.envproxy.accessURL -}}
-{{- else if ne (merge .Values dict | dig "ingress" "host" "") "" }}
-    {{- if .Values.ingress.tls.enable -}}
-    https://
-    {{- else -}}
-    http://
-    {{- end -}}
-    {{- .Values.ingress.host }}
-{{- else }}
-{{- end }}
-{{- end }}
 {{/*
   coder.cluster.accessURL is a URL for accessing the Kubernetes cluster.
 */}}
-{{- define "coder.cluster.accessURL" }}
-{{- if ne (merge .Values dict | dig "envproxy" "clusterAddress" "") "" }}
-{{- .Values.envproxy.clusterAddress -}}
-{{- else -}}
-    https://kubernetes.default{{ include "movedValue" (dict "Values" .Values "Key" "services.clusterDomainSuffix") }}:443
-{{- end }}
+{{- define "coder.cluster.accessURL" -}}
+https://kubernetes.default{{ include "movedValue" (dict "Values" .Values "Key" "services.clusterDomainSuffix") }}:443
 {{- end }}
 
 {{/*

templates/_ingress.tpl

@@ -25,8 +25,6 @@
 {{- define "coder.hasNginxIngress" }}
 {{- if (lookup "v1" "Service" .Release.Namespace "ingress-nginx") -}}
 true
-{{- else if (lookup "v1" "Service" .Release.Namespace "envproxy") -}}
-true
 {{- else -}}
 false
 {{- end }}

templates/coderd.yaml

@@ -135,15 +135,6 @@ spec:
             - name: TRUST_PROXY_IP
               value: {{ .Values.coderd.trustProxyIP | quote }}
             {{- end }}
-            {{- if not .Values.coderd.satellite.enable }}
-            {{- if eq (include "coder.useServiceNext" .) "false" }}
-            - name: BUILT_IN_ENVPROXY_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: built-in-envproxy-token
-                  key: token
-            {{- end }}
-            {{- end }}
             {{- if .Values.coderd.satellite.enable }}
             - name: CODER_SATELLITE_PRIVATE_KEY
               valueFrom:

templates/envproxy.yaml

@@ -33,8 +33,6 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
-data:
-  22: "{{ .Release.Namespace }}/envproxy:2222"
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -379,13 +377,6 @@ spec:
     http:
       paths:
     {{- if (merge .Values dict | dig "ingress" "useDefault" true) }}
-      - path: /proxy/
-        pathType: Prefix
-        backend:
-          service:
-            name: envproxy
-            port:
-              number: 8080
       - path: /api
         pathType: Prefix
         backend:
@@ -414,18 +405,6 @@ spec:
             port:
               number: 8080
           {{- end }}
-    {{- if ne (include "movedValue" (dict "Values" .Values "Key" "coderd.devurlsHost")) "" }}
-  - host: {{ include "movedValue" (dict "Values" .Values "Key" "coderd.devurlsHost") }}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: envproxy
-            port:
-              number: 8080
-    {{- end }}
     {{- end }}
   {{- end }}
 {{- end }}

templates/ingress.yaml

@@ -30,9 +30,6 @@ subjects:
   - kind: ServiceAccount
     name: {{ include "coder.serviceName" }}
     namespace: {{ .Release.Namespace | quote }}
-  - kind: ServiceAccount
-    name: envproxy
-    namespace: {{ .Release.Namespace | quote }}
 roleRef:
   kind: Role
   name: coder-restricted

templates/psp.yaml

@@ -8,7 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }} 
   name: environments
 ---
-# The service account that the envproxy passes to cemanager on startup.
+# The service account for the built in workspace provider on application installation.
 apiVersion: v1
 kind: ServiceAccount
 metadata: