8000 [pull] main from coder:main by pull[bot] · Pull Request #166 · Klomgor/coder · GitHub
[go: up one dir, main page]
Skip to content

[pull] main from coder:main #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2025
Merged

[pull] main from coder:main #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1c77e3
fix: handle `sql/driver.Valuer` types properly in `json` logs (#18760)
ethanndickson Jul 7, 2025
6580971
feat: make readinessProbe and livenessProbe initialDelaySeconds confi…
blink-so[bot] Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
Expand Down Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/templates/_coder.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_1.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -181,6 +182,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_1_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -181,6 +182,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_2.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -181,6 +182,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_2_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -181,6 +182,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_3.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_3_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command_args.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -180,6 +181,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command_args_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -180,6 +181,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/custom_resources.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 4000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/custom_resources_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 4000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/default_values.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/default_values_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -179,6 +180,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/env_from.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -191,6 +192,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/env_from_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -191,6 +192,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/extra_templates.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -188,6 +189,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/extra_templates_coder.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
name: coder
ports:
- containerPort: 8080
Expand All @@ -188,6 +189,7 @@ spec:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
resources:
limits:
cpu: 2000m
Expand Down
Loading
Loading
0