mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 15:25:57 +00:00
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](58167fcfa1/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go (L77)
) to [standardFinalizers](58167fcfa1/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](58167fcfa1/pkg/controller/garbagecollector/garbagecollector.go (L389)
) but it can't be set. It's sibling [FinalizerOrphanDependents](58167fcfa1/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go (L76)
) is already [there](58167fcfa1/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.](58167fcfa1/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.
This commit is contained in:
commit
c97c353a71
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user