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

Fix: update system spec to support Docker 17.03 #52666

Merged
merged 1 commit into from
Sep 20, 2017
Merged

Fix: update system spec to support Docker 17.03 #52666

merged 1 commit into from
Sep 20, 2017
+11 −6

Conversation

yguo0905
Copy link
Contributor

@yguo0905 yguo0905 commented Sep 18, 2017 •
edited
Loading

Docker 17.03 is 1.13 with bug fixes so they are of the same minor version release. We've validated them both in #42926. This PR changes the system spec to support Docker 17.03.

This should be in 1.8.

Release note:

Kubernetes 1.8 supports docker version 17.03.x.

/assign @Random-Liu

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 18, 2017
@k8s-github-robot k8s-github-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 18, 2017
@yguo0905 yguo0905 mentioned this pull request Sep 18, 2017
Merged
@dchen1107
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 Sep 18, 2017
@dchen1107 dchen1107 added this to the v1.8 milestone Sep 18, 2017
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 18, 2017
@Random-Liu
Copy link
Member

LGTM

@cblecker
Copy link
Member

/test pull-kubernetes-e2e-gce-etcd3
/test pull-kubernetes-e2e-gce-gpu
/test pull-kubernetes-e2e-kops-aws

@huzhengchuan
Copy link
Contributor

/test pull-kubernetes-node-e2e

feiskyer
feiskyer reviewed Sep 19, 2017
View reviewed changes
test/e2e_node/system/docker_validator.go Outdated
ver := `1\.(1[3-9])\..*|\d{2}\.\d+\.\d+-[a-z]{2}`
// If it's of the new Docker version scheme but didn't match above, it
// must be a newer version than the most recently validated one.
ver := `d{2}\.\d+\.\d+-[a-z]{2}`
Copy link
Member

Choose a reason for hiding this comment

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

should be \d at the beginning.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. Thanks!

@dims
Copy link
Member

dims commented Sep 19, 2017

/retest

1 similar comment
@dims
Copy link
Member

dims commented Sep 19, 2017

/retest

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2017
@dims
Copy link
Member

dims commented Sep 19, 2017

/assign

@dims
Copy link
Member

dims commented Sep 19, 2017

re-apply lgtm lost in rebase

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2017
@Random-Liu
Copy link
Member

/lgtm

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, dchen1107, dims, yguo0905

Associated issue: 42926

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@yguo0905
Copy link
Contributor Author

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 51337, 47080, 52646, 52635, 52666). If you want to cherry-pick this change to another branch, please follow the instructions here..

@k8s-github-robot k8s-github-robot merged commit a8b3d38 into kubernetes:master Sep 20, 2017
@yguo0905 yguo0905 deleted the systemspec branch September 20, 2017 00:33
@MarkusTeufelberger MarkusTeufelberger mentioned this pull request Jun 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

Assignees

@dims dims

@Random-Liu Random-Liu

@dchen1107 dchen1107

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.
9 participants
@yguo0905 @dchen1107 @Random-Liu @cblecker @huzhengchuan @dims @k8s-github-robot @feiskyer @k8s-ci-robot