From a1c77e36be7bd98b935c1cc7f5df78e3dfe9faef Mon Sep 17 00:00:00 2001 From: Ethan <39577870+ethanndickson@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:39:18 +1000 Subject: [PATCH 1/2] fix: handle `sql/driver.Valuer` types properly in `json` logs (#18760) This bumps `slog` to incorporate https://github.com/coder/slog/pull/219. Before: ```json { "fields": { "Code": "{Int32:0 Valid:false}", "ValidCode": "{Int32:12 Valid:true}" } } ``` After: ```json { "fields": { "Code": null, "ValidCode": 12 } } ``` --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 704ba33b14e55..c1d9b3a1c54d1 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ replace github.com/spf13/afero => github.com/aslilac/afero v0.0.0-20250403163713 replace github.com/coder/terraform-provider-coder/v2 => github.com/coder/terraform-provider-coder/v2 v2.7.1-0.20250623193313-e890833351e2 require ( - cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb + cdr.dev/slog v1.6.2-0.20250703074222-9df5e0a6c145 cloud.google.com/go/compute/metadata v0.7.0 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/adrg/xdg v0.5.0 @@ -127,7 +127,7 @@ require ( github.com/go-chi/cors v1.2.1 github.com/go-chi/httprate v0.15.0 github.com/go-jose/go-jose/v4 v4.1.0 - github.com/go-logr/logr v1.4.2 + github.com/go-logr/logr v1.4.3 github.com/go-playground/validator/v10 v10.26.0 github.com/gofrs/flock v0.12.0 github.com/gohugoio/hugo v0.147.0 @@ -189,11 +189,11 @@ require ( github.com/zclconf/go-cty-yaml v1.1.0 go.mozilla.org/pkcs7 v0.9.0 go.nhat.io/otelsql v0.15.0 - go.opentelemetry.io/otel v1.35.0 + go.opentelemetry.io/otel v1.37.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 go.opentelemetry.io/otel/sdk v1.35.0 - go.opentelemetry.io/otel/trace v1.35.0 + go.opentelemetry.io/otel/trace v1.37.0 go.uber.org/atomic v1.11.0 go.uber.org/goleak v1.3.1-0.20240429205332-517bace7cc29 go.uber.org/mock v0.5.0 @@ -448,7 +448,7 @@ require ( go.opentelemetry.io/collector/semconv v0.123.0 // indirect go.opentelemetry.io/contrib v1.19.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel/metric v1.35.0 // indirect + go.opentelemetry.io/otel/metric v1.37.0 // indirect go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect diff --git a/go.sum b/go.sum index ccab4d93c703d..e1957c3d16b48 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb h1:4MKA8lBQLnCqj2myJCb5Lzoa65y0tABO4gHrxuMdsCQ= -cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ= +cdr.dev/slog v1.6.2-0.20250703074222-9df5e0a6c145 h1:Mk4axSLxKw3hjkf3PffBLQYta7nPVIWObuKCPDWgQLc= +cdr.dev/slog v1.6.2-0.20250703074222-9df5e0a6c145/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ= cel.dev/expr v0.23.0 h1:wUb94w6OYQS4uXraxo9U+wUAs9jT47Xvl4iPgAwM2ss= cel.dev/expr v0.23.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -1116,8 +1116,8 @@ github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpx github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= @@ -1944,8 +1944,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= -go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= +go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 h1:m639+BofXTvcY1q8CGs4ItwQarYtJPOWmVobfM1HpVI= @@ -1956,16 +1956,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 h1:FiOTYABOX4tdzi go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0/go.mod h1:xyo5rS8DgzV0Jtsht+LCEMwyiDbjpsxBpWETwFRF0/4= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 h1:W5AWUn/IVe8RFb5pZx1Uh9Laf/4+Qmm4kJL5zPuvR+0= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0/go.mod h1:mzKxJywMNBdEX8TSJais3NnsVZUaJ+bAy6UxPTng2vk= -go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= -go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= +go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY= go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= -go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= +go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= +go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From 65809710e50f2f4e31dfaff48532ac7eec977da9 Mon Sep 17 00:00:00 2001 From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 08:37:19 +0100 Subject: [PATCH 2/2] feat: make readinessProbe and livenessProbe initialDelaySeconds configurable (#18756) Makes `initialDelaySeconds` configurable for both `readinessProbe` and `livenessProbe` in the Helm chart. **Changes:** - Added `coder.readinessProbe.initialDelaySeconds` and `coder.livenessProbe.initialDelaySeconds` to `values.yaml` - Updated `_coder.tpl` template to use these configurable values - Defaults to 0 seconds to maintain existing behavior **Testing:** - Verified template rendering with default values (0) - Verified template rendering with custom values (30, 60) - Both probes correctly use the configured `initialDelaySeconds` --------- Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com> Co-authored-by: kylecarbs <7122116+kylecarbs@users.noreply.github.com> --- helm/coder/templates/_coder.tpl | 2 ++ helm/coder/tests/testdata/auto_access_url_1.golden | 2 ++ .../tests/testdata/auto_access_url_1_coder.golden | 2 ++ helm/coder/tests/testdata/auto_access_url_2.golden | 2 ++ .../tests/testdata/auto_access_url_2_coder.golden | 2 ++ helm/coder/tests/testdata/auto_access_url_3.golden | 2 ++ .../tests/testdata/auto_access_url_3_coder.golden | 2 ++ helm/coder/tests/testdata/command.golden | 2 ++ helm/coder/tests/testdata/command_args.golden | 2 ++ helm/coder/tests/testdata/command_args_coder.golden | 2 ++ helm/coder/tests/testdata/command_coder.golden | 2 ++ helm/coder/tests/testdata/custom_resources.golden | 2 ++ .../tests/testdata/custom_resources_coder.golden | 2 ++ helm/coder/tests/testdata/default_values.golden | 2 ++ .../coder/tests/testdata/default_values_coder.golden | 2 ++ helm/coder/tests/testdata/env_from.golden | 2 ++ helm/coder/tests/testdata/env_from_coder.golden | 2 ++ helm/coder/tests/testdata/extra_templates.golden | 2 ++ .../tests/testdata/extra_templates_coder.golden | 2 ++ helm/coder/tests/testdata/labels_annotations.golden | 2 ++ .../tests/testdata/labels_annotations_coder.golden | 2 ++ helm/coder/tests/testdata/partial_resources.golden | 2 ++ .../tests/testdata/partial_resources_coder.golden | 2 ++ helm/coder/tests/testdata/prometheus.golden | 2 ++ helm/coder/tests/testdata/prometheus_coder.golden | 2 ++ helm/coder/tests/testdata/provisionerd_psk.golden | 2 ++ .../tests/testdata/provisionerd_psk_coder.golden | 2 ++ helm/coder/tests/testdata/sa.golden | 2 ++ helm/coder/tests/testdata/sa_coder.golden | 2 ++ helm/coder/tests/testdata/sa_disabled.golden | 2 ++ helm/coder/tests/testdata/sa_disabled_coder.golden | 2 ++ helm/coder/tests/testdata/sa_extra_rules.golden | 2 ++ .../coder/tests/testdata/sa_extra_rules_coder.golden | 2 ++ helm/coder/tests/testdata/securitycontext.golden | 2 ++ .../tests/testdata/securitycontext_coder.golden | 2 ++ helm/coder/tests/testdata/svc_loadbalancer.golden | 2 ++ .../tests/testdata/svc_loadbalancer_class.golden | 2 ++ .../testdata/svc_loadbalancer_class_coder.golden | 2 ++ .../tests/testdata/svc_loadbalancer_coder.golden | 2 ++ helm/coder/tests/testdata/svc_nodeport.golden | 2 ++ helm/coder/tests/testdata/svc_nodeport_coder.golden | 2 ++ helm/coder/tests/testdata/tls.golden | 2 ++ helm/coder/tests/testdata/tls_coder.golden | 2 ++ helm/coder/tests/testdata/topology.golden | 2 ++ helm/coder/tests/testdata/topology_coder.golden | 2 ++ helm/coder/tests/testdata/workspace_proxy.golden | 2 ++ .../tests/testdata/workspace_proxy_coder.golden | 2 ++ helm/coder/values.yaml | 12 ++++++++++++ 48 files changed, 106 insertions(+) diff --git a/helm/coder/templates/_coder.tpl b/helm/coder/templates/_coder.tpl index d0846ecf739b7..3964fd1e3f66d 100644 --- a/helm/coder/templates/_coder.tpl +++ b/helm/coder/templates/_coder.tpl @@ -100,9 +100,11 @@ readinessProbe: path: /healthz port: "http" scheme: "HTTP" + initialDelaySeconds: {{ .Values.coder.readinessProbe.initialDelaySeconds }} livenessProbe: httpGet: path: /healthz port: "http" scheme: "HTTP" + initialDelaySeconds: {{ .Values.coder.livenessProbe.initialDelaySeconds }} {{- end }} diff --git a/helm/coder/tests/testdata/auto_access_url_1.golden b/helm/coder/tests/testdata/auto_access_url_1.golden index 2eace7fe120ca..a8455dd53357f 100644 --- a/helm/coder/tests/testdata/auto_access_url_1.golden +++ b/helm/coder/tests/testdata/auto_access_url_1.golden @@ -171,6 +171,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -181,6 +182,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/auto_access_url_1_coder.golden b/helm/coder/tests/testdata/auto_access_url_1_coder.golden index 3d991373887d3..5862de46fa900 100644 --- a/helm/coder/tests/testdata/auto_access_url_1_coder.golden +++ b/helm/coder/tests/testdata/auto_access_url_1_coder.golden @@ -171,6 +171,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -181,6 +182,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/auto_access_url_2.golden b/helm/coder/tests/testdata/auto_access_url_2.golden index fe34f3ca587d9..d5c7ce4dd17ac 100644 --- a/helm/coder/tests/testdata/auto_access_url_2.golden +++ b/helm/coder/tests/testdata/auto_access_url_2.golden @@ -171,6 +171,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -181,6 +182,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/auto_access_url_2_coder.golden b/helm/coder/tests/testdata/auto_access_url_2_coder.golden index 0b36e6a77e029..94341b196c2b3 100644 --- a/helm/coder/tests/testdata/auto_access_url_2_coder.golden +++ b/helm/coder/tests/testdata/auto_access_url_2_coder.golden @@ -171,6 +171,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -181,6 +182,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/auto_access_url_3.golden b/helm/coder/tests/testdata/auto_access_url_3.golden index cad0bd1dc6af0..5ce3303dcdca3 100644 --- a/helm/coder/tests/testdata/auto_access_url_3.golden +++ b/helm/coder/tests/testdata/auto_access_url_3.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/auto_access_url_3_coder.golden b/helm/coder/tests/testdata/auto_access_url_3_coder.golden index dd8b73b55dd29..9298e7411bc74 100644 --- a/helm/coder/tests/testdata/auto_access_url_3_coder.golden +++ b/helm/coder/tests/testdata/auto_access_url_3_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/command.golden b/helm/coder/tests/testdata/command.golden index 877d85ee2fd94..9ef66d7ad3a07 100644 --- a/helm/coder/tests/testdata/command.golden +++ b/helm/coder/tests/testdata/command.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/command_args.golden b/helm/coder/tests/testdata/command_args.golden index 6ddf716706d26..d5633ce361966 100644 --- a/helm/coder/tests/testdata/command_args.golden +++ b/helm/coder/tests/testdata/command_args.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -180,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/command_args_coder.golden b/helm/coder/tests/testdata/command_args_coder.golden index 46a666928ccc0..8fafa90a7f080 100644 --- a/helm/coder/tests/testdata/command_args_coder.golden +++ b/helm/coder/tests/testdata/command_args_coder.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -180,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/command_coder.golden b/helm/coder/tests/testdata/command_coder.golden index 314f75b0e4335..055cec2380d59 100644 --- a/helm/coder/tests/testdata/command_coder.golden +++ b/helm/coder/tests/testdata/command_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/custom_resources.golden b/helm/coder/tests/testdata/custom_resources.golden index 67d78de581fea..ca5391e3ac5d9 100644 --- a/helm/coder/tests/testdata/custom_resources.golden +++ b/helm/coder/tests/testdata/custom_resources.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 4000m diff --git a/helm/coder/tests/testdata/custom_resources_coder.golden b/helm/coder/tests/testdata/custom_resources_coder.golden index c5ea2daad7cd2..f783a4f7e53e5 100644 --- a/helm/coder/tests/testdata/custom_resources_coder.golden +++ b/helm/coder/tests/testdata/custom_resources_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 4000m diff --git a/helm/coder/tests/testdata/default_values.golden b/helm/coder/tests/testdata/default_values.golden index b20caa4bcaf25..c48dffefd12f1 100644 --- a/helm/coder/tests/testdata/default_values.golden +++ b/helm/coder/tests/testdata/default_values.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/default_values_coder.golden b/helm/coder/tests/testdata/default_values_coder.golden index 2dd24fe80d593..bb8157ea46153 100644 --- a/helm/coder/tests/testdata/default_values_coder.golden +++ b/helm/coder/tests/testdata/default_values_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/env_from.golden b/helm/coder/tests/testdata/env_from.golden index 49a4b6b883788..eb43115a79187 100644 --- a/helm/coder/tests/testdata/env_from.golden +++ b/helm/coder/tests/testdata/env_from.golden @@ -181,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -191,6 +192,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/env_from_coder.golden b/helm/coder/tests/testdata/env_from_coder.golden index 82f7d718c0c40..a539842ce9187 100644 --- a/helm/coder/tests/testdata/env_from_coder.golden +++ b/helm/coder/tests/testdata/env_from_coder.golden @@ -181,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -191,6 +192,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/extra_templates.golden b/helm/coder/tests/testdata/extra_templates.golden index 7b152c7633015..2b0d5117c855f 100644 --- a/helm/coder/tests/testdata/extra_templates.golden +++ b/helm/coder/tests/testdata/extra_templates.golden @@ -178,6 +178,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -188,6 +189,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/extra_templates_coder.golden b/helm/coder/tests/testdata/extra_templates_coder.golden index 58555b8625655..bca6beee0c1ea 100644 --- a/helm/coder/tests/testdata/extra_templates_coder.golden +++ b/helm/coder/tests/testdata/extra_templates_coder.golden @@ -178,6 +178,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -188,6 +189,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/labels_annotations.golden b/helm/coder/tests/testdata/labels_annotations.golden index 7b92ea77bef14..6a83ee5ec1684 100644 --- a/helm/coder/tests/testdata/labels_annotations.golden +++ b/helm/coder/tests/testdata/labels_annotations.golden @@ -177,6 +177,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -187,6 +188,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/labels_annotations_coder.golden b/helm/coder/tests/testdata/labels_annotations_coder.golden index d54a1467a7070..f4454b575ba93 100644 --- a/helm/coder/tests/testdata/labels_annotations_coder.golden +++ b/helm/coder/tests/testdata/labels_annotations_coder.golden @@ -177,6 +177,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -187,6 +188,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/partial_resources.golden b/helm/coder/tests/testdata/partial_resources.golden index 504734b47adc8..9eade81274a44 100644 --- a/helm/coder/tests/testdata/partial_resources.golden +++ b/helm/coder/tests/testdata/partial_resources.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: requests: cpu: 1500m diff --git a/helm/coder/tests/testdata/partial_resources_coder.golden b/helm/coder/tests/testdata/partial_resources_coder.golden index e51a8b4cde16d..3edfa2a2fcbb3 100644 --- a/helm/coder/tests/testdata/partial_resources_coder.golden +++ b/helm/coder/tests/testdata/partial_resources_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: requests: cpu: 1500m diff --git a/helm/coder/tests/testdata/prometheus.golden b/helm/coder/tests/testdata/prometheus.golden index 0048accac8d13..0caa782975e8f 100644 --- a/helm/coder/tests/testdata/prometheus.golden +++ b/helm/coder/tests/testdata/prometheus.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -183,6 +184,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/prometheus_coder.golden b/helm/coder/tests/testdata/prometheus_coder.golden index ec5dfa81fc438..6985f714612c1 100644 --- a/helm/coder/tests/testdata/prometheus_coder.golden +++ b/helm/coder/tests/testdata/prometheus_coder.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -183,6 +184,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/provisionerd_psk.golden b/helm/coder/tests/testdata/provisionerd_psk.golden index 6d199a8c110fd..8efac9058c2fc 100644 --- a/helm/coder/tests/testdata/provisionerd_psk.golden +++ b/helm/coder/tests/testdata/provisionerd_psk.golden @@ -174,6 +174,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -184,6 +185,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/provisionerd_psk_coder.golden b/helm/coder/tests/testdata/provisionerd_psk_coder.golden index 7ba2337d0ca1e..cb9908874c686 100644 --- a/helm/coder/tests/testdata/provisionerd_psk_coder.golden +++ b/helm/coder/tests/testdata/provisionerd_psk_coder.golden @@ -174,6 +174,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -184,6 +185,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/sa.golden b/helm/coder/tests/testdata/sa.golden index bf00741be742b..f57293b211df6 100644 --- a/helm/coder/tests/testdata/sa.golden +++ b/helm/coder/tests/testdata/sa.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -180,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/sa_coder.golden b/helm/coder/tests/testdata/sa_coder.golden index c9d1cc0ec16e6..ae3ce59e35a24 100644 --- a/helm/coder/tests/testdata/sa_coder.golden +++ b/helm/coder/tests/testdata/sa_coder.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -180,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/sa_disabled.golden b/helm/coder/tests/testdata/sa_disabled.golden index ca7dd9a270a32..387a05f79536f 100644 --- a/helm/coder/tests/testdata/sa_disabled.golden +++ b/helm/coder/tests/testdata/sa_disabled.golden @@ -155,6 +155,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -165,6 +166,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/sa_disabled_coder.golden b/helm/coder/tests/testdata/sa_disabled_coder.golden index 5a9109bb507d3..77f9b0fc58ae9 100644 --- a/helm/coder/tests/testdata/sa_disabled_coder.golden +++ b/helm/coder/tests/testdata/sa_disabled_coder.golden @@ -155,6 +155,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -165,6 +166,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/sa_extra_rules.golden b/helm/coder/tests/testdata/sa_extra_rules.golden index 70c81ce6f4f14..8d74df5001d34 100644 --- a/helm/coder/tests/testdata/sa_extra_rules.golden +++ b/helm/coder/tests/testdata/sa_extra_rules.golden @@ -183,6 +183,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -193,6 +194,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/sa_extra_rules_coder.golden b/helm/coder/tests/testdata/sa_extra_rules_coder.golden index 47bfb8a23d26c..50849b76e89f2 100644 --- a/helm/coder/tests/testdata/sa_extra_rules_coder.golden +++ b/helm/coder/tests/testdata/sa_extra_rules_coder.golden @@ -183,6 +183,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -193,6 +194,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/securitycontext.golden b/helm/coder/tests/testdata/securitycontext.golden index dcc719b893925..ee1a3e3a795fd 100644 --- a/helm/coder/tests/testdata/securitycontext.golden +++ b/helm/coder/tests/testdata/securitycontext.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/securitycontext_coder.golden b/helm/coder/tests/testdata/securitycontext_coder.golden index d72412e7a34a6..fd3d70482df5b 100644 --- a/helm/coder/tests/testdata/securitycontext_coder.golden +++ b/helm/coder/tests/testdata/securitycontext_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/svc_loadbalancer.golden b/helm/coder/tests/testdata/svc_loadbalancer.golden index 05d49585f656a..dd55f8d530087 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer.golden +++ b/helm/coder/tests/testdata/svc_loadbalancer.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/svc_loadbalancer_class.golden b/helm/coder/tests/testdata/svc_loadbalancer_class.golden index 38178fc338b92..92969226da94b 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer_class.golden +++ b/helm/coder/tests/testdata/svc_loadbalancer_class.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -180,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden b/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden index 156b10dbd41e1..aa8a19a234b3d 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden +++ b/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden @@ -170,6 +170,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -180,6 +181,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/svc_loadbalancer_coder.golden b/helm/coder/tests/testdata/svc_loadbalancer_coder.golden index 7657e247b4e3d..a7d389fb048df 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer_coder.golden +++ b/helm/coder/tests/testdata/svc_loadbalancer_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/svc_nodeport.golden b/helm/coder/tests/testdata/svc_nodeport.golden index 46948472d342b..9a271628728f7 100644 --- a/helm/coder/tests/testdata/svc_nodeport.golden +++ b/helm/coder/tests/testdata/svc_nodeport.golden @@ -168,6 +168,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -178,6 +179,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/svc_nodeport_coder.golden b/helm/coder/tests/testdata/svc_nodeport_coder.golden index 9fc2805def357..0a8805f84ba8b 100644 --- a/helm/coder/tests/testdata/svc_nodeport_coder.golden +++ b/helm/coder/tests/testdata/svc_nodeport_coder.golden @@ -168,6 +168,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -178,6 +179,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/tls.golden b/helm/coder/tests/testdata/tls.golden index b0859b1f74776..1cd0fb75bc6c6 100644 --- a/helm/coder/tests/testdata/tls.golden +++ b/helm/coder/tests/testdata/tls.golden @@ -182,6 +182,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -195,6 +196,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/tls_coder.golden b/helm/coder/tests/testdata/tls_coder.golden index 51a2797723fc0..95bec4a8c510e 100644 --- a/helm/coder/tests/testdata/tls_coder.golden +++ b/helm/coder/tests/testdata/tls_coder.golden @@ -182,6 +182,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -195,6 +196,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/topology.golden b/helm/coder/tests/testdata/topology.golden index d0179c6d2958d..4d8af24ce3c7f 100644 --- a/helm/coder/tests/testdata/topology.golden +++ b/helm/coder/tests/testdata/topology.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/topology_coder.golden b/helm/coder/tests/testdata/topology_coder.golden index 2c9f074f04537..3b81214417262 100644 --- a/helm/coder/tests/testdata/topology_coder.golden +++ b/helm/coder/tests/testdata/topology_coder.golden @@ -169,6 +169,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -179,6 +180,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/workspace_proxy.golden b/helm/coder/tests/testdata/workspace_proxy.golden index 61fe50685a819..d096bfe94feea 100644 --- a/helm/coder/tests/testdata/workspace_proxy.golden +++ b/helm/coder/tests/testdata/workspace_proxy.golden @@ -177,6 +177,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -187,6 +188,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/tests/testdata/workspace_proxy_coder.golden b/helm/coder/tests/testdata/workspace_proxy_coder.golden index a9330d5cc45ca..2ed59d5591261 100644 --- a/helm/coder/tests/testdata/workspace_proxy_coder.golden +++ b/helm/coder/tests/testdata/workspace_proxy_coder.golden @@ -177,6 +177,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 name: coder ports: - containerPort: 8080 @@ -187,6 +188,7 @@ spec: path: /healthz port: http scheme: HTTP + initialDelaySeconds: 0 resources: limits: cpu: 2000m diff --git a/helm/coder/values.yaml b/helm/coder/values.yaml index d44200a8ce938..fa6cb2c3622f8 100644 --- a/helm/coder/values.yaml +++ b/helm/coder/values.yaml @@ -206,6 +206,18 @@ coder: # cpu: 2000m # memory: 4096Mi + # coder.readinessProbe -- Readiness probe configuration for the Coder container. + readinessProbe: + # coder.readinessProbe.initialDelaySeconds -- Number of seconds after the container + # has started before readiness probes are initiated. + initialDelaySeconds: 0 + + # coder.livenessProbe -- Liveness probe configuration for the Coder container. + livenessProbe: + # coder.livenessProbe.initialDelaySeconds -- Number of seconds after the container + # has started before liveness probes are initiated. + initialDelaySeconds: 0 + # coder.certs -- CA bundles to mount inside the Coder pod. certs: # coder.certs.secrets -- A list of CA bundle secrets to mount into the Coder