selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: add terminationGracePeriodSeconds to provisioner chart (#9048) 

* feat: add terminationGracePeriodSeconds to provisioner chart

Signed-off-by: Spike Curtis <spike@coder.com>

* Remove hardcoded 1 minute graceful timeout

Signed-off-by: Spike Curtis <spike@coder.com>

---------

Signed-off-by: Spike Curtis <spike@coder.com>
This commit is contained in:
Spike Curtis 2023-08-15 12:38:58 +04:00 committed by GitHub
parent e893ab232c
commit 41433cd1ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
enterprise/cli/provisionerdaemons.go
View File

@ -137,9 +137,7 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
cliui.Errorf(inv.Stderr, "Unexpected error, shutting down server: %s\n", exitErr)
}
shutdown, shutdownCancel := context.WithTimeout(ctx, time.Minute)
defer shutdownCancel()
err = srv.Shutdown(shutdown)
err = srv.Shutdown(ctx)
if err != nil {
return xerrors.Errorf("shutdown: %w", err)
}

1
helm/provisioner/templates/_coder.tpl
View File

@ -11,6 +11,7 @@ Deployment to merge into the libcoder template
spec:
template:
spec:
terminationGracePeriodSeconds: {{ .Values.provisionerDaemon.terminationGracePeriodSeconds }}
containers:
-
{{ include "libcoder.containerspec" (list . "coder.containerspec") | indent 8}}

2
helm/provisioner/tests/testdata/command.golden vendored
View File

@ -131,5 +131,5 @@ spec:
volumeMounts: []
restartPolicy: Always
serviceAccountName: coder-provisioner
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: 600
volumes: []

2
helm/provisioner/tests/testdata/command_args.golden vendored
View File

@ -131,5 +131,5 @@ spec:
volumeMounts: []
restartPolicy: Always
serviceAccountName: coder-provisioner
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: 600
volumes: []

2
helm/provisioner/tests/testdata/default_values.golden vendored
View File

@ -131,5 +131,5 @@ spec:
volumeMounts: []
restartPolicy: Always
serviceAccountName: coder-provisioner
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: 600
volumes: []

2
helm/provisioner/tests/testdata/labels_annotations.golden vendored
View File

@ -139,5 +139,5 @@ spec:
volumeMounts: []
restartPolicy: Always
serviceAccountName: coder-provisioner
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: 600
volumes: []

2
helm/provisioner/tests/testdata/provisionerd_psk.golden vendored
View File

@ -133,5 +133,5 @@ spec:
volumeMounts: []
restartPolicy: Always
serviceAccountName: coder-provisioner
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: 600
volumes: []

2
helm/provisioner/tests/testdata/sa.golden vendored
View File

@ -132,5 +132,5 @@ spec:
volumeMounts: []
restartPolicy: Always
serviceAccountName: coder-service-account
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: 600
volumes: []

5
helm/provisioner/values.yaml
View File

@ -202,3 +202,8 @@ provisionerDaemon:
{}
# location: usa
# provider: kubernetes
# provisionerDaemon.terminationGracePeriodSeconds -- Time in seconds that Kubernetes should wait before forcibly
# terminating the provisioner daemon. You should set this to be longer than your longest expected build time so that
# redeployments do not interrupt builds in progress.
terminationGracePeriodSeconds: 600