Upgrade Containerd in main from 1.5.4 to 1.5.5 #1148
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
dongsupark
force-pushed
the
containerd-1.5.5-main
branch
from
89e044f
to
a599ec5
Compare
|
CI passed |
There was a problem hiding this comment.
Shouldn't we also update COREOS_GO_VERSION="go1.13" to COREOS_GO_VERSION="go1.16"? This is what containerd's go.mod from tag 1.5.5 suggests.
| @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then | |||
| else | |||
| MY_PV="${PV/_rc/-rc.}" | |||
| EGIT_COMMIT="v${MY_PV}" | |||
| CONTAINERD_COMMIT="69a4a55aa42353c71aae40e5bb27a412d8e3149b" | |||
| CONTAINERD_COMMIT="d9768bd283183fc51cc587249530adc3fa43ebbb" | |||
There was a problem hiding this comment.
I don't get where these commits come from. For both 69a4a55aa42353c71aae40e5bb27a412d8e3149b and d9768bd283183fc51cc587249530adc3fa43ebbb I get 404 on github.
There was a problem hiding this comment.
$ git ls-remote https://github.com/containerd/containerd | tail -n4
69a4a55aa42353c71aae40e5bb27a412d8e3149b refs/tags/v1.5.4
69107e47a62e1d690afa2b9b1d43f8ece3ff4483 refs/tags/v1.5.4^{}
d9768bd283183fc51cc587249530adc3fa43ebbb refs/tags/v1.5.5
72cec4be58a9eb6b2910f5d10f1c01ca47d231c0 refs/tags/v1.5.5^{}
they are the hashes of the tags themselves.
There was a problem hiding this comment.
The commits are generated by git rev-parse VER.
So for v1.5.5, under the containerd repo:
$ git rev-parse v1.5.5
d9768bd283183fc51cc587249530adc3fa43ebbb
$ git show d9768bd283183fc51cc587249530adc3fa43ebbb
tag v1.5.5
Tagger: Derek McGowan <derek@mcg.dev>
Date: Thu Jul 29 10:03:37 2021 -0700
containerd 1.5.5
...
commit 72cec4be58a9eb6b2910f5d10f1c01ca47d231c0 (tag: v1.5.5)
Merge: 1c13c54c 677fade0
Author: Derek McGowan <derek@mcg.dev>
Date: Thu Jul 29 10:02:27 2021 -0700
Merge pull request #5805 from dmcgowan/prepare-1.5.5
[release/1.5] Prepare release notes for v1.5.5
Long story short, d9768bd283183fc51cc587249530adc3fa43ebbb is equivalent to 72cec4be58a9eb6b2910f5d10f1c01ca47d231c0 .
In theory I agree. |
|
I will merge the PR in this week, when there's no objection. |
|
I would like to merge the docker-20 upgrade PR first (#931) and I that will interfere with this PR - I think it'll need to be recreated. |
|
I see, go ahead and merge #931 first. |
dongsupark
force-pushed
the
containerd-1.5.5-main
branch
from
a599ec5
to
e8e0ff6
Compare
Upgrade Containerd in main from 1.5.4 to 1.5.5
CI passed: http://jenkins.infra.kinvolk.io:8080/job/os/job/manifest/3219/cldsv/
CI passed: http://jenkins.infra.kinvolk.io:8080/job/os/job/manifest/3267/cldsv/ (after rebase)