Skip to content

Commit fd08cee

Browse files
dannykoppingdannykopping
committed
Merge branch 'main' of github.com:coder/coder into dk/prebuilds
2 parents 0898097 + cbc699b commit fd08cee

File tree

85 files changed

+1912
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1912
-77
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ replace github.com/tcnksm/go-httpstat => github.com/coder/go-httpstat v0.0.0-202
3636

3737
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
3838
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
39-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20250410041146-e62bfe0e9301
39+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20250422090654-5090e715905e
4040

4141
// This is replaced to include
4242
// 1. a fix for a data race: c.f. https://github.com/tailscale/wireguard-go/pull/25

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -919,8 +919,8 @@ github.com/coder/serpent v0.10.0 h1:ofVk9FJXSek+SmL3yVE3GoArP83M+1tX+H7S4t8BSuM=
919919
github.com/coder/serpent v0.10.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
920920
github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=
921921
github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
922-
github.com/coder/tailscale v1.1.1-0.20250410041146-e62bfe0e9301 h1:RMo8EZAMYnM9+HtCBDvXbcgCf0t8Roo1ZLiy8fVuooQ=
923-
github.com/coder/tailscale v1.1.1-0.20250410041146-e62bfe0e9301/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
922+
github.com/coder/tailscale v1.1.1-0.20250422090654-5090e715905e h1:nope/SZfoLB9MCOB9wdCE6gW5+8l3PhFrDC5IWPL8bk=
923+
github.com/coder/tailscale v1.1.1-0.20250422090654-5090e715905e/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
924924
github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
925925
github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
926926
github.com/coder/terraform-provider-coder/v2 v2.4.0-pre1.0.20250415114329-82d12ec030e9 h1:NjMJLgT0UUTOzTAOsJipEVRv5s81a8O7LWjswUgfCGo=

‎helm/coder/tests/chart_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@ var testCases = []testCase{
117117
name: "securitycontext",
118118
expectedError: "",
119119
},
120+
{
121+
name: "custom_resources",
122+
expectedError: "",
123+
},
124+
{
125+
name: "partial_resources",
126+
expectedError: "",
127+
},
120128
}
121129

122130
type testCase struct {

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,13 @@ spec:
181181
path: /healthz
182182
port: http
183183
scheme: HTTP
184-
resources: {}
184+
resources:
185+
limits:
186+
cpu: 2000m
187+
memory: 4096Mi
188+
requests:
189+
cpu: 2000m
190+
memory: 4096Mi
185191
securityContext:
186192
allowPrivilegeEscalation: false
187193
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,13 @@ spec:
181181
path: /healthz
182182
port: http
183183
scheme: HTTP
184-
resources: {}
184+
resources:
185+
limits:
186+
cpu: 2000m
187+
memory: 4096Mi
188+
requests:
189+
cpu: 2000m
190+
memory: 4096Mi
185191
securityContext:
186192
allowPrivilegeEscalation: false
187193
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,13 @@ spec:
181181
path: /healthz
182182
port: http
183183
scheme: HTTP
184-
resources: {}
184+
resources:
185+
limits:
186+
cpu: 2000m
187+
memory: 4096Mi
188+
requests:
189+
cpu: 2000m
190+
memory: 4096Mi
185191
securityContext:
186192
allowPrivilegeEscalation: false
187193
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,13 @@ spec:
181181
path: /healthz
182182
port: http
183183
scheme: HTTP
184-
resources: {}
184+
resources:
185+
limits:
186+
cpu: 2000m
187+
memory: 4096Mi
188+
requests:
189+
cpu: 2000m
190+
memory: 4096Mi
185191
securityContext:
186192
allowPrivilegeEscalation: false
187193
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,13 @@ spec:
179179
path: /healthz
180180
port: http
181181
scheme: HTTP
182-
resources: {}
182+
resources:
183+
limits:
184+
cpu: 2000m
185+
memory: 4096Mi
186+
requests:
187+
cpu: 2000m
188+
memory: 4096Mi
183189
securityContext:
184190
allowPrivilegeEscalation: false
185191
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,13 @@ spec:
179179
path: /healthz
180180
port: http
181181
scheme: HTTP
182-
resources: {}
182+
resources:
183+
limits:
184+
cpu: 2000m
185+
memory: 4096Mi
186+
requests:
187+
cpu: 2000m
188+
memory: 4096Mi
183189
securityContext:
184190
allowPrivilegeEscalation: false
185191
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,13 @@ spec:
179179
path: /healthz
180180
port: http
181181
scheme: HTTP
182-
resources: {}
182+
resources:
183+
limits:
184+
cpu: 2000m
185+
memory: 4096Mi
186+
requests:
187+
cpu: 2000m
188+
memory: 4096Mi
183189
securityContext:
184190
allowPrivilegeEscalation: false
185191
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,13 @@ spec:
180180
path: /healthz
181181
port: http
182182
scheme: HTTP
183-
resources: {}
183+
resources:
184+
limits:
185+
cpu: 2000m
186+
memory: 4096Mi
187+
requests:
188+
cpu: 2000m
189+
memory: 4096Mi
184190
securityContext:
185191
allowPrivilegeEscalation: false
186192
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,13 @@ spec:
180180
path: /healthz
181181
port: http
182182
scheme: HTTP
183-
resources: {}
183+
resources:
184+
limits:
185+
cpu: 2000m
186+
memory: 4096Mi
187+
requests:
188+
cpu: 2000m
189+
memory: 4096Mi
184190
securityContext:
185191
allowPrivilegeEscalation: false
186192
readOnlyRootFilesystem: null

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,13 @@ spec:
179179
path: /healthz
180180
port: http
181181
scheme: HTTP
182-
resources: {}
182+
resources:
183+
limits:
184+
cpu: 2000m
185+
memory: 4096Mi
186+
requests:
187+
cpu: 2000m
188+
memory: 4096Mi
183189
securityContext:
184190
allowPrivilegeEscalation: false
185191
readOnlyRootFilesystem: null

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

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

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

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
coder:
2+
image:
3+
tag: latest
4+
resources:
5+
limits:
6+
cpu: 4000m
7+
memory: 8192Mi
8+
requests:
9+
cpu: 1000m
10+
memory: 2048Mi

0 commit comments

Comments
 (0)