feat: add terminationGracePeriodSeconds to provisioner chart (#9048)

spikecurtis · web-flow · commit 41433cd1ec16 · 2023-08-15T08:38:58.000Z
* feat: add terminationGracePeriodSeconds to provisioner chart

Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;

* Remove hardcoded 1 minute graceful timeout

Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;

---------

Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/enterprise/cli/provisionerdaemons.go b/enterprise/cli/provisionerdaemons.go
@@ -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)
 			}
diff --git a/helm/provisioner/templates/_coder.tpl b/helm/provisioner/templates/_coder.tpl
@@ -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}}
diff --git a/helm/provisioner/tests/testdata/command.golden b/helm/provisioner/tests/testdata/command.golden
@@ -131,5 +131,5 @@ spec:
         volumeMounts: []
       restartPolicy: Always
       serviceAccountName: coder-provisioner
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 600
       volumes: []
diff --git a/helm/provisioner/tests/testdata/command_args.golden b/helm/provisioner/tests/testdata/command_args.golden
@@ -131,5 +131,5 @@ spec:
         volumeMounts: []
       restartPolicy: Always
       serviceAccountName: coder-provisioner
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 600
       volumes: []
diff --git a/helm/provisioner/tests/testdata/default_values.golden b/helm/provisioner/tests/testdata/default_values.golden
@@ -131,5 +131,5 @@ spec:
         volumeMounts: []
       restartPolicy: Always
       serviceAccountName: coder-provisioner
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 600
       volumes: []
diff --git a/helm/provisioner/tests/testdata/labels_annotations.golden b/helm/provisioner/tests/testdata/labels_annotations.golden
@@ -139,5 +139,5 @@ spec:
         volumeMounts: []
       restartPolicy: Always
       serviceAccountName: coder-provisioner
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 600
       volumes: []
diff --git a/helm/provisioner/tests/testdata/provisionerd_psk.golden b/helm/provisioner/tests/testdata/provisionerd_psk.golden
@@ -133,5 +133,5 @@ spec:
         volumeMounts: []
       restartPolicy: Always
       serviceAccountName: coder-provisioner
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 600
       volumes: []
diff --git a/helm/provisioner/tests/testdata/sa.golden b/helm/provisioner/tests/testdata/sa.golden
@@ -132,5 +132,5 @@ spec:
         volumeMounts: []
       restartPolicy: Always
       serviceAccountName: coder-service-account
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: 600
       volumes: []
diff --git a/helm/provisioner/values.yaml b/helm/provisioner/values.yaml
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,7 @@ func (r RootCmd) provisionerDaemonStart() clibase.Cmd {`
`137`	`137`	`cliui.Errorf(inv.Stderr, "Unexpected error, shutting down server: %s\n", exitErr)`
`138`	`138`	`}`
`139`	`139`
`140`		`- shutdown, shutdownCancel := context.WithTimeout(ctx, time.Minute)`
`141`		`- defer shutdownCancel()`
`142`		`- err = srv.Shutdown(shutdown)`
	`140`	`+ err = srv.Shutdown(ctx)`
`143`	`141`	`if err != nil {`
`144`	`142`	`return xerrors.Errorf("shutdown: %w", err)`
`145`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ Deployment to merge into the libcoder template`
`11`	`11`	`spec:`
`12`	`12`	`template:`
`13`	`13`	`spec:`
	`14`	`+ terminationGracePeriodSeconds: {{ .Values.provisionerDaemon.terminationGracePeriodSeconds }}`
`14`	`15`	`containers:`
`15`	`16`	`-`
`16`	`17`	`{{ include "libcoder.containerspec" (list . "coder.containerspec") \| indent 8}}`