[release/1.7] Fix config import relative path glob#9834
Merged
dmcgowan merged 1 commit intocontainerd:release/1.7from Apr 24, 2024
Merged
[release/1.7] Fix config import relative path glob#9834dmcgowan merged 1 commit intocontainerd:release/1.7from
dmcgowan merged 1 commit intocontainerd:release/1.7from
Conversation
|
Hi @neoaggelos. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Previously, resolveImports would apply a glob filter if the path contained any '*', or otherwise convert relative paths to absolute. This meant that it was impossible to specify globs with paths relative to the main config file. This commit first resolves relative to absolute paths, then applies the glob filter (if any). A test case is added to ensure that this now works as expected. Signed-off-by: Angelos Kolaitis <[email protected]>
neoaggelos
force-pushed
the
fix/config-relative
branch
from
05b4432 to
62e9535
Compare
neoaggelos
changed the title
mxpv
approved these changes
Feb 22, 2024
estesp
approved these changes
Feb 23, 2024
dmcgowan
approved these changes
Mar 8, 2024
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
5 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.
Summary
Backport #9746 to 1.7
Changes
Previously, resolveImports would apply a glob filter if the path contained any '*', or otherwise convert relative paths to absolute. This meant that it was impossible to specify globs with paths relative to the main config file.
This commit first resolves relative to absolute paths, then applies the glob filter (if any). A test case is added to ensure that this now works as expected.