Merge pull request #46500 from tnozicka/fix-standard-finalizers

Automatic merge from submit-queue (batch tested with PRs 46648, 46500, 46238, 46668, 46557) Fix standardFinalizers - add missing metav1.FinalizerDeleteDependents **What this PR does / why we need it**: It adds [FinalizerDeleteDependents](https://github.com/kubernetes/kubernetes/blob/58167fcfa10551cc092ee7484e8b41082d0ac223/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go#L77) to [standardFinalizers](https://github.com/kubernetes/kubernetes/blob/58167fcfa10551cc092ee7484e8b41082d0ac223/pkg/api/helper/helpers.go#L222) otherwise this finalizer is unusable because apiserver will fail validation because it is not fully qualified name - but it is a standard Kubernetes finalizer [used by garbage collector](https://github.com/kubernetes/kubernetes/blob/58167fcfa10551cc092ee7484e8b41082d0ac223/pkg/controller/garbagecollector/garbagecollector.go#L389) but it can't be set. It's sibling [FinalizerOrphanDependents](https://github.com/kubernetes/kubernetes/blob/58167fcfa10551cc092ee7484e8b41082d0ac223/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go#L76) is already [there](https://github.com/kubernetes/kubernetes/blob/58167fcfa10551cc092ee7484e8b41082d0ac223/pkg/api/helper/helpers.go#L224). I suppose this is a bug because otherwise `FinalizerDeleteDependents` is unusable. Fixes https://github.com/openshift/origin/pull/14322 Might fix https://github.com/kubernetes/kubernetes/pull/45764 **Not for the reviewer:** [This same definition is also in staging.](https://github.com/kubernetes/kubernetes/blob/58167fcfa10551cc092ee7484e8b41082d0ac223/staging/src/k8s.io/client-go/pkg/api/helper/helpers.go#L222) Does it get propagated to staging automatically? Editing the same file twice doesn't seem like the intended option.

Merge pull request #46500 from tnozicka/fix-standard-finalizers
c97c353a · Kubernetes Submit Queue · GitHub · 6a4b4a53 · 9ed01e44 · c97c353a
Commit c97c353a authored Jun 02, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

helpers.go pkg/api/helper/helpers.go +1 -0

helpers.go staging/src/k8s.io/client-go/pkg/api/helper/helpers.go +1 -0

No files found.
--- a/pkg/api/helper/helpers.go
+++ b/pkg/api/helper/helpers.go
@@ -222,6 +222,7 @@ func IsServiceIPRequested(service *api.Service) bool {
 var standardFinalizers = sets.NewString(
 	string(api.FinalizerKubernetes),
 	metav1.FinalizerOrphanDependents,
+	metav1.FinalizerDeleteDependents,
 )

 // HasAnnotation returns a bool if passed in annotation exists

--- a/staging/src/k8s.io/client-go/pkg/api/helper/helpers.go
+++ b/staging/src/k8s.io/client-go/pkg/api/helper/helpers.go
@@ -222,6 +222,7 @@ func IsServiceIPRequested(service *api.Service) bool {
 var standardFinalizers = sets.NewString(
 	string(api.FinalizerKubernetes),
 	metav1.FinalizerOrphanDependents,
+	metav1.FinalizerDeleteDependents,
 )

 // HasAnnotation returns a bool if passed in annotation exists