Skip to content

[release/2.1] Update transfer service supported platforms logic#11999

Merged
estesp merged 1 commit intocontainerd:release/2.1from
k8s-infra-cherrypick-robot:cherry-pick-11927-to-release/2.1
Jun 19, 2025
Merged

[release/2.1] Update transfer service supported platforms logic#11999
estesp merged 1 commit intocontainerd:release/2.1from
k8s-infra-cherrypick-robot:cherry-pick-11927-to-release/2.1

Conversation

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

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Jun 19, 2025

This is an automated cherry-pick of #11927

/assign dmcgowan

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Jun 19, 2025
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 19, 2025
Merged
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Jun 19, 2025

Hi @k8s-infra-cherrypick-robot. 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-sigs/prow repository.

@dosubot dosubot Bot added the area/distribution Image Distribution label Jun 19, 2025
@dims
Copy link
Copy Markdown
Member

dims commented Jun 19, 2025

Probably still needs work

 core/transfer/local/export.go:1: : # github.com/containerd/containerd/v2/core/transfer/local [github.com/containerd/containerd/v2/core/transfer/local.test]
  Error: core/transfer/local/pull_test.go:125:36: t.Context undefined (type *testing.T has no field or method Context, but does have unexported field context) (typecheck)
  /*

@dmcgowan
Update transfer supported platforms logic
3c5ede8 
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]>
@dmcgowan dmcgowan force-pushed the cherry-pick-11927-to-release/2.1 branch from 77b627a to 3c5ede8 Compare June 19, 2025 14:31
@dmcgowan dmcgowan changed the title [release/2.1] Update transfer supported platforms logic [release/2.1] Update transfer service supported platforms logic Jun 19, 2025
mikebrow
mikebrow approved these changes Jun 19, 2025
View reviewed changes
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 on green

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 19, 2025
@dmcgowan dmcgowan mentioned this pull request Jun 19, 2025
Merged
2 tasks
@estesp
Copy link
Copy Markdown
Member

estesp commented Jun 19, 2025

This issue is being pretty persistent; most likely a flake, but a very persistent flake 😅

------------------------------
+ [FAILED] [6.853 seconds]
[k8s.io] Streaming runtime should support streaming interfaces [It] runtime should support exec with tty=true and stdin=true [Conformance]
github.com/kubernetes-sigs/cri-tools/pkg/validate/streaming.go:88
  Timeline >>
  STEP: create a default container @ 06/19/25 17:38:53.296
  STEP: Get image status for image: registry.k8s.io/e2e-test-images/busybox:1.29-2 @ 06/19/25 17:38:53.296
  STEP: Create container. @ 06/19/25 17:38:53.296
  Jun 19 17:38:53.[41](https://github.com/containerd/containerd/actions/runs/15760320335/job/44433456037?pr=11999#step:23:42)8: INFO: Created container "d6441be8a38ea0d66e7c455a3c72fc92cc60f8bf2b[42](https://github.com/containerd/containerd/actions/runs/15760320335/job/44433456037?pr=11999#step:23:43)044c5f29d42217239eb6"
  STEP: start container @ 06/19/25 17:38:53.418
  STEP: Start container for containerID: d6441be8a38ea0d66e7c455a3c72fc92cc60f8bf2b42044c5f29d42217239eb6 @ 06/19/25 17:38:53.418
  Jun 19 17:38:54.511: INFO: Started container "d6[44](https://github.com/containerd/containerd/actions/runs/15760320335/job/44433456037?pr=11999#step:23:45)1be8a38ea0d66e7c[45](https://github.com/containerd/containerd/actions/runs/15760320335/job/44433456037?pr=11999#step:23:46)5a3c72fc92cc60f8bf2b42044c5f29d42217239eb6"
  STEP: exec given command in container: d6441be8a38ea0d66e7c455a3c72fc92cc60f8bf2b42044c5f29d42217239eb6 @ 06/19/25 17:38:54.511
  Jun 19 17:38:54.512: INFO: Get exec url: http://127.0.0.1:58777/exec/X2-gBbSy
  STEP: check the output of exec @ 06/19/25 17:38:54.512
  Jun 19 17:38:54.518: INFO: Parse url "http://127.0.0.1:58777/exec/X2-gBbSy" succeed
  [FAILED] in [It] - github.com/kubernetes-sigs/cri-tools/pkg/validate/streaming.go:211 @ 06/19/25 17:38:55.289
  STEP: stop PodSandbox @ 06/19/25 17:38:55.289
  STEP: delete PodSandbox @ 06/19/25 17:38:58.873
  << Timeline
  [FAILED] The stdout of exec should contain hello
  Expected
      <string>: 
  to contain substring
      <string>: hello
  In [It] at: github.com/kubernetes-sigs/cri-tools/pkg/validate/streaming.go:211 @ 06/19/25 17:38:[55](https://github.com/containerd/containerd/actions/runs/15760320335/job/44433456037?pr=11999#step:23:56).289
------------------------------

@estesp estesp merged commit 948bd66 into containerd:release/2.1 Jun 19, 2025
222 of 232 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dims dims dims approved these changes

@mikebrow mikebrow mikebrow approved these changes

@austinvazquez austinvazquez austinvazquez approved these changes

Assignees

@dmcgowan dmcgowan

Labels

area/distribution Image Distribution impact/changelog needs-ok-to-test size/M

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@k8s-infra-cherrypick-robot @k8s-ci-robot @dims @estesp @mikebrow @austinvazquez @dmcgowan