Skip to content

CRI: always set unknown to false when handling exit event#4656

Merged
estesp merged 1 commit intocontainerd:masterfrom
zhuangqh:fix-unknown-state
Oct 27, 2020
Merged

CRI: always set unknown to false when handling exit event#4656
estesp merged 1 commit intocontainerd:masterfrom
zhuangqh:fix-unknown-state

Conversation

@zhuangqh
Copy link
Copy Markdown
Contributor

@zhuangqh zhuangqh commented Oct 26, 2020

fixes: #4655

Signed-off-by: jerryzhuang [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

Hi @zhuangqh. 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/test-infra repository.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 26, 2020

Build succeeded.

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Oct 26, 2020

/ok-to-test

@AkihiroSuda
Copy link
Copy Markdown
Member

Signed-off-by: zhuangqh

Please use full name for signing

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 26, 2020

Build succeeded.

@fuweid fuweid requested a review from mikebrow October 26, 2020 11:54
@dims
Copy link
Copy Markdown
Member

dims commented Oct 26, 2020

LGTM

@dims
Copy link
Copy Markdown
Member

dims commented Oct 26, 2020

yes, please cherry pick to previous versions!

@dims
Copy link
Copy Markdown
Member

dims commented Oct 26, 2020

I am hoping this helps with kubernetes/kubernetes#51835

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.

see comment

Comment thread pkg/cri/server/events.go Outdated
@zhuangqh zhuangqh requested a review from mikebrow October 27, 2020 01:59
Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 839b136 into containerd:master Oct 27, 2020
@mikebrow
Copy link
Copy Markdown
Member

LGTM

zhuangqh added a commit to zhuangqh/cri that referenced this pull request Oct 28, 2020
zhuangqh added a commit to zhuangqh/cri that referenced this pull request Oct 28, 2020
thaJeztah added a commit to thaJeztah/containerd-packaging that referenced this pull request Nov 26, 2020
- Update to containerd 1.4.2
- Update Golang runtime to 1.15.5

Upstream containerd 1.4.2 release notes: https://github.com/containerd/containerd/releases/tag/v1.4.2

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Nov 26, 2020
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: containerd/containerd@v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch and removed cherry-pick/1.4.x labels Nov 26, 2020
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Nov 30, 2020
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: containerd/containerd@v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: 703951197c3338631ee0529dd9dd814d16f037f0
Component: engine
NicolasT added a commit to scality/metalk8s that referenced this pull request Dec 1, 2020
This version includes a fix for CVE-2020-15257 as well as a bugfix which
could prevent issues with Pods remaining in `Terminating` state.

Fixes: #2955
Fixes: #2955
See: https://github.com/containerd/containerd/releases/tag/v1.4.3
See: GHSA-36xw-fx78-c5r4
See: containerd/containerd#4656
NicolasT added a commit to scality/metalk8s that referenced this pull request Dec 1, 2020
This version includes a fix for CVE-2020-15257 as well as a bugfix which
could prevent issues with Pods remaining in `Terminating` state.

Fixes: #2955
Fixes: #2955
See: https://github.com/containerd/containerd/releases/tag/v1.4.3
See: GHSA-36xw-fx78-c5r4
See: containerd/containerd#4656
See: #2956
thaJeztah added a commit to thaJeztah/containerd-packaging that referenced this pull request Dec 2, 2020
- Update to containerd 1.4.2
- Update Golang runtime to 1.15.5

Upstream containerd 1.4.2 release notes: https://github.com/containerd/containerd/releases/tag/v1.4.2

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Feb 12, 2021
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: containerd/containerd@v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default containerd/cri#1602
- Fix selinux shared memory issue by relabeling /dev/shm containerd/cri#1605
- Fix unknown state preventing removal of containers containerd/containerd#4656
- Fix nil pointer error when restoring checkpoint containerd/containerd#4754
- Improve image pull performance when using HTTP 1.1 containerd/containerd#4653
- Update default seccomp profile for pidfd containerd/containerd#4730
- Update Go to 1.15

Windows

- Fix integer overflow on Windows containerd/containerd#4589
- Fix lcow snapshotter to read trailing tar data containerd/containerd#4628

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 7039511)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch ok-to-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cri: cannot remove stopped container

8 participants