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.27] Clear error in Helm chart status after successful reconciliation #3070

Merged
merged 2 commits into from May 9, 2023

Conversation

k0s-bot
Copy link

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

Automated backport to release-1.27, triggered by a label in #3053.
See #3045.

twz123 added 2 commits May 5, 2023 06:48
* 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)
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)
@twz123 twz123 added bug Something isn't working area/helm backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch labels May 5, 2023
@makhov makhov merged commit faf331b into release-1.27 May 9, 2023
71 checks passed
@makhov makhov deleted the backport-3053-to-release-1.27 branch May 9, 2023 07:01
@k0s-bot
Copy link
Author

k0s-bot commented May 9, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-1.26
git worktree add -d .worktree/backport-3070-to-release-1.26 origin/release-1.26
cd .worktree/backport-3070-to-release-1.26
git checkout -b backport-3070-to-release-1.26
ancref=$(git merge-base c71b9fc63c9183a58d75ff40a9bdf1a420bbc3bb 8cacb4def56adc0d24fce092d461d013eff74d64)
git cherry-pick -x $ancref..8cacb4def56adc0d24fce092d461d013eff74d64

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

Successfully merging this pull request may close these issues.

None yet

4 participants