Merge pull request #535 from replicatedhq/divolgin/jobs

Don't leave orphaned pods when deleting jobs
replicatedhq · May 14, 2020 · 00ca0dd · 00ca0dd
2 parents 4077687 + ca892e9
commit 00ca0dd
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/kotsadm/operator/pkg/client/hooks.go b/kotsadm/operator/pkg/client/hooks.go
@@ -68,7 +68,14 @@ func (c *Client) runHooksInformer() error {
 					}
 
 					fmt.Printf("attempting to %s delete job %s\n", reason, job.Name)
-					if err := clientset.BatchV1().Jobs(job.Namespace).Delete(job.Name, &metav1.DeleteOptions{}); err != nil {
+
+					grace := int64(0)
+					policy := metav1.DeletePropagationBackground
+					opts := &metav1.DeleteOptions{
+						GracePeriodSeconds: &grace,
+						PropagationPolicy:  &policy,
+					}
+					if err := clientset.BatchV1().Jobs(job.Namespace).Delete(job.Name, opts); err != nil {
 						fmt.Printf("error deleting job: %s\n", err.Error())
 						return
 					}