Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

[release/1.3] Sync vendors with containerd 1.3.2#1391

Merged
mikebrow merged 3 commits intocontainerd:release/1.3from
dims:sync-vendors-with-containerd-in-release/1.3
Jan 31, 2020
Merged

[release/1.3] Sync vendors with containerd 1.3.2#1391
mikebrow merged 3 commits intocontainerd:release/1.3from
dims:sync-vendors-with-containerd-in-release/1.3

Conversation

@dims
Copy link
Copy Markdown
Member

@dims dims commented Jan 30, 2020 •
edited
Loading

Look through the containerd dependencies in vendor.conf, for each
dependency / SHA, check if the SHA is newer in containerd's vendor.conf
in 1.3.2 tag. Update if necessary.

Drop unused packages. Add versions for missing packages.

cherry pick 2ce0bb0 as well to drop broken test

@dims
Sync vendors with containerd 1.3.2
d64edd3 
Look through the `containerd dependencies` in vendor.conf, for each
dependency / SHA, check if the SHA is newer in containerd's vendor.conf
in 1.3.2 tag. Update if necessary.

Drop unused packages.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Jan 30, 2020

Hi @dims. 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.

mikebrow
mikebrow reviewed Jan 30, 2020
View reviewed changes
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.

first commit LGTM

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Jan 30, 2020

/ok-to-test

mikebrow
mikebrow reviewed Jan 30, 2020
View reviewed changes
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.

LGTM
2nd commit needs a signature :)

@dims
sort containerd dependencies
ca26289 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 30, 2020

whoops fixing 2nd commit!

@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 30, 2020

@mikebrow is there a way to re-trigger the travis CI build?

thaJeztah
thaJeztah approved these changes Jan 30, 2020
View reviewed changes
Copy link
Copy Markdown
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 (if green)

@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 30, 2020

@thaJeztah @mikebrow looks like the TestUnknownStateAfterContainerdRestart was removed from master in 2ce0bb0 should it be removed in release/1.3 too?

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Jan 30, 2020

@thaJeztah @mikebrow looks like the TestUnknownStateAfterContainerdRestart was removed from master in 2ce0bb0 should it be removed in release/1.3 too?

Yes, it should.

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Jan 30, 2020

Looks like that was this PR: #1309, which related to containerd/containerd#3711, and was back ported to the containerd 1.3 branch in containerd/containerd#3753, so yes looks like it needs to be backported

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Jan 30, 2020

oh, LOL @mikebrow beated me to it (high five! ✋)

@Random-Liu @dims
Update code for latest containerd.
fb60c98 
(cherry picked from commit 2ce0bb0)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 30, 2020

@thaJeztah @mikebrow i've added another commit with the backport for dropping the broken test. thanks!

@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 30, 2020

/test pull-cri-containerd-verify

mikebrow
mikebrow approved these changes Jan 30, 2020
View reviewed changes
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.

LGTM

@dims dims changed the title Sync vendors with containerd 1.3.2 [release/1.3] Sync vendors with containerd 1.3.2 Jan 30, 2020
@mikebrow mikebrow merged commit 74bb998 into containerd:release/1.3 Jan 31, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@mikebrow mikebrow mikebrow approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ok-to-test size/XXL

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dims @k8s-ci-robot @mikebrow @thaJeztah @Random-Liu