Merge pull request #21 from deliveroo/PRIC-444/force-kill-pod

Try killing the pod before creating a new one
deliveroo · Nov 7, 2018 · a46a400 · a46a400
2 parents 2f8200a + d4b8e07
commit a46a400
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cli/pipeline/run.go b/cli/pipeline/run.go
@@ -218,9 +218,11 @@ func runPipelineStep(pipeline *PipelineDefinition, step *PipelineDefinitionStep,
 func deleteAndWait(c kubernetes.Interface, podDefinition *PodDefinition, flags *runCmdFlagsStruct) error {
 	pods := clientset.CoreV1().Pods(podDefinition.Namespace)
 	deleting := false
+	var gracePeriod int64
+	opts := metav1.DeleteOptions{GracePeriodSeconds: &gracePeriod}
 	err := wait.PollImmediate(flags.DeletePollInterval, deleteTimeout, func() (bool, error) {
 		var err error
-		err = pods.Delete(podDefinition.PodName, &metav1.DeleteOptions{})
+		err = pods.Delete(podDefinition.PodName, &opts)
 		if err != nil {
 			if k8errors.IsNotFound(err) {
 				if deleting {