Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Prepare 1.7.x #3422

Merged
merged 30 commits into from
Sep 10, 2024
Merged

Prepare 1.7.x #3422

merged 30 commits into from
Sep 10, 2024

Conversation

Shubhranshu153
Copy link
Contributor

Updating dependencies for the release

dependabot bot and others added 9 commits September 8, 2024 13:20
@dependabot @Shubhranshu153
build(deps): bump github.com/containerd/accelerated-container-image
209c320 
Bumps [github.com/containerd/accelerated-container-image](https://github.com/containerd/accelerated-container-image) from 1.0.4 to 1.1.2.
- [Release notes](https://github.com/containerd/accelerated-container-image/releases)
- [Commits](containerd/accelerated-container-image@v1.0.4...v1.1.2)

---
updated-dependencies:
- dependency-name: github.com/containerd/accelerated-container-image
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@Shubhranshu153
update Dockerfile go version to 1.22 to support containerd v2 builds
80762fb 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@AkihiroSuda @Shubhranshu153
update CNI plugins (1.5.1)
5c27256 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@pendo324 @Shubhranshu153
chore: update runc to v1.1.14
a437e4b 
Signed-off-by: Justin Alvarez <alvajus@amazon.com>
@Shubhranshu153
fix: Test create with mac address after updating cni version
f3a1869 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@CodeChanning @Shubhranshu153
feat: support for --sig-proxy in run
4f68270 
Signed-off-by: CodeChanning <chxgaddy@amazon.com>
@CodeChanning @Shubhranshu153
feat: support for -a and --attach in run
96bf9ea 
Signed-off-by: CodeChanning <chxgaddy@amazon.com>
@CodeChanning @Shubhranshu153
feat: add Status and ID as event attributes
2b61e68 
Signed-off-by: CodeChanning <chxgaddy@amazon.com>
@CodeChanning @Shubhranshu153
feat: adding filter infrastructure + status and event filter
d97ca7d 
Signed-off-by: CodeChanning <chxgaddy@amazon.com>
@chews93319 @Shubhranshu153
Include init NetworkSettings within inspect response
48824a7 
Related to
[containerd#3310](containerd#3310)

New behavior will always initialize a NetworkSettings entity
for the inspect response, including Ports child member.

If inspecting a running container with published ports,
then all information will be correctly returned.
If inspecting a running container without published ports,
then NetworkSettings will include an initialized Ports member.
If inspecting a stopped/exited container,
then an entirely initialized, "empty-value" NetworkSettings
is returned.

Signed-off-by: Sam Chew <stchew@amazon.com>
@Shubhranshu153
fix: Update Test for CNI plugin upgrade
a8a63b9 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@Shubhranshu153
Copy link
Contributor Author

@AkihiroSuda This test TestRunContainerWithMACAddress seems to not docker compat after CNI plugins upgrade
Is the recommendation is to upgrade docker and port the fixes made in main to this branch?

@AkihiroSuda
Copy link
Member

@AkihiroSuda This test TestRunContainerWithMACAddress seems to not docker compat after CNI plugins upgrade Is the recommendation is to upgrade docker and port the fixes made in main to this branch?

I think you can rollback the Docker version (v25? v24?) on the CI and call it a day

Like this:

AkihiroSuda
AkihiroSuda reviewed Sep 8, 2024
View reviewed changes
Dockerfile Outdated Show resolved Hide resolved
Shubhranshu153 and others added 13 commits September 9, 2024 01:43
@Shubhranshu153
fix: Anchor Docer Version to v24 and update dependencies
4f8a66f 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@AkihiroSuda @Shubhranshu153
update BuildKit (0.15.2)
22c59a0 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@yankay @Shubhranshu153
update imgcrypt (1.1.11)
002b037 
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
@AkihiroSuda @Shubhranshu153
update slirp4netns (1.3.1)
ce82888 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda @Shubhranshu153
update RootlessKit (2.3.1)
5012ba8 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda @Shubhranshu153
update bypass4netns (0.4.1)
d4fdd9b 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda @Shubhranshu153
update Kubo (0.29.0)
149f87c 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda @Shubhranshu153
update Go (1.23)
47164ce 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda @Shubhranshu153
CI: update Ubuntu (24.04)
553d52b 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@Shubhranshu153
Update go mod and go sum
658a95b 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@AkihiroSuda @Shubhranshu153
update Nydus (2.2.5)
d447f54 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda @Shubhranshu153
update soci-snapshotter (0.7.0)
3e7af3b 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@dependabot @Shubhranshu153
build(deps): bump tonistiigi/xx from 1.4.0 to 1.5.0
e974cc5 
Bumps tonistiigi/xx from 1.4.0 to 1.5.0.

---
updated-dependencies:
- dependency-name: tonistiigi/xx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
AkihiroSuda
AkihiroSuda reviewed Sep 8, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@apostasie
Copy link
Contributor

For test that pass i see errors:
is this expected?

That is because the tests and test suite are retried multiple times when they fail.
Failures are still listed, but they do not fail the run if they passed at least once :/.
#3400

@Shubhranshu153
Copy link
Contributor Author

Updated the golint version, it seems there are some undefined pkg, which doesnt seem to be correct,

@Shubhranshu153
Update golangci-lint version and go mod cleanup
2df0c94 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@apostasie
Copy link
Contributor

Updated the golint version, it seems there are some undefined pkg, which doesnt seem to be correct,

Updated golang & golinter will require additional fixes. Some were fixed here: https://github.com/containerd/nerdctl/pull/3321/files

@apostasie @Shubhranshu153
Fix S1009 (see https://staticcheck.dev/docs/checks#S1009)
02d73cc 
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@Shubhranshu153 Shubhranshu153 force-pushed the prepare-1.7.x branch 3 times, most recently from 006599f to 49be4c0 Compare September 9, 2024 01:44
@Shubhranshu153
Update deprecated packages
7cab42c 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
@Shubhranshu153
Copy link
Contributor Author

@AkihiroSuda / @apostasie
Updated in conformance to linter.
One test suite is failing due to to flakiness, Can we rerun it.

Thanks

@AkihiroSuda AkihiroSuda added this to the v1.7.7 milestone Sep 9, 2024
@apostasie
Copy link
Contributor

@Shubhranshu153 hard work porting these... 👍

Went through the changes - looks good - and CI is green.

Curious why the docker-compat testing suite got held back on ubuntu 22.04 - but then I don't think it matters.

@Shubhranshu153
Copy link
Contributor Author

Shubhranshu153 commented Sep 9, 2024 •
edited
Loading

Not sure, in the main it was 22.04 so i kept 22.04.

@Shubhranshu153
Copy link
Contributor Author

Considering the changes are ok, was wondering what are the next steps required for releasing it.
Thanks.

@apostasie
Copy link
Contributor

Not sure, in the main it was 22.04 so i kept 22.04.

Isn't it 24.04 on main? https://github.com/containerd/nerdctl/blob/main/.github/workflows/test.yml#L258-L259 (again, not a big deal anyhow, mere curiosity)

Considering the changes are ok, was wondering what are the next steps required for releasing it.

@AkihiroSuda (or other maintainers) for this ^.

@Shubhranshu153
Copy link
Contributor Author

ah i see i was porting some commits and it had the comment and didnt notice it has been fixed, updating it

@Shubhranshu153 Shubhranshu153 force-pushed the prepare-1.7.x branch 2 times, most recently from 40047c6 to 7cab42c Compare September 9, 2024 05:27
@Shubhranshu153
Copy link
Contributor Author

@apostasie Not updating the docker compat one to 24.04, seems stable release doesn't have a docker 24 release
https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64/

@Shubhranshu153
Update containerd version to 1.7.22
a803e60 
Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>
AkihiroSuda
AkihiroSuda approved these changes Sep 10, 2024
View reviewed changes
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 5882c72 into containerd:release/1.7 Sep 10, 2024
27 checks passed
@AkihiroSuda
Copy link
Member

Released
https://github.com/containerd/nerdctl/releases/tag/v1.7.7

@github-actions github-actions bot mentioned this pull request Sep 25, 2024
Open
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.7.7
Development

Successfully merging this pull request may close these issues.
7 participants
@Shubhranshu153 @AkihiroSuda @apostasie @pendo324 @CodeChanning @chews93319 @yankay