Skip to content

Commit e9c183d

Browse files
ericpaulsendeansheather
ericpaulsen
and
deansheather
authored
feat: add envFrom value to Helm chart (coder#9587)
* feat: add envFrom value to Helm chart * add envUseClusterAccessURL * add tests --------- Co-authored-by: Dean Sheather <dean@deansheather.com>
1 parent ceeb998 commit e9c183d

11 files changed

+865
-2
lines changed

‎helm/coder/templates/_coder.tpl

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ args:
3030
{{- end }}
3131
- server
3232
{{- end }}
33+
{{- if .Values.coder.envFrom }}
34+
envFrom:
35+
{{- with .Values.coder.envFrom }}
36+
{{ toYaml . }}
37+
{{- end }}
38+
{{- end }}
3339
env:
3440
- name: CODER_HTTP_ADDRESS
3541
value: "0.0.0.0:8080"
@@ -50,7 +56,7 @@ env:
5056
{{- $hasAccessURL = true }}
5157
{{- end }}
5258
{{- end }}
53-
{{- if not $hasAccessURL }}
59+
{{- if and (not $hasAccessURL) .Values.coder.envUseClusterAccessURL }}
5460
- name: CODER_ACCESS_URL
5561
value: {{ include "coder.defaultAccessURL" . | quote }}
5662
{{- end }}

‎helm/coder/tests/chart_test.go

+16
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,22 @@ var testCases = []testCase{
6060
name: "provisionerd_psk",
6161
expectedError: "",
6262
},
63+
{
64+
name: "auto_access_url_1",
65+
expectedError: "",
66+
},
67+
{
68+
name: "auto_access_url_2",
69+
expectedError: "",
70+
},
71+
{
72+
name: "auto_access_url_3",
73+
expectedError: "",
74+
},
75+
{
76+
name: "env_from",
77+
expectedError: "",
78+
},
6379
}
6480

6581
type testCase struct {

‎helm/coder/tests/testdata/auto_access_url_1.golden

+192
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
---
2+
# Source: coder/templates/coder.yaml
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
annotations: {}
7+
labels:
8+
app.kubernetes.io/instance: release-name
9+
app.kubernetes.io/managed-by: Helm
10+
app.kubernetes.io/name: coder
11+
app.kubernetes.io/part-of: coder
12+
app.kubernetes.io/version: 0.1.0
13+
helm.sh/chart: coder-0.1.0
14+
name: coder
15+
---
16+
# Source: coder/templates/rbac.yaml
17+
apiVersion: rbac.authorization.k8s.io/v1
18+
kind: Role
19+
metadata:
20+
name: coder-workspace-perms
21+
rules:
22+
- apiGroups: [""]
23+
resources: ["pods"]
24+
verbs:
25+
- create
26+
- delete
27+
- deletecollection
28+
- get
29+
- list
30+
- patch
31+
- update
32+
- watch
33+
- apiGroups: [""]
34+
resources: ["persistentvolumeclaims"]
35+
verbs:
36+
- create
37+
- delete
38+
- deletecollection
39+
- get
40+
- list
41+
- patch
42+
- update
43+
- watch
44+
- apiGroups:
45+
- apps
46+
resources:
47+
- deployments
48+
verbs:
49+
- create
50+
- delete
51+
- deletecollection
52+
- get
53+
- list
54+
- patch
55+
- update
56+
- watch
57+
---
58+
# Source: coder/templates/rbac.yaml
59+
apiVersion: rbac.authorization.k8s.io/v1
60+
kind: RoleBinding
61+
metadata:
62+
name: "coder"
63+
subjects:
64+
- kind: ServiceAccount
65+
name: "coder"
66+
roleRef:
67+
apiGroup: rbac.authorization.k8s.io
68+
kind: Role
69+
name: coder-workspace-perms
70+
---
71+
# Source: coder/templates/service.yaml
72+
apiVersion: v1
73+
kind: Service
74+
metadata:
75+
name: coder
76+
labels:
77+
helm.sh/chart: coder-0.1.0
78+
app.kubernetes.io/name: coder
79+
app.kubernetes.io/instance: release-name
80+
app.kubernetes.io/part-of: coder
81+
app.kubernetes.io/version: "0.1.0"
82+
app.kubernetes.io/managed-by: Helm
83+
annotations:
84+
{}
85+
spec:
86+
type: LoadBalancer
87+
sessionAffinity: ClientIP
88+
ports:
89+
- name: "http"
90+
port: 80
91+
targetPort: "http"
92+
protocol: TCP
93+
94+
externalTrafficPolicy: "Cluster"
95+
selector:
96+
app.kubernetes.io/name: coder
97+
app.kubernetes.io/instance: release-name
98+
---
99+
# Source: coder/templates/coder.yaml
100+
apiVersion: apps/v1
101+
kind: Deployment
102+
metadata:
103+
annotations: {}
104+
labels:
105+
app.kubernetes.io/instance: release-name
106+
app.kubernetes.io/managed-by: Helm
107+
app.kubernetes.io/name: coder
108+
app.kubernetes.io/part-of: coder
109+
app.kubernetes.io/version: 0.1.0
110+
helm.sh/chart: coder-0.1.0
111+
name: coder
112+
spec:
113+
replicas: 1
114+
selector:
115+
matchLabels:
116+
app.kubernetes.io/instance: release-name
117+
app.kubernetes.io/name: coder
118+
template:
119+
metadata:
120+
annotations: {}
121+
labels:
122+
app.kubernetes.io/instance: release-name
123+
app.kubernetes.io/managed-by: Helm
124+
app.kubernetes.io/name: coder
125+
app.kubernetes.io/part-of: coder
126+
app.kubernetes.io/version: 0.1.0
127+
helm.sh/chart: coder-0.1.0
128+
spec:
129+
affinity:
130+
podAntiAffinity:
131+
preferredDuringSchedulingIgnoredDuringExecution:
132+
- podAffinityTerm:
133+
labelSelector:
134+
matchExpressions:
135+
- key: app.kubernetes.io/instance
136+
operator: In
137+
values:
138+
- coder
139+
topologyKey: kubernetes.io/hostname
140+
weight: 1
141+
containers:
142+
- args:
143+
- server
144+
command:
145+
- /opt/coder
146+
env:
147+
- name: CODER_HTTP_ADDRESS
148+
value: 0.0.0.0:8080
149+
- name: CODER_PROMETHEUS_ADDRESS
150+
value: 0.0.0.0:2112
151+
- name: KUBE_POD_IP
152+
valueFrom:
153+
fieldRef:
154+
fieldPath: status.podIP
155+
- name: CODER_DERP_SERVER_RELAY_URL
156+
value: http://$(KUBE_POD_IP):8080
157+
- name: SOME_ENV
158+
value: some value
159+
- name: CODER_ACCESS_URL
160+
value: https://dev.coder.com
161+
image: ghcr.io/coder/coder:latest
162+
imagePullPolicy: IfNotPresent
163+
lifecycle: {}
164+
livenessProbe:
165+
httpGet:
166+
path: /healthz
167+
port: http
168+
scheme: HTTP
169+
name: coder
170+
ports:
171+
- containerPort: 8080
172+
name: http
173+
protocol: TCP
174+
readinessProbe:
175+
httpGet:
176+
path: /healthz
177+
port: http
178+
scheme: HTTP
179+
resources: {}
180+
securityContext:
181+
allowPrivilegeEscalation: false
182+
readOnlyRootFilesystem: null
183+
runAsGroup: 1000
184+
runAsNonRoot: true
185+
runAsUser: 1000
186+
seccompProfile:
187+
type: RuntimeDefault
188+
volumeMounts: []
189+
restartPolicy: Always
190+
serviceAccountName: coder
191+
terminationGracePeriodSeconds: 60
192+
volumes: []

‎helm/coder/tests/testdata/auto_access_url_1.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
coder:
2+
image:
3+
tag: latest
4+
5+
env:
6+
- name: "SOME_ENV"
7+
value: "some value"
8+
- name: "CODER_ACCESS_URL"
9+
value: "https://dev.coder.com"
10+
11+
envUseClusterAccessURL: true # default

0 commit comments

Comments
 (0)