Skip to content

update canary status before eventing #1780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+23 −10
Open

update canary status before eventing #1780

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a65b0ea
update canary status before eventing
luisr-escobar Mar 16, 2025
0016895
move recordEventInfof to end
luisr-escobar Mar 21, 2025
61d8bc9
record warning
luisr-escobar Mar 21, 2025
c6fa05e
move status sync under shouldAdvance
luisr-escobar Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions pkg/controller/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,6 @@ func (c *Controller) advanceCanary(name string, namespace string) {

// check if canary revision changed during analysis
if restart := c.hasCanaryRevisionChanged(cd, canaryController); restart {
c.recordEventInfof(cd, "New revision detected! Restarting analysis for %s.%s",
cd.Spec.TargetRef.Name, cd.Namespace)

// route all traffic back to primary
primaryWeight = c.totalWeight(cd)
canaryWeight = 0
Expand All @@ -339,6 +336,16 @@ func (c *Controller) advanceCanary(name string, namespace string) {
if err := canaryController.SyncStatus(cd, status); err != nil {
c.recordEventWarningf(cd, "%v", err)
}

cd, err = c.flaggerClient.FlaggerV1beta1().Canaries(cd.Namespace).Get(context.TODO(), cd.Name, metav1.GetOptions{})
if err != nil {
c.recordEventWarningf(cd, "%v", err)
return
}

c.recordEventInfof(cd, "New revision detected! Restarting analysis for %s.%s",
cd.Spec.TargetRef.Name, cd.Namespace)

return
}

Expand Down Expand Up @@ -866,6 +873,12 @@ func (c *Controller) checkCanaryStatus(canary *flaggerv1.Canary, canaryControlle
}

var err error
// update canary status to ensure checksum is up to date in all webhooks
if err := canaryController.SyncStatus(canary, flaggerv1.CanaryStatus{Phase: flaggerv1.CanaryPhaseProgressing}); err != nil {
Copy link
Member

@stefanprodan stefanprodan Mar 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will break the whole thing, we can't set CanaryPhaseProgressing here, the canary status is synced only in shouldAdvance.

Copy link
Author

@luisr-escobar luisr-escobar Mar 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stefanprodan local integration tests are passing and also validated that the image generated by this change works on a dev cluster but to your point I've moved the code block under shouldAdvance

c.logger.With("canary", fmt.Sprintf("%s.%s", canary.Name, canary.Namespace)).Errorf("%v", err)
return false
}

canary, err = c.flaggerClient.FlaggerV1beta1().Canaries(canary.Namespace).Get(context.TODO(), canary.Name, metav1.GetOptions{})
if err != nil {
c.logger.With("canary", fmt.Sprintf("%s.%s", canary.Name, canary.Namespace)).Errorf("%v", err)
Expand Down