fix: correctly copy Helm charts in init container #1018
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
During upgrades the init container was incorrectly copying the whole directory, instead of just the tars. ``` # bundles directory in the container $ ls /helm-charts/bundles/ charts helm-charts-v0.14.6.tar helm-charts-v0.14.9.tar helm-charts-v0.23.1.tar # incorrectly nested directory with the new charts $ ls /helm-charts/bundles/charts/ helm-charts-v0.14.6.tar helm-charts-v0.14.9.tar helm-charts-v0.25.0.tar ``` The file gets copied correctly when the directory does not exist: ``` $ cp -r charts/ dst/ $ ls dst foo.tar ``` When the dir already exists (ie upgrade scenario), the whole directory gets copied: ``` $ mkdir dst $ cp -r charts/ dst/ $ ls dst charts ``` Copying the file works correctly into an existing dst if using .: ``` $ mkdir dst $ cp -r charts/. dst/ $ ls dst foo.tar ```
supershal
approved these changes
Jan 21, 2025
jimmidyson
reviewed
Jan 22, 2025
charts/cluster-api-runtime-extensions-nutanix/templates/helm-repository.yaml
Outdated
Show resolved
Hide resolved
jimmidyson
approved these changes
Jan 23, 2025
Merged
dkoshkin
added a commit
that referenced
this pull request
Feb 5, 2025
🤖 I have created a release *beep* *boop* --- ## 0.26.0 (2025-02-05) <!-- Release notes generated using configuration in .github/release.yaml at main --> ## What's Changed ### Exciting New Features 🎉 * feat: adds new field for helm values input for cilium CNI by @manoj-nutanix in #1011 * feat: implementation for user defined configmap for cilium addon in cluster creation by @manoj-nutanix in #1033 * feat: update CAPI to v1.9.3 by @dkoshkin in #1010 * feat: adds cluster's ownerref on cilium helm values source object by @manoj-nutanix in #1034 ### Fixes 🔧 * fix: correctly copy Helm charts in init container by @dkoshkin in #1018 * fix: Use mindthegap v1.17.0 for the helm-repository container by @dlipovetsky in #1024 * fix: use republished COSI controller image by @dkoshkin in #1022 ### Other Changes * test: wait for COSI controller to be ready by @dkoshkin in #1014 * refactor: Remove api module dependency from common module by @jimmidyson in #1019 **Full Changelog**: v0.25.0...v0.26.0 --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Dimitri Koshkin <[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.
During upgrades the init container was incorrectly copying the whole directory, instead of just the tars.
What problem does this PR solve?:
Which issue(s) this PR fixes:
Fixes #
How Has This Been Tested?:
The file gets copied correctly when the directory does not exist:
When the dir already exists (ie upgrade scenario), the whole directory gets copied:
Copying the file works correctly into an existing dst if using .:
Special notes for your reviewer: