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 #541 from weaveworks/retry-fixes

Browse Source 
pkg/canary: fix status retry
This commit is contained in:
Stefan Prodan
2020-04-01 14:12:22 +03:00
committed by GitHub
parent 3b04f12b65 f6baba271a
commit 7c00e5bbd8
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/canary/status.go
+5 -15
View File
@@ -38,9 +38,7 @@ func syncCanaryStatus(flaggerClient clientset.Interface, cd *flaggerv1.Canary, s
cdCopy.Status.Conditions = conditions
}
if err = updateStatusWithUpgrade(flaggerClient, cdCopy); err != nil {
return fmt.Errorf("updateStatusWithUpgrade failed: %w", err)
}
err = updateStatusWithUpgrade(flaggerClient, cdCopy)
firstTry = false
return
})
@@ -65,9 +63,7 @@ func setStatusFailedChecks(flaggerClient clientset.Interface, cd *flaggerv1.Cana
cdCopy.Status.FailedChecks = val
cdCopy.Status.LastTransitionTime = metav1.Now()
if err = updateStatusWithUpgrade(flaggerClient, cdCopy); err != nil {
return fmt.Errorf("updateStatusWithUpgrade failed: %w", err)
}
err = updateStatusWithUpgrade(flaggerClient, cdCopy)
firstTry = false
return
})
@@ -91,9 +87,7 @@ func setStatusWeight(flaggerClient clientset.Interface, cd *flaggerv1.Canary, va
cdCopy.Status.CanaryWeight = val
cdCopy.Status.LastTransitionTime = metav1.Now()
if err = updateStatusWithUpgrade(flaggerClient, cdCopy); err != nil {
return fmt.Errorf("updateStatusWithUpgrade failed: %w", err)
}
err = updateStatusWithUpgrade(flaggerClient, cdCopy)
firstTry = false
return
})
@@ -118,9 +112,7 @@ func setStatusIterations(flaggerClient clientset.Interface, cd *flaggerv1.Canary
cdCopy.Status.Iterations = val
cdCopy.Status.LastTransitionTime = metav1.Now()
if err = updateStatusWithUpgrade(flaggerClient, cdCopy); err != nil {
return fmt.Errorf("updateStatusWithUpgrade failed: %w", err)
}
err = updateStatusWithUpgrade(flaggerClient, cdCopy)
firstTry = false
return
})
@@ -160,9 +152,7 @@ func setStatusPhase(flaggerClient clientset.Interface, cd *flaggerv1.Canary, pha
cdCopy.Status.Conditions = conditions
}
if err = updateStatusWithUpgrade(flaggerClient, cdCopy); err != nil {
return fmt.Errorf("updateStatusWithUpgrade failed: %w", err)
}
err = updateStatusWithUpgrade(flaggerClient, cdCopy)
firstTry = false
return
})