github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48261 from FengyunPan/fix-removeFinalizer

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-30 16:28:43 -07:00
committed by GitHub
parent e633d3e29c 23a90a7679
commit 3854388987
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/garbagecollector/operations.go
View File

@@ -115,7 +115,7 @@ func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string)
for _, f := range finalizers { for _, f := range finalizers {
if f == targetFinalizer { if f == targetFinalizer {
found = true found = true
break continue
} }
newFinalizers = append(newFinalizers, f) newFinalizers = append(newFinalizers, f)
} }