-
Notifications
You must be signed in to change notification settings - Fork 347
[release/1.2] Sync vendors with containerd 1.2.11 #1392
[release/1.2] Sync vendors with containerd 1.2.11 #1392
Conversation
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.2.11 tag. Update if necessary. Drop unused packages. Add package that was not present. Signed-off-by: Davanum Srinivas <[email protected]>
|
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 Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
|
/ok-to-test |
thaJeztah
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SGTM
|
/test pull-cri-containerd-node-e2e |
|
note that the containerd 1.2 branch (so what will be in 1.2.12) also has containerd/containerd#3711 backported (through containerd/containerd#3755), so #1309 might be needed as well in this branch (it looks to be test-changes only though, so perhaps can wait until after 1.2.12 has been released - it's a bit of a chicken-and-egg situation) |
|
On a side-note: @mikebrow is there a need to update the kubernetes dependencies in this branch to the latest 1.12.x patch release? I notice this branch has kubernetes 1.12.0, but latest patch release for kubernetes 1.12 is 1.12.10 https://github.com/kubernetes/kubernetes/releases/tag/v1.12.10 |
I think that would be a very good idea. After a cursory check through the patches nothing stands out as a possible break to any of our interaction points with k8s, other than a couple obvious possibilities that we are already covering like moving up to go 1.10.x, and updating crictl. But there are too many commits there, to go over them with any great detail and for assurance. In theory it should just be a validation test with containerd against the k8s patches, a good thing to do given that kubernetes patch testing (to my knowledge) does not test against the various runtimes outside the default. |
|
@mikebrow @thaJeztah nothing much to gain by moving to 1.12.10 :) https://paste.centos.org/view/raw/24c3e7f8 |
|
In hind sight we could move up to 1.14 k8s .. esp since we are already testing containerd 1.2 against 1.14. https://github.com/kubernetes/test-infra/blob/master/config/jobs/containerd/cri/containerd-cri-presubmit-jobs.yaml#L120 |
In that case, looks like there's no risk; it would be just for "sanity" (and taking away any doubt that we didn't include possible fixes); but for sure doesn't need to be in this PR (my 0.02c - I'm not a maintainer for this repository 🤗) |
@dims @thaJeztah which reminds me .. we have not yet moved up the version of kubernetes that we are testing against for presubmit jobs. @Random-Liu @yujuhong When should we move up the version in infra that we are testing against from 1.15 to 1.16 for containerd 1.3.. or what should be the process for that. |
|
I see AWS moved to containerd on their infra tests so that's good. |
|
oh, @dims could you add
I'll leave the kubernetes bumps up to the maintainers here 😅 - perhaps could be something for containerd 1.2.13 (to not block the 1.12.12 release?) |
|
whoooops! done. +1 to leave it alone for now (avoid blocking 1.12.12) |
|
/test pull-cri-containerd-verify |
1 similar comment
|
/test pull-cri-containerd-verify |
…84a4cef265a38 full diff: containerd/cri@b075cc4...b1052f3 - containerd/cri#1389 pick up fix for CVE-2019-19921 in opencontainers/selinux - containerd/cri#1392 [release/1.2] Sync vendors with containerd 1.2.11 Signed-off-by: Sebastiaan van Stijn <[email protected]>
Look through the
containerd dependenciesin vendor.conf, for eachdependency / SHA, check if the SHA is newer in containerd's vendor.conf
in 1.2.11 tag. Update if necessary.
Drop unused packages. Add package that was not present.
Signed-off-by: Davanum Srinivas [email protected]