Merge pull request #48261 from FengyunPan/fix-removeFinalizer

Automatic merge from submit-queue (batch tested with PRs 43558, 48261, 42376, 46803, 47058) Fix removing finalizer for garbage collector The loop should use 'continue' not 'break', otherwise removeFinalizer() not only removes "orphaningFinalizer" from its finalizers list but also removes others. Fix #48363 **Release note**: ```release-note NONE ```

Merge pull request #48261 from FengyunPan/fix-removeFinalizer
38543889 · Kubernetes Submit Queue · GitHub · e633d3e2 · 23a90a76 · 38543889
Commit 38543889 authored Jun 30, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

operations.go pkg/controller/garbagecollector/operations.go +1 -1

No files found.
--- a/pkg/controller/garbagecollector/operations.go
+++ b/pkg/controller/garbagecollector/operations.go
@@ -115,7 +115,7 @@ func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string)
 		for _, f := range finalizers {
 			if f == targetFinalizer {
 				found = true
-				break
+				continue
 			}
 			newFinalizers = append(newFinalizers, f)
 		}