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.

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

Use Docker 19.03.11 for Kubernetes 1.18+ #9258

Merged
merged 1 commit into from
Jun 3, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 3, 2020

Due to security advisory kubernetes/kubernetes#91507, Docker 19.03.11 was released.
We may want to add and set this version as the default in 1.17 and 1.16 also.

Refs:

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 3, 2020
@k8s-ci-robot k8s-ci-robot added area/api size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/documentation area/nodeup labels Jun 3, 2020
@hakman hakman changed the title Use Dockser 19.03.11 for Kubernetes 1.18+ Use Docker 19.03.11 for Kubernetes 1.18+ Jun 3, 2020
@olemarkus
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2020
@rifelpet
Copy link
Member

rifelpet commented Jun 3, 2020

Is there a k/k PR that matches this? I couldn't fine one.

just curious

@hakman
Copy link
Member Author

hakman commented Jun 3, 2020

@rifelpet k/k didn't upgrade docker, but they mentioned in the advisory that this is the only unaffected version.
They only reference the major.minor version and not the patch one.

The earliest reference to 19.03 is in the release notes for 1.17:
https://github.com/kubernetes/kubernetes/blame/1180f976c616dbab2833c2f16d00771e2d4095d3/CHANGELOG/CHANGELOG-1.17.md#L943

@rifelpet
Copy link
Member

rifelpet commented Jun 3, 2020

Ah thats right, I forgot k/k only deals with minor versions. Maybe Kops should consider doing something similar? Allow the dockerVersion field to only reference major.minor and under the hood it always uses the latest patch? Something to think about, perhaps for the v1beta1 apiVersion...

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jun 3, 2020
@rifelpet
Copy link
Member

rifelpet commented Jun 3, 2020

or the dockerVersion field supports both major.minor.patch and major.minor (in which case we always use the latest patch) and we somehow encourage users to use major.minor. That would avoid making it a breaking change.

@hakman
Copy link
Member Author

hakman commented Jun 3, 2020

We don't really break anything, we only set the default version and that should be backwards compatible at least with those with same major & minor.
We still provide the older versions, but the user has to set it manually if he doesn't want what we choose.

@rifelpet
Copy link
Member

rifelpet commented Jun 3, 2020

True. Maybe we add support for major.minor in the dockerVersion field and have kops always use the latest patch version in that case. Does create cluster populate the field? If it does we could have it only use major.minor too.

@hakman
Copy link
Member Author

hakman commented Jun 3, 2020

Create cluster does not populate the version by default. It is up to us to set the default.
I like the idea though of major and minor instead of patch for the future. This would help remove older patch versions that should not be used.

@k8s-ci-robot k8s-ci-robot merged commit 6a772a7 into kubernetes:master Jun 3, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jun 3, 2020
k8s-ci-robot added a commit that referenced this pull request Jun 3, 2020
…pstream-release-1.18

Automated cherry pick of #9258: Use Docker 19.03.11 for Kubernetes 1.18+
@hakman hakman deleted the docker-19.03.11 branch June 3, 2020 17:05
@rifelpet rifelpet modified the milestones: v1.18, v1.19 Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/documentation area/nodeup 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants