Skip to content

Commit 75d3213

Browse files
committed
chore: better testing with ct and fix for HK ci
1 parent c8ca9f0 commit 75d3213

5 files changed

Lines changed: 62 additions & 9 deletions

File tree

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
persistence:
2-
storageClass: dummy
32
size: 1Gi

codespace-like/templates/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ spec:
4444
{{- toYaml .Values.livenessProbe | nindent 12 }}
4545
readinessProbe:
4646
{{- toYaml .Values.readinessProbe | nindent 12 }}
47+
startupProbe:
48+
{{- toYaml .Values.startupProbe | nindent 12 }}
4749
resources:
4850
{{- toYaml .Values.resources | nindent 12 }}
4951
volumeMounts:

codespace-like/templates/tests/test-connection.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ spec:
1010
containers:
1111
- name: wget
1212
image: busybox
13-
command: ['wget']
14-
args: ['{{ include "codespace-like.fullname" . }}:{{ .Values.service.port }}']
13+
command:
14+
- 'wget'
15+
- -q
16+
- -O
17+
- '/dev/null'
18+
args:
19+
- http://{{ include "codespace-like.fullname" . }}:{{ .Values.service.port }}/healthz
1520
restartPolicy: Never

codespace-like/values.schema.json

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"type": "string"
6262
},
6363
"repository": {
64-
"default": "webofmars/codespace-like",
64+
"default": "ghcr.io/hoverkraft-tech/docker-base-images/codespace-like",
6565
"title": "repository",
6666
"type": "string"
6767
},
@@ -182,7 +182,7 @@
182182
"additionalProperties": false,
183183
"properties": {
184184
"path": {
185-
"default": "/",
185+
"default": "/healthz",
186186
"title": "path",
187187
"type": "string"
188188
},
@@ -211,6 +211,12 @@
211211
"title": "nameOverride",
212212
"type": "string"
213213
},
214+
"namespace": {
215+
"default": "~",
216+
"description": "FIXME: this is for compatibility with hoverkraft CI\n see https://github.com/hoverkraft-tech/ci-github-container/issues/815",
217+
"title": "namespace",
218+
"type": "null"
219+
},
214220
"nodeSelector": {
215221
"additionalProperties": false,
216222
"required": [],
@@ -269,7 +275,7 @@
269275
"additionalProperties": false,
270276
"properties": {
271277
"path": {
272-
"default": "/",
278+
"default": "/healthz",
273279
"title": "path",
274280
"type": "string"
275281
},
@@ -369,6 +375,37 @@
369375
"title": "serviceAccount",
370376
"type": "object"
371377
},
378+
"startupProbe": {
379+
"additionalProperties": false,
380+
"properties": {
381+
"httpGet": {
382+
"additionalProperties": false,
383+
"properties": {
384+
"path": {
385+
"default": "/healthz",
386+
"title": "path",
387+
"type": "string"
388+
},
389+
"port": {
390+
"default": "http",
391+
"title": "port",
392+
"type": "string"
393+
}
394+
},
395+
"required": [
396+
"path",
397+
"port"
398+
],
399+
"title": "httpGet",
400+
"type": "object"
401+
}
402+
},
403+
"required": [
404+
"httpGet"
405+
],
406+
"title": "startupProbe",
407+
"type": "object"
408+
},
372409
"tolerations": {
373410
"items": {
374411
"required": []
@@ -394,6 +431,7 @@
394431
}
395432
},
396433
"required": [
434+
"namespace",
397435
"replicaCount",
398436
"image",
399437
"imagePullSecrets",
@@ -409,6 +447,7 @@
409447
"resources",
410448
"livenessProbe",
411449
"readinessProbe",
450+
"startupProbe",
412451
"autoscaling",
413452
"persistence",
414453
"volumes",

codespace-like/values.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
# This is a YAML-formatted file.
44
# Declare variables to be passed into your templates.
55

6+
# FIXME: this is for compatibility with hoverkraft CI
7+
# see https://github.com/hoverkraft-tech/ci-github-container/issues/815
8+
namespace: ~
9+
610
replicaCount: 1
711

812
image:
9-
repository: webofmars/codespace-like
13+
repository: ghcr.io/hoverkraft-tech/docker-base-images/codespace-like
1014
pullPolicy: IfNotPresent
1115
# Overrides the image tag whose default is the chart appVersion.
1216
tag: ""
@@ -76,11 +80,15 @@ resources: {}
7680

7781
livenessProbe:
7882
httpGet:
79-
path: /
83+
path: /healthz
8084
port: http
8185
readinessProbe:
8286
httpGet:
83-
path: /
87+
path: /healthz
88+
port: http
89+
startupProbe:
90+
httpGet:
91+
path: /healthz
8492
port: http
8593

8694
autoscaling:

0 commit comments

Comments
 (0)