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

Update support for docker tgz package #8525

Merged
merged 1 commit into from
Mar 14, 2020
Merged

Update support for docker tgz package #8525

merged 1 commit into from
Mar 14, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Feb 11, 2020

Using the Docker tgz (static) package instead of rpm/deb has some advantages:

  • works on more distros, like Amazon Linux
  • single package for all supported distros, so much easier to keep updated
  • works with any released containerd tgz
  • (in the future) will allow to specify any package URL for containerd or docker to be installed

This is similar to #8199.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 11, 2020
@hakman
Copy link
Member Author

hakman commented Feb 11, 2020

/assign @justinsb
/cc @geojaz

@johngmyers
Copy link
Member

/retest

@hakman hakman force-pushed the docker-tgz branch 2 times, most recently from cb433cd to c2046ad Compare February 11, 2020 08:12
@hakman
Copy link
Member Author

hakman commented Feb 11, 2020

There is an issue with containerd builds that broke support for older distros in latest 1.2.x releases. containerd/containerd#4008
/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2020
@hakman hakman force-pushed the docker-tgz branch 3 times, most recently from 2339e35 to a1b479e Compare February 18, 2020 19:26
@hakman
Copy link
Member Author

hakman commented Feb 19, 2020 •
edited
Loading

@justinsb A new version of containerd was released and fixes the issue of running on older distros. This is ready for review.
/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 19, 2020
geojaz
geojaz reviewed Feb 26, 2020
View reviewed changes
Copy link
Member

@geojaz geojaz left a comment

Choose a reason for hiding this comment

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

I'm +1, but will let those with closer knowledge of these packages take a look as well.

@johngmyers
Copy link
Member

It looks like the use of Version and PackageVersion is backwards. PackageVersion is what is being compared to the spec and Version is version of the package being installed.

Perhaps TestDockerPackageNames and TestContainerdPackageNames could assert that when PlainBinary is true that Version and ExtraPackages are empty?

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 7, 2020
justinsb
justinsb reviewed Mar 14, 2020
View reviewed changes
pkg/model/components/docker.go
@@ -48,7 +48,9 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {

// Set the Docker version for known Kubernetes versions
if fi.StringValue(clusterSpec.Docker.Version) == "" {
if b.IsKubernetesGTE("1.17") {
if b.IsKubernetesGTE("1.18") {
docker.Version = fi.String("19.03.7")
Copy link
Member

Choose a reason for hiding this comment

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

I couldn't find the note about this being the correct version. Is this our decision or an upstream recommendation?

Copy link
Member Author

Choose a reason for hiding this comment

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

The upstream only recommends Docker "19.03" in the release notes for 1.18. This is also why I proposed to use 19.03.8 for 1.17 in #8738.

@justinsb
Copy link
Member

Thanks @hakman ... I'm not sure the extent to which we have a recommendation on versions before the 1.18 release (and it looks like there is now a 19.03.8), but this lgtm!

@justinsb
Copy link
Member

/approve
/lgtm

@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 Mar 14, 2020
@rifelpet
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit 0a6dcce into kubernetes:master Mar 14, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Mar 14, 2020
@hakman hakman deleted the docker-tgz branch March 15, 2020 10:08
@hakman
Copy link
Member Author

hakman commented Mar 15, 2020

Thanks @justinsb. I opened #8748 to add support for 19.03.8 in Kops and kubernetes/website#19643 to update the website docs.
Other than that, the release notes will only mention 19.03, same as for 1.17.

@elisiano elisiano mentioned this pull request Apr 1, 2020
Closed
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

@geojaz geojaz geojaz left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@justinsb justinsb

@johngmyers johngmyers

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

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