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

[release/1.7] Cherry Pick Commits required to support dev containers using nerdctl and finch #3286

Closed
wants to merge 7 commits into from

Conversation

Shubhranshu153
Copy link
Contributor

Based on the discussions on #3247
Backporting the contributions made to be able to support dev containers.

@Shubhranshu153 Shubhranshu153 force-pushed the 1.7 branch 4 times, most recently from 984f215 to 4d60439 Compare August 13, 2024 06:12
Signed-off-by: Shubharanshu Mahapatra <[email protected]>
@Shubhranshu153 Shubhranshu153 force-pushed the 1.7 branch 3 times, most recently from 45d97b3 to 505445c Compare August 13, 2024 14:49
Signed-off-by: Shubharanshu Mahapatra <[email protected]>
@AkihiroSuda
Copy link
Member

commit "update testutil pkg version" should be squashed into commit "feat: adding filter infrastructure + status and event filter"

@AkihiroSuda
Copy link
Member

CI update: remove containerd main test

Why?

@Shubhranshu153
Copy link
Contributor Author

Shubhranshu153 commented Aug 15, 2024

That commit needs a bit of rework and want to add test for containerd 1.7.20 .
From what i understand
containerd: main is analogous to containerd: v2.0.0-rc.X and which would be supported by nerdctl main : 2.x releases.
As this is for a 1.7 branch release it would support containerd 1.7.x releases which is not in main.

if this understanding is wrong would revert it.

@AkihiroSuda
Copy link
Member

As this is for a 1.7 branch release it would support containerd 1.7.x releases which is not in main.

nerdctl v1.7 should continue to work with containerd v2.
If something is not working and its not mentioned in containerd v2 release note, it is likely to be a bug. Please open an issue in that case.

@AkihiroSuda AkihiroSuda changed the title Cherry Pick Commits required to support dev containers using nerdctl and finch [release/1.7] Cherry Pick Commits required to support dev containers using nerdctl and finch Aug 17, 2024
1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 cni-plugins-linux-amd64-v1.4.1.tgz
72644e13557cda8a5b39baf97fc5e93d23fdf7baba7700000e7e9efd8bdf9234 cni-plugins-linux-arm64-v1.4.1.tgz
2a0ea7072d1806b8526489bcd3b4847a06ab010ee32ba3c3d4e5a3235d3eb138 cni-plugins-linux-amd64-v1.4.1.tgz
56fe62d73942cffd8f119d2b8ecb6a062e85f529a3dbfc7aa5cd83c2c01929a7 cni-plugins-linux-arm64-v1.4.1.tgz
Copy link
Member

Choose a reason for hiding this comment

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

Probably CNI plugins (and also other components) should be just updated to the latest version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will create a separate profile to update this branch and then do the cherry pick. Thanks for the comments

Copy link
Member

Choose a reason for hiding this comment

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

What do you mean by "profile"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry that was auto from the keyboard, I meant pr

@Shubhranshu153
Copy link
Contributor Author

Yeah will update the test and probably do some back porting as I see even for nerdctl to 1.7.20 there are some changes in the mainline.

@AkihiroSuda
Copy link
Member

Do you also want to cherry-pick:

@Shubhranshu153
Copy link
Contributor Author

Yes I do want to cherry pick that for the network response. For the identifiers PR I am not sure if i should add to it, technically the issue I get is there are few of cases where the volume name is long and that leads to failure. But the identifiers PR it has a backward incompatibility for the min length (1). Without that Dev containers would work but with errors in certain cases.

@AkihiroSuda
Copy link
Member

The identifier one seems risky for backporting.

@Shubhranshu153
Copy link
Contributor Author

I do agree that one is risky. Will keep that out of the backport

@AkihiroSuda
Copy link
Member

You may also want to update runc
https://github.com/opencontainers/runc/releases/tag/v1.1.14

@Shubhranshu153
Copy link
Contributor Author

this one is closed in another pr.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants