Skip to content

[19.03 backport] update containerd binary v1.3.7#40408

Merged
tiborvass merged 8 commits intomoby:19.03from
thaJeztah:19.03_backport_update_containerd_1.3
Sep 15, 2020
Merged

[19.03 backport] update containerd binary v1.3.7#40408
tiborvass merged 8 commits intomoby:19.03from
thaJeztah:19.03_backport_update_containerd_1.3

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jan 24, 2020 •
edited
Loading

moved from docker-archive#421

back ports of updating the containerd binaries from:

this is to see if integration tests work fine if we would update the existing 19.03 version to the latest containerd

full diff: https://github.com/containerd/containerd/compare/v1.2.13..v1.3.7

- Description for the changelog

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

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Jan 24, 2020

Was there any problem with 1.2.11?

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 24, 2020 •
edited
Loading

This is just to move my open PR's (docker-archive#421) from the docker/engine repo to this repo. I opened this draft PR at the time to allow CI to run docker 19.03 on containerd 1.3.x to see if things would break (I should update this PR to the current containerd 1.3.x).

Note that (from docker's side) there's an ongoing discussion about containerd versions to "support". The current 18.09 and 19.03 deb/rpm packages do not restrict the containerd version (other than > 1.<something> version).

This means that any existing 18.09 or 19.03 engine would upgrade to containerd 1.3.x ( would containerd.io 1.3 packages be published to download.docker.com).

While containerd promises a stable API, we have seen some issues when upgrading containerd versions, so we may have to put a containerd.io < 1.3.0 restriction on the existing 19.03 (and 18.09) packages.

@thaJeztah thaJeztah mentioned this pull request Jan 24, 2020
Closed
@thaJeztah thaJeztah added this to the 19.03.9 milestone Mar 12, 2020
@thaJeztah thaJeztah force-pushed the 19.03_backport_update_containerd_1.3 branch from 681abad to 8aa1337 Compare March 12, 2020 19:38
@thaJeztah thaJeztah changed the title [19.03 backport] update containerd binary v1.3.0 [19.03 backport] update containerd binary v1.3.` Mar 12, 2020
@thaJeztah thaJeztah changed the title [19.03 backport] update containerd binary v1.3.` [19.03 backport] update containerd binary v1.3.3 Mar 12, 2020
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Apr 20, 2020

We have 1.3.4 now

@thaJeztah thaJeztah force-pushed the 19.03_backport_update_containerd_1.3 branch from 8aa1337 to 1bced85 Compare April 20, 2020 13:28
@thaJeztah thaJeztah changed the title [19.03 backport] update containerd binary v1.3.3 [19.03 backport] update containerd binary v1.3.4 Apr 20, 2020
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 20, 2020

Updated to 1.3.4

@thaJeztah thaJeztah modified the milestones: 19.03.9, 19.03.10 May 1, 2020
@thaJeztah thaJeztah modified the milestones: 19.03.10, 19.03.11 May 20, 2020
@thaJeztah thaJeztah modified the milestones: 19.03.11, 19.03.12 Jun 8, 2020
@thaJeztah thaJeztah modified the milestones: 19.03.12, 19.03.13 Jun 30, 2020
@thaJeztah thaJeztah changed the title [19.03 backport] update containerd binary v1.3.4 [19.03 backport] update containerd binary v1.3.5 Jun 30, 2020
@thaJeztah thaJeztah force-pushed the 19.03_backport_update_containerd_1.3 branch from 1bced85 to 61ae9f1 Compare July 3, 2020 18:38
@thaJeztah thaJeztah changed the title [19.03 backport] update containerd binary v1.3.5 [19.03 backport] update containerd binary v1.3.6 Jul 3, 2020
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Jul 26, 2020

Is this still draft?

v1.2 EOL is soon (September 26, 2020) https://github.com/containerd/containerd/blob/master/RELEASES.md

dmcgowan and others added 3 commits August 5, 2020 22:40
@dmcgowan @thaJeztah
update containerd binary v1.3.0
d4c6372 
full diff: https://github.com/containerd/containerd/compare/v1.2.8..v1.3.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit 6c94a50)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tao12345666333 @thaJeztah
Update containerd to v1.3.1
56d8973 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 517946e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tao12345666333 @thaJeztah
Update containerd to v1.3.2
490c45b 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 7f809e1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah and others added 5 commits August 5, 2020 22:40
@thaJeztah
update containerd binary to v1.3.3
89a4208 
full diff: containerd/containerd@v1.3.2...v1.3.3
release notes: https://github.com/containerd/containerd/releases/tag/v1.3.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 27649ee)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tao12345666333 @thaJeztah
update containerd to v1.3.4
fc8f88d 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit fbaaca6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tao12345666333 @thaJeztah
update containerd to v1.3.5
80cef48 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 0e915e5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tao12345666333 @thaJeztah
update containerd to v1.3.6
9380ec7 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 85e3ddd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@AkihiroSuda @thaJeztah
update containerd to v1.3.7
a15a770 
Release note: https://github.com/containerd/containerd/releases/tag/v1.3.7

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 43d1305)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title [19.03 backport] update containerd binary v1.3.6 [19.03 backport] update containerd binary v1.3.7 Aug 5, 2020
@thaJeztah thaJeztah force-pushed the 19.03_backport_update_containerd_1.3 branch from 61ae9f1 to a15a770 Compare August 5, 2020 20:41
@thaJeztah thaJeztah marked this pull request as ready for review August 20, 2020 18:20
@thaJeztah thaJeztah requested a review from tianon as a code owner August 20, 2020 18:20
tianon
tianon approved these changes Aug 20, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

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

LGTM 👍

cpuguy83
cpuguy83 approved these changes Aug 25, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Sep 7, 2020

@tiborvass Can we merge this?
1.2 EOL (Sep 26) is soon.

@tiborvass tiborvass merged commit 64fffef into moby:19.03 Sep 15, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_update_containerd_1.3 branch September 15, 2020 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tianon tianon tianon approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tiborvass tiborvass tiborvass approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

area/runtime Runtime impact/changelog

Projects

None yet

Milestone

19.03.13

Development

Successfully merging this pull request may close these issues.

7 participants

@thaJeztah @AkihiroSuda @tianon @cpuguy83 @tiborvass @dmcgowan @tao12345666333