Skip to content

Update transfer supported platforms logic#11927

Merged
mikebrow merged 1 commit intocontainerd:mainfrom
dmcgowan:enhance-transfer-unpack-selection
Jun 9, 2025
Merged

Update transfer supported platforms logic#11927
mikebrow merged 1 commit intocontainerd:mainfrom
dmcgowan:enhance-transfer-unpack-selection

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Jun 2, 2025

Allow selection of a non-default snapshotter when no unpack snapshotter is specified.

Add more logging to help figure out why an unpack configuration is not used.

Allow selection of a non-default snapshotter when no unpack
snapshotter is specified.

Add more logging to help figure out why an unpack configuration is not
used.

Signed-off-by: Derek McGowan <[email protected]>
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Jun 2, 2025
@dmcgowan dmcgowan added cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch and removed size/M labels Jun 2, 2025
@dosubot dosubot Bot added the area/distribution Image Distribution label Jun 2, 2025
log.G(ctx).WithFields(log.Fields{
"platform": platforms.FormatAll(uc.Platform),
"snapshotter": uc.Snapshotter,
}).Info("Found unpack with matching snapshotter but platform does not match")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this something the customer should be warned about (could cause an issue)?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its not necessarily an error though. The caller will get an error is no platform ends up being matched and this may be helpful as to the hint why. Currently just a generic error is seen without anything useful in the logs to understand why.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #11606 as an example. There may be a follow-up after this change to correct for more cases or another bug which is causing that error.

} {
t.Run(testCase.Name, func(t *testing.T) {
m, sp := getSupportedPlatform(testCase.UnpackConfig, testCase.SupportedPlatforms)
m, sp := getSupportedPlatform(t.Context(), testCase.UnpackConfig, testCase.SupportedPlatforms)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh TIL, t.Context() that's nice.

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 7, 2025
@djdongjin djdongjin moved this from Review In Progress to Merge on Green in Pull Request Review Jun 7, 2025
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-project-automation github-project-automation Bot moved this from Merge on Green to Review In Progress in Pull Request Review Jun 9, 2025
@mikebrow mikebrow added this pull request to the merge queue Jun 9, 2025
Merged via the queue into containerd:main with commit 4d7381e Jun 9, 2025
122 of 128 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 9, 2025
@dmcgowan
Copy link
Copy Markdown
Member Author

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@dmcgowan: new pull request created: #11999

Details

In response to this:

/cherry-pick release/2.1

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-sigs/prow repository.

@dmcgowan dmcgowan added cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Jun 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/distribution Image Distribution cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

7 participants