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

Conversation

@dims
Copy link
Member

@dims dims commented Jan 30, 2020

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]

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]>
@k8s-ci-robot
Copy link

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
Copy link
Member

/ok-to-test

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.

SGTM

@dims
Copy link
Member Author

dims commented Jan 30, 2020

/test pull-cri-containerd-node-e2e

@thaJeztah
Copy link
Member

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)

@thaJeztah
Copy link
Member

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

@mikebrow
Copy link
Member

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.

@dims
Copy link
Member Author

dims commented Jan 30, 2020

@mikebrow @thaJeztah nothing much to gain by moving to 1.12.10 :) https://paste.centos.org/view/raw/24c3e7f8

@mikebrow
Copy link
Member

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

@thaJeztah
Copy link
Member

@mikebrow @thaJeztah nothing much to gain by moving to 1.12.10 :)

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 🤗)

@mikebrow
Copy link
Member

mikebrow commented Jan 30, 2020

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

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

@mikebrow
Copy link
Member

I see AWS moved to containerd on their infra tests so that's good.

@thaJeztah
Copy link
Member

oh, @dims could you add [release/1.2] prefix to the PR title (easier to find it back)

we have not yet moved up the version of kubernetes that we are testing against for presubmit jobs.

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?)

@dims dims changed the title Sync vendors with containerd 1.2.11 [release/1.2] Sync vendors with containerd 1.2.11 Jan 30, 2020
@dims
Copy link
Member Author

dims commented Jan 30, 2020

whoooops! done.

+1 to leave it alone for now (avoid blocking 1.12.12)

@mikebrow
Copy link
Member

/test pull-cri-containerd-verify

1 similar comment
@dims
Copy link
Member Author

dims commented Jan 31, 2020

/test pull-cri-containerd-verify

@mikebrow mikebrow merged commit b1052f3 into containerd:release/1.2 Jan 31, 2020
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Jan 31, 2020
…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]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants