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.

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

[Backport release-1.25] Clear error in Helm chart status after successful reconciliation #3097

Merged
merged 2 commits into from May 10, 2023

Conversation

k0s-bot
Copy link

@k0s-bot k0s-bot commented May 10, 2023

Automated backport to release-1.25, triggered by a label in #3092.
See #3070 #3045.

* Use WithError to report errors in logs
* Use error wrapping in fmt.Errorf where applicable
* Raise log level from trace to debug for some log statements
* Don't log-and-return errors
* Fix typo: reconcilation

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit 03ec4f0)
(cherry picked from commit a88dba3)
(cherry picked from commit c7c9859)
Whenever errors occur during the reconciliation of Helm charts, they are
recorded in the error field of the Chart resource. However, the error
status field was not cleared after a subsequent successful
reconciliation, which caused the Chart resource's status to erroneously
report the chart application as failed, even if it had recovered. To
address this, the error status should be cleared whenever there are no
errors.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit d9bc239)
(cherry picked from commit 8cacb4d)
(cherry picked from commit 734809d)
@k0s-bot k0s-bot requested a review from a team as a code owner May 10, 2023 08:07
@twz123 twz123 changed the title [Backport release-1.25] [Backport release-1.26] Clear error in Helm chart status after successful reconciliation [Backport release-1.25] Clear error in Helm chart status after successful reconciliation May 10, 2023
@twz123 twz123 added bug Something isn't working area/helm backport/release-1.24 PR that needs to be backported/cherrypicked to release-1.24 branch labels May 10, 2023
@twz123 twz123 merged commit 91a008e into release-1.25 May 10, 2023
61 checks passed
@twz123 twz123 deleted the backport-3092-to-release-1.25 branch May 10, 2023 10:48
@k0s-bot
Copy link
Author

k0s-bot commented May 10, 2023

Backport failed for release-1.24, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-1.24
git worktree add -d .worktree/backport-3097-to-release-1.24 origin/release-1.24
cd .worktree/backport-3097-to-release-1.24
git checkout -b backport-3097-to-release-1.24
ancref=$(git merge-base 1dd361c23625d9371f84d9cc8bac62897ebe839f 500917163d69a8f682ac90e85d019b7d8106485c)
git cherry-pick -x $ancref..500917163d69a8f682ac90e85d019b7d8106485c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm backport/release-1.24 PR that needs to be backported/cherrypicked to release-1.24 branch bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants