Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

push: always inherit distribution sources from parent #9280

Merged
merged 1 commit into from
Nov 22, 2023

Conversation

vvoland
Copy link
Contributor

@vvoland vvoland commented Oct 20, 2023

Propagate parent distribution source labels to each of its children even if they're not missing. This allows to cross-repo mount blobs when the child content has different distribution source label from its parent manifest/index. This could happen when different parts of image were fetched from different sources.

This extends the behavior from #9029 to all content (not only the missing content).

@k8s-ci-robot
Copy link

Hi @vvoland. 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.

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.

@dmcgowan dmcgowan added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Oct 26, 2023
@cpuguy83
Copy link
Member

/ok-to-test

@estesp
Copy link
Member

estesp commented Nov 17, 2023

We either need to overlook the win-2019 test failure, or @vvoland needs to rebase on current HEAD to pick up the temp removal of windows-2019 (merged a few days after this contribution) from the matrix while we figure out the mingw/crash issue on 2019.

Propagate parent distribution source labels to each of its children even
if they're not missing. This allows to cross-repo mount blobs when the
child content has different distribution source label from its
parent manifest/index. This could happen when different parts of image
were fetched from different sources.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland force-pushed the push-inherit-distribution-source branch from 5a1c72c to c51d4f9 Compare November 20, 2023 14:06
@vvoland
Copy link
Contributor Author

vvoland commented Nov 20, 2023

Rebased

@dmcgowan dmcgowan added this pull request to the merge queue Nov 22, 2023
Merged via the queue into containerd:main with commit d682b16 Nov 22, 2023
40 checks passed
@samuelkarp
Copy link
Member

/cherrypick release/1.7

@k8s-infra-cherrypick-robot

@samuelkarp: new pull request created: #9452

In response to this:

/cherrypick release/1.7

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.

@samuelkarp samuelkarp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Dec 1, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants