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

[23.0 backport] Upgrade containerd/fifo to v1.1.0 #45051

Merged
merged 1 commit into from Feb 22, 2023

Conversation

corhere
Copy link
Contributor

@corhere corhere commented Feb 21, 2023

- What I did

- How I did it

- How to verify it

- Description for the changelog

  • Fixed an issue with the daemon crashing on startup during container restore

- A picture of a cute animal (not mandatory but encouraged)

@corhere corhere added the kind/bugfix PR's that fix bugs label Feb 21, 2023
@corhere corhere added this to the 23.0.2 milestone Feb 21, 2023
@thaJeztah
Copy link
Member

Looks like we also need to backport #45001

https://github.com/moby/moby/actions/runs/4236309832/jobs/7363986803

FAIL: Vendoring was not performed correctly!

The following files changed during re-vendor:

M	vendor.mod
M	vendor.sum

Please revendor with hack/vendor.sh

diff --git a/vendor.mod b/vendor.mod
index e7a4832d73..a218b20d02 100644
--- a/vendor.mod
+++ b/vendor.mod
@@ -83,7 +83,7 @@ require (
 	go.etcd.io/bbolt v1.3.6
 	golang.org/x/net v0.5.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.4.0
+	golang.org/x/sys v0.5.0
 	golang.org/x/text v0.6.0
 	golang.org/x/time v0.1.0
 	google.golang.org/genproto v0.0.0-20220706185917-7780775163c4
diff --git a/vendor.sum b/vendor.sum
index ed9678d9bd..c189c01e15 100644
--- a/vendor.sum
+++ b/vendor.sum
@@ -963,7 +963,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeou
HqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I
5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962
/h/Wwjteg=
Error: The operation was canceled.

I already had a cherry-pick label on that one, so let me open one

@thaJeztah
Copy link
Member

opened #45056

@neersighted
Copy link
Member

neersighted commented Feb 22, 2023

Rebased on top of HEAD; looks like this still isn't a clean cherry-pick.

@thaJeztah
Copy link
Member

Looks like its vendor.sum this time, because testify was updated through #45028

That's one we should also consider backporting as it's fixing some potential panics and/or corruption if I'm not mistaken

@thaJeztah
Copy link
Member

oh! Looks like I already marked that one for potential backporting. Let's do the drill; let me open a PR

@thaJeztah
Copy link
Member

opened #45058

Signed-off-by: Cory Snider <csnider@mirantis.com>
(cherry picked from commit d6c4e17)
Signed-off-by: Cory Snider <csnider@mirantis.com>
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
@neersighted neersighted force-pushed the backport-23.0/containerd-fifo_v1.1 branch from ee7b91d to 2c55b26 Compare February 22, 2023 17:08
@neersighted
Copy link
Member

Rebased once again.

@thaJeztah
Copy link
Member

Looks like validate is passing now 🤞 let's see if everything else goes green

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM (assuming we get green now 😅)

@thaJeztah
Copy link
Member

All green 🎉

@thaJeztah thaJeztah merged commit 0497993 into moby:23.0 Feb 22, 2023
@corhere corhere deleted the backport-23.0/containerd-fifo_v1.1 branch March 27, 2023 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants