Don't parse userdata and userdata.yaml #58
Merged
Conversation
This file contains 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
yip writes both files with the same content when userdata passes validation (schema.Load): https://github.com/mudler/yip/blob/48147fae9dbcc91559cd590976816ca3f65a3bff/pkg/plugins/datasource.go#L246-L252 This means we shouldn't match `userdata` since the `userdata.yaml` will be used due to the extension. Fixes kairos-io/kairos#2019 Signed-off-by: Dimitris Karakasilis <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #58 +/- ##
=======================================
Coverage 46.59% 46.59%
=======================================
Files 12 12
Lines 880 880
=======================================
Hits 410 410
Misses 406 406
Partials 64 64 ☔ View full report in Codecov by Sentry. |
|
good catch! |
Itxaka
approved these changes
Nov 23, 2023
jimmykarily
added a commit
to kairos-io/kairos-agent
that referenced
this pull request
Nov 23, 2023
bump kairos-sdk to consume this: kairos-io/kairos-sdk#58 Signed-off-by: Dimitris Karakasilis <[email protected]>
jimmykarily
added a commit
to kairos-io/kairos
that referenced
this pull request
Nov 24, 2023
fixed here: kairos-io/kairos-sdk#58 This commit makes sure we test this for regressions and pulls the fix in. Signed-off-by: Dimitris Karakasilis <[email protected]>
jimmykarily
added a commit
to kairos-io/kairos
that referenced
this pull request
Nov 24, 2023
fixed here: kairos-io/kairos-sdk#58 This commit makes sure we test this for regressions and pulls the fix in. Signed-off-by: Dimitris Karakasilis <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
yip writes both files with the same content when userdata passes validation (schema.Load):
https://github.com/mudler/yip/blob/48147fae9dbcc91559cd590976816ca3f65a3bff/pkg/plugins/datasource.go#L246-L252
This means we shouldn't match
userdatasince theuserdata.yamlwill be used due to the extension.Fixes kairos-io/kairos#2019