Skip to content
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

Jump to bottom

Aligns output with source-controller on no-ops #431

Merged
merged 2 commits into from
Sep 5, 2022
Merged

Aligns output with source-controller on no-ops #431

merged 2 commits into from
Sep 5, 2022

Conversation

pjbgf
Copy link
Member

@pjbgf pjbgf commented Sep 5, 2022

No-op reconciliations now yield a message such as below even when log level is set to info, which aligns with source-controller behaviour:

{"level":"info","ts":"2022-09-05T08:43:59.516Z","msg":"no changes made in working directory; no commit","controller":"imageupdateautomation","controllerGroup":"image.toolkit.fluxcd.io","controllerKind":"ImageUpdateAutomation","imageUpdateAutomation":{"name":"github-branch","namespace":"flux-system"},"namespace":"flux-system","name":"github-branch","reconcileID":"4ee714d8-5986-45fd-9f54-33d882b81cde"}

Custom code to record metrics was replaced with helper.Metrics.

stefanprodan
stefanprodan approved these changes Sep 5, 2022
View reviewed changes
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @pjbgf

@pjbgf pjbgf mentioned this pull request Sep 5, 2022
Closed
@pjbgf pjbgf changed the base branch from git-refactoring to main September 5, 2022 10:07
Paulo Gomes added 2 commits September 5, 2022 14:02
Log when no changes were made
735ab61 
This gets the behaviour a step closer to Source Controller
which logs after every reconciliation, even when no changes
were made.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
Use helper.Metrics for recording metrics
06f4acd 
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
@pjbgf pjbgf added this to the GA milestone Sep 5, 2022
@pjbgf pjbgf merged commit a7435ed into fluxcd:main Sep 5, 2022
@pjbgf pjbgf deleted the align-output branch September 8, 2022 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanprodan stefanprodan stefanprodan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Maintainers' Focus
Status: Done
Milestone
GA
Development

Successfully merging this pull request may close these issues.
2 participants
@pjbgf @stefanprodan