fix: Remove incorrect yaml.LiteralStyle from helm values write-back#1291
Open
DeZin7 wants to merge 3 commits intoargoproj-labs:master-annotation-basedfrom
Open
fix: Remove incorrect yaml.LiteralStyle from helm values write-back#1291DeZin7 wants to merge 3 commits intoargoproj-labs:master-annotation-basedfrom
DeZin7 wants to merge 3 commits intoargoproj-labs:master-annotation-basedfrom
Conversation
DeZin7
requested review from
chengfang,
dkarpele,
ishitasequeira,
jannfis and
pasha-codefresh
as code owners
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1291 +/- ##
==========================================
- Coverage 70.85% 70.85% -0.01%
==========================================
Files 45 45
Lines 5178 5177 -1
==========================================
- Hits 3669 3668 -1
Misses 1344 1344
Partials 165 165 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This commit fixes a regression introduced between v0.14.0 and v0.17.0 where helm values files would be emptied or corrupted when using git write-back with helmvalues: target. The issue was caused by setting `Style: yaml.LiteralStyle` on the root MappingNode when initializing an empty helm values structure. The LiteralStyle is intended for scalar string values with block style (|), not for mapping nodes. This caused the YAML encoder to produce incorrect or empty output when marshaling the structure back to YAML. This regression affected users with multi-source applications using separate image-name and image-tag annotations with helmvalues write-back, resulting in their values files being deleted on update. Fixes: Regression between v0.14.0 and v0.17.0 Testing: All existing tests pass with this change Signed-off-by: DeZin7 <marcusandre77@icloud.com>
Signed-off-by: Cheng Fang <cfang@redhat.com> Signed-off-by: DeZin7 <marcusandre77@icloud.com>
DeZin7
force-pushed
the
fix/helm-values-literal-style-regression
branch
from
f8b5bc0 to
cb9ddf5
Compare
Collaborator
|
Can you enhance one of the tests in argocd-image-updater/pkg/argocd/update_test.go Line 2245 in 2c92bc8 I tried some tests but couldn't reproduce the bug. The style |
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1289
This commit fixes a regression introduced between v0.14.0 and v0.17.0 where helm values files would be emptied or corrupted when using git write-back with helmvalues: target.
The issue was caused by setting
Style: yaml.LiteralStyleon the root MappingNode when initializing an empty helm values structure. The LiteralStyle is intended for scalar string values with block style (|), not for mapping nodes. This caused the YAML encoder to produce incorrect or empty output when marshaling the structure back to YAML.This regression affected users with multi-source applications using separate image-name and image-tag annotations with helmvalues write-back, resulting in their values files being deleted on update.
Fixes: Regression between v0.14.0 and v0.17.0
Testing: All existing tests pass with this change