Merge pull request #47994 from caesarxuchao/automated-cherry-pick-of-…

…#46500-upstream-release-1.6 Automatic merge from submit-queue Automated cherry pick of #46500 Cherry pick of #46500 on release-1.6. #46500: Fix standardFinalizers - add missing Fix #47960
kubernetes · Jun 26, 2017 · 020412e · 020412e
2 parents e8ec954 + fdeb9d4
commit 020412e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go
@@ -246,6 +246,7 @@ func IsServiceIPRequested(service *Service) bool {
 var standardFinalizers = sets.NewString(
 	string(FinalizerKubernetes),
 	metav1.FinalizerOrphanDependents,
+	metav1.FinalizerDeleteDependents,
 )
 
 // HasAnnotation returns a bool if passed in annotation exists

diff --git a/staging/src/k8s.io/client-go/pkg/api/helpers.go b/staging/src/k8s.io/client-go/pkg/api/helpers.go
@@ -246,6 +246,7 @@ func IsServiceIPRequested(service *Service) bool {
 var standardFinalizers = sets.NewString(
 	string(FinalizerKubernetes),
 	metav1.FinalizerOrphanDependents,
+	metav1.FinalizerDeleteDependents,
 )
 
 // HasAnnotation returns a bool if passed in annotation exists