github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1125 from aryan9600/fix-finalizer-dupl

Browse Source 
Fix potential canary finalizer duplication
This commit is contained in:
Stefan Prodan
2022-03-08 11:10:39 +02:00
committed by GitHub
parent 5d2a7ba9e7 84ae65c763
commit 519f343fcc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/finalizer.go
+7 -4
View File
@@ -115,7 +115,7 @@ func hasFinalizer(canary *flaggerv1.Canary) bool {
return false
}
// addFinalizer adds a provided finalizer to the specified canary resource.
// addFinalizer adds a provided finalizer (if it already doesn't exist) to the specified canary resource.
// If failures occur the error will be returned otherwise the action is deemed successful
// and error will be nil.
func (c *Controller) addFinalizer(canary *flaggerv1.Canary) error {
@@ -128,11 +128,14 @@ func (c *Controller) addFinalizer(canary *flaggerv1.Canary) error {
return fmt.Errorf("canary %s.%s get query failed: %w", name, ns, err)
}
}
firstTry = false
cCopy := canary.DeepCopy()
cCopy.ObjectMeta.Finalizers = append(cCopy.ObjectMeta.Finalizers, finalizer)
_, err = c.flaggerClient.FlaggerV1beta1().Canaries(canary.Namespace).Update(context.TODO(), cCopy, metav1.UpdateOptions{})
firstTry = false
if !hasFinalizer(cCopy) {
cCopy.ObjectMeta.Finalizers = append(cCopy.ObjectMeta.Finalizers, finalizer)
_, err = c.flaggerClient.FlaggerV1beta1().Canaries(canary.Namespace).Update(context.TODO(), cCopy, metav1.UpdateOptions{})
}
return
})