Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

containerd: Use containerd 1.2.4 with Docker 18.09.3 #8170

Merged
merged 1 commit into from
Dec 27, 2019
Merged

containerd: Use containerd 1.2.4 with Docker 18.09.3 #8170

merged 1 commit into from
Dec 27, 2019

Conversation

hakman
Copy link
Member

@hakman hakman commented Dec 21, 2019

This PR is related to #7986:

  1. adds the containerd-1.2.4 package for a previously released Docker version
  2. sets the default version only for Kubernetes versions >= 1.18
  3. warns that Kubernetes versions >= 1.11 and < 1.18 are untested
  4. exits with error when Kubernetes versions < 1.11

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 21, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @hakman. Thanks for your PR.

I'm waiting for a kubernetes 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.

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.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 21, 2019
@hakman
Copy link
Member Author

hakman commented Dec 21, 2019

/assign @justinsb

@hakman hakman force-pushed the coninerd-add-1.2.4 branch 2 times, most recently from b049c1f to 7504d63 Compare December 21, 2019 11:57
@rifelpet
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 21, 2019
johngmyers
johngmyers reviewed Dec 23, 2019
View reviewed changes
pkg/model/components/containerd.go Outdated
if b.IsKubernetesGTE("1.18") {
containerd.Version = fi.String("1.2.10")
} else if b.IsKubernetesGTE("1.11") {
return fmt.Errorf("contained version is required")
Copy link
Member

Choose a reason for hiding this comment

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

Typo:

Suggested change
return fmt.Errorf("contained version is required")
return fmt.Errorf("containerd version is required")

Copy link
Member Author

Choose a reason for hiding this comment

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

Nice catch!

johngmyers
johngmyers reviewed Dec 23, 2019
View reviewed changes
pkg/model/components/docker.go
docker.Version = fi.String("1.12.3")
} else if b.IsKubernetesGTE("1.4") {
docker.Version = fi.String("1.11.2")
} else {
Copy link
Member

Choose a reason for hiding this comment

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

This is a semantic change. Previously it would pick 1.11.2.

Copy link
Member Author

Choose a reason for hiding this comment

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

True. I think at that time I very tempted to remove the defaults these completely as they will be removed in 1.18.
I guess will do it in a future commit. Thanks,

justinsb
justinsb reviewed Dec 27, 2019
View reviewed changes
pkg/model/components/containerd.go
// https://github.com/containerd/containerd/blob/master/releases/v1.2.0.toml#L34
return fmt.Errorf("kubernetes %s is not compatible with containerd", clusterSpec.KubernetesVersion)
} else if b.IsKubernetesLT("1.18") {
klog.Warningf("kubernetes %s is untested with containerd", clusterSpec.KubernetesVersion)
Copy link
Member

Choose a reason for hiding this comment

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

This might be a little strong, in that it's the combination kops + kubernetes that we haven't tested before 1.18, but we can let it stand :-)

@justinsb
Copy link
Member

Thanks @hakman - I appreciate your doing this additional work :-)

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 27, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit adf6593 into kubernetes:master Dec 27, 2019
@hakman hakman deleted the coninerd-add-1.2.4 branch December 27, 2019 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb left review comments

@johngmyers johngmyers johngmyers left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@justinsb justinsb

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@hakman @k8s-ci-robot @rifelpet @justinsb @johngmyers