Skip to content

Fix config import relative path glob#9746

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
neoaggelos:fix/config-glob
Feb 16, 2024
Merged

Fix config import relative path glob#9746
dmcgowan merged 1 commit intocontainerd:mainfrom
neoaggelos:fix/config-glob

Conversation

@neoaggelos
Copy link
Copy Markdown
Contributor

Summary

Closes #9745

Notes

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.

@k8s-ci-robot
Copy link
Copy Markdown

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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions 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
Copy link
Copy Markdown
Contributor Author

/retest

@k8s-ci-robot
Copy link
Copy Markdown

@neoaggelos: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

Instructions 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.

@mxpv
Copy link
Copy Markdown
Member

mxpv commented Feb 13, 2024

/ok-to-test

@dmcgowan dmcgowan added this pull request to the merge queue Feb 16, 2024
Merged via the queue into containerd:main with commit d346aee Feb 16, 2024
@chrishenzie chrishenzie added the cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch label Apr 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch ok-to-test size/S

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Glob pattern matching not applied to relative paths

5 participants