Fix macos only chart update cmd #15
Merged
Conversation
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
Contributor
Author
|
/cc @msvticket |
msvticket
requested changes
Oct 23, 2024
Member
msvticket
left a comment
msvticket
left a comment
There was a problem hiding this comment.
Added a target due to some makefile conformity.
What do you mean by this?
Makefile
Outdated
|
|
||
| fetch: prep | ||
| # Set value in Chart.yaml | ||
| yq eval -i '.appVersion = "$(shell yq eval '.data.version | sub("v"; "")' ${CHART_DIR}/templates/dashboard-info-cm.yaml)"' ${CHART_DIR}/Chart.yaml |
Member
There was a problem hiding this comment.
I think this would be cleaner
Suggested change
| yq eval -i '.appVersion = "$(shell yq eval '.data.version | sub("v"; "")' ${CHART_DIR}/templates/dashboard-info-cm.yaml)"' ${CHART_DIR}/Chart.yaml | |
| yq -i '.appVersion = (load("$(CHART_DIR)/templates/dashboard-info-cm.yaml").data.version | sub("v"; ""))' Chart.yaml |
Contributor
Author
There was a problem hiding this comment.
Hi Marten.. I tried a few ways of updating Chart.yaml with nested conditionals (to decipher the OS) inside the existing ifneq. That pushed me to change direction and add the new target with a dependency.
Thanks for the suggestion - your cmd actually works as part of the original target "fetch".. I have reverted some of the code and kept your version of the yq cmd.
Pushing again - cheers!
msvticket
approved these changes
Oct 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
The makefile sed cmd to update Chart.yaml only worked on macos.. (sed -i ""...)
Slightly changed direction.. I've taken the version value from a file created from the split manifest.. We have no need to check for "latest" in that sense.
Added a target due to some makefile conformity.. Resulting version update to the Charts.yaml file has dbl quotes in the value.