From 9862c583bd704f469e805a5881ab239ef960be78 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Fri, 6 Jul 2018 11:36:57 -0400 Subject: [PATCH] UPSTREAM: 65908: switch delete strategy to background deletion --- vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go | 2 +- vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go index 5f2f249a3fd0..7ae71e76bf2d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go @@ -246,7 +246,7 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error { if o.GracePeriod >= 0 { options = metav1.NewDeleteOptions(int64(o.GracePeriod)) } - policy := metav1.DeletePropagationForeground + policy := metav1.DeletePropagationBackground if !o.Cascade { policy = metav1.DeletePropagationOrphan } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete_test.go index 71e4405f3a26..8c8f1bc796bb 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete_test.go @@ -137,9 +137,9 @@ func TestOrphanDependentsInDeleteObject(t *testing.T) { }), } - // DeleteOptions.PropagationPolicy should be Foreground, when cascade is true (default). - foregroundPolicy := metav1.DeletePropagationForeground - policy = &foregroundPolicy + // DeleteOptions.PropagationPolicy should be Background, when cascade is true (default). + backgroundPolicy := metav1.DeletePropagationBackground + policy = &backgroundPolicy streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdDelete(tf, streams) cmd.Flags().Set("namespace", "test")