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

No more nondistributable layers in MS registry #8685

Merged
merged 1 commit into from
Jun 14, 2023

Conversation

estesp
Copy link
Member

@estesp estesp commented Jun 13, 2023

Microsoft announced the removal of nondistributable layers from their images today. This makes the convert test fail since it assumes the first layer is nondistributable on Windows during the test.

Microsoft announced the removal of nondistributable layers from their
images today. This makes the convert test fail since it assumes the
first layer is nondistributable on Windows during the test.

Signed-off-by: Phil Estes <estesp@amazon.com>
@estesp estesp added cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jun 13, 2023
@estesp
Copy link
Member Author

estesp commented Jun 13, 2023

@estesp
Copy link
Member Author

estesp commented Jun 13, 2023

A quick survey of all uses, this looks like the only test that works with upstream/registry content; the rest create test-originated manifests with the nondistributable media type. Uses in the containerd code base seem to all be switch statements on the various media types and make no assumptions that there has to be non-distributable layers.

@akhilerm
Copy link
Member

Question: Does the windows test image that we use always have a single layer.

It doesnt matter with this change, but got confused how this test may have passed if we were using an image with multiple layers

@dcantah
Copy link
Member

dcantah commented Jun 14, 2023

@akhilerm Yea, nanoserver (at least 2019 and 2022, not sure about prior) has one layer from what I've seen. We might've been getting lucky 😆

@dmcgowan dmcgowan added this pull request to the merge queue Jun 14, 2023
Merged via the queue into containerd:main with commit 78b4af7 Jun 14, 2023
@estesp estesp deleted the no-nondistributable-layers branch June 14, 2023 17:53
@estesp estesp added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jun 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants