Prepare 1.7.x by Shubhranshu153 · Pull Request #3422 · containerd/nerdctl

Shubhranshu153 · 2024-09-08T17:03:28Z

Updating dependencies for the release

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>

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Signed-off-by: Justin Alvarez <alvajus@amazon.com>

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Signed-off-by: CodeChanning <chxgaddy@amazon.com>

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>

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Shubhranshu153 · 2024-09-08T19:37:17Z

@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 · 2024-09-08T19:52:03Z

@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:

test-integration-docker-compatibility: install Docker v24 #3089

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Signed-off-by: Kay Yan <kay.yan@daocloud.io>

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

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 · 2024-09-08T22:26:22Z

test

Restarted. Seems green.

linter

Probably golangci-lint has to be updated

nerdctl/.github/workflows/test.yml

Lines 48 to 52 in 845e989

    
           - name: golangci-lint 
        
             uses: golangci/golangci-lint-action@v3.7.0 
        
             with: 
        
               version: v1.55.2 
        
               args: --verbose

apostasie · 2024-09-08T23:38:55Z

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 · 2024-09-09T00:24:38Z

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

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

apostasie · 2024-09-09T00:46:12Z

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

Signed-off-by: apostasie <spam_blackhole@farcloser.world>

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Shubhranshu153 · 2024-09-09T02:11:58Z

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

Thanks

apostasie · 2024-09-09T03:16:55Z

@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 · 2024-09-09T03:28:48Z

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

Shubhranshu153 · 2024-09-09T03:30:49Z

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

apostasie · 2024-09-09T04:29:44Z

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 · 2024-09-09T04:44:44Z

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

Shubhranshu153 · 2024-09-09T05:28:47Z

@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/

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

AkihiroSuda

Thanks

AkihiroSuda · 2024-09-10T07:01:00Z

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

dependabot Bot and others added 9 commits September 8, 2024 13:20

update Dockerfile go version to 1.22 to support containerd v2 builds

80762fb

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

update CNI plugins (1.5.1)

5c27256

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

chore: update runc to v1.1.14

a437e4b

Signed-off-by: Justin Alvarez <alvajus@amazon.com>

fix: Test create with mac address after updating cni version

f3a1869

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

feat: support for --sig-proxy in run

4f68270

Signed-off-by: CodeChanning <chxgaddy@amazon.com>

feat: support for -a and --attach in run

96bf9ea

Signed-off-by: CodeChanning <chxgaddy@amazon.com>

feat: add Status and ID as event attributes

2b61e68

Signed-off-by: CodeChanning <chxgaddy@amazon.com>

feat: adding filter infrastructure + status and event filter

d97ca7d

Signed-off-by: CodeChanning <chxgaddy@amazon.com>

Shubhranshu153 force-pushed the prepare-1.7.x branch from d302774 to 58035fc Compare September 8, 2024 18:08

Shubhranshu153 force-pushed the prepare-1.7.x branch from 58035fc to 48824a7 Compare September 8, 2024 18:39

fix: Update Test for CNI plugin upgrade

a8a63b9

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

AkihiroSuda reviewed Sep 8, 2024

View reviewed changes

Comment thread Dockerfile Outdated

Shubhranshu153 and others added 13 commits September 9, 2024 01:43

fix: Anchor Docer Version to v24 and update dependencies

4f8a66f

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

update BuildKit (0.15.2)

22c59a0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

update imgcrypt (1.1.11)

002b037

Signed-off-by: Kay Yan <kay.yan@daocloud.io>

update slirp4netns (1.3.1)

ce82888

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

update RootlessKit (2.3.1)

5012ba8

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

update bypass4netns (0.4.1)

d4fdd9b

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

update Kubo (0.29.0)

149f87c

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

update Go (1.23)

47164ce

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

CI: update Ubuntu (24.04)

553d52b

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Update go mod and go sum

658a95b

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

update Nydus (2.2.5)

d447f54

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

update soci-snapshotter (0.7.0)

3e7af3b

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

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>

Shubhranshu153 force-pushed the prepare-1.7.x branch from 32641d4 to 3e7dbeb Compare September 8, 2024 21:10

AkihiroSuda reviewed Sep 8, 2024

View reviewed changes

Comment thread go.mod Outdated

Shubhranshu153 force-pushed the prepare-1.7.x branch from 55d6b14 to eb9fcfb Compare September 9, 2024 00:00

AkihiroSuda reviewed Sep 9, 2024

View reviewed changes

Comment thread .github/workflows/test.yml Outdated

Update golangci-lint version and go mod cleanup

2df0c94

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Shubhranshu153 force-pushed the prepare-1.7.x branch from eb9fcfb to 2df0c94 Compare September 9, 2024 00:40

Fix S1009 (see https://staticcheck.dev/docs/checks#S1009)

02d73cc

Signed-off-by: apostasie <spam_blackhole@farcloser.world>

Shubhranshu153 force-pushed the prepare-1.7.x branch 3 times, most recently from 006599f to 49be4c0 Compare September 9, 2024 01:44

Update deprecated packages

7cab42c

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

Shubhranshu153 force-pushed the prepare-1.7.x branch from 49be4c0 to 7cab42c Compare September 9, 2024 01:47

AkihiroSuda added this to the v1.7.7 milestone Sep 9, 2024

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

AkihiroSuda reviewed Sep 10, 2024

View reviewed changes

Comment thread .github/workflows/test.yml Outdated

Update containerd version to 1.7.22

a803e60

Signed-off-by: Shubharanshu Mahapatra <shubhum@amazon.com>

AkihiroSuda approved these changes Sep 10, 2024

View reviewed changes

AkihiroSuda merged commit 5882c72 into containerd:release/1.7 Sep 10, 2024

Conversation

Shubhranshu153 commented Sep 8, 2024

Uh oh!

Shubhranshu153 commented Sep 8, 2024

Uh oh!

AkihiroSuda commented Sep 8, 2024

Uh oh!

Uh oh!

AkihiroSuda commented Sep 8, 2024

Uh oh!

Uh oh!

apostasie commented Sep 8, 2024

Uh oh!

Shubhranshu153 commented Sep 9, 2024

Uh oh!

Uh oh!

apostasie commented Sep 9, 2024

Uh oh!

Shubhranshu153 commented Sep 9, 2024

Uh oh!

apostasie commented Sep 9, 2024

Uh oh!

Shubhranshu153 commented Sep 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Shubhranshu153 commented Sep 9, 2024

Uh oh!

apostasie commented Sep 9, 2024

Uh oh!

Shubhranshu153 commented Sep 9, 2024

Uh oh!

Shubhranshu153 commented Sep 9, 2024

Uh oh!

Uh oh!

AkihiroSuda left a comment

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda commented Sep 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Shubhranshu153 commented Sep 9, 2024 •

edited

Loading