Merge pull request #772 from r2d4/grace-period

kubectl: set grace-period=1 on cleanup
GoogleContainerTools · Jun 29, 2018 · b6172b3 · b6172b3
2 parents 984dfa8 + 5ddffff
commit b6172b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/skaffold/deploy/kubectl.go b/pkg/skaffold/deploy/kubectl.go
@@ -90,7 +90,7 @@ func (k *KubectlDeployer) Cleanup(ctx context.Context, out io.Writer) error {
 		return errors.Wrap(err, "reading manifests")
 	}
 
-	if err := kubectl(manifests.reader(), out, k.kubeContext, "delete", "--ignore-not-found=true", "-f", "-"); err != nil {
+	if err := kubectl(manifests.reader(), out, k.kubeContext, "delete", "--grace-period=1", "--ignore-not-found=true", "-f", "-"); err != nil {
 		return errors.Wrap(err, "deleting manifests")
 	}
 

diff --git a/pkg/skaffold/deploy/kubectl_test.go b/pkg/skaffold/deploy/kubectl_test.go
@@ -162,14 +162,14 @@ func TestKubectlCleanup(t *testing.T) {
 			cfg: &v1alpha2.KubectlDeploy{
 				Manifests: []string{"test/deployment.yaml"},
 			},
-			command: testutil.NewFakeCmd("kubectl --context kubecontext delete --ignore-not-found=true -f -", nil),
+			command: testutil.NewFakeCmd("kubectl --context kubecontext delete --grace-period=1 --ignore-not-found=true -f -", nil),
 		},
 		{
 			description: "cleanup error",
 			cfg: &v1alpha2.KubectlDeploy{
 				Manifests: []string{"test/deployment.yaml"},
 			},
-			command:   testutil.NewFakeCmd("kubectl --context kubecontext delete --ignore-not-found=true -f -", errors.New("BUG")),
+			command:   testutil.NewFakeCmd("kubectl --context kubecontext delete --grace-period=1 --ignore-not-found=true -f -", errors.New("BUG")),
 			shouldErr: true,
 		},
 	}