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

Kubelet: Add the docker semver back. #28240

Merged
merged 1 commit into from
Jul 1, 2016

Conversation

Random-Liu
Copy link
Member

Fixes #28221.
This PR:

  1. Add the semver back kubelet: Update engine version parsing to handle semantic versioning #20020
  2. Remove the code in Regression: Kubelet fails on older distro Dockers #20827, because docker 1.8 is not officially supported now, and we want to deprecate it. Bump minimum API version for docker to 1.21 #27208
  3. Add a test for docker version comparison.

XRef #28223

@yujuhong
/cc @ingvagabund

Analytics

@Random-Liu Random-Liu added area/docker area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. labels Jun 29, 2016
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Jun 29, 2016
@Random-Liu Random-Liu added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jun 29, 2016
@Random-Liu Random-Liu changed the title Add the semver back. Kubelet: Add the docker semver back. Jun 29, 2016
@ixdy
Copy link
Member

ixdy commented Jun 29, 2016

@k8s-bot test this please, issue #IGNORE

(Sorry, temporarily broke Jenkins.)

@yujuhong
Copy link
Contributor

Verifying ./hack/../hack/verify-govet.sh
pkg/kubelet/dockertools/docker_manager.go:980: arg v for printf verb %q of wrong type: *k8s.io/kubernetes/vendor/github.com/docker/engine-api/types.Version

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 61b211a76a1d0cfd0e9261dce95980503a521011.

@Random-Liu
Copy link
Member Author

@yujuhong That was a mistake. Thanks, :)

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 61b211a76a1d0cfd0e9261dce95980503a521011.

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 30, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@k8s-bot
Copy link

k8s-bot commented Jun 30, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@k8s-bot
Copy link

k8s-bot commented Jun 30, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@ingvagabund
Copy link
Contributor

Assuming the API version is in d+.d+ form, the side effect of semver is back.

@Random-Liu Thanks, closing my PR in favor of yours.

@Random-Liu
Copy link
Member Author

Random-Liu commented Jun 30, 2016

The original node e2e test failure is not about this issue, and the kubelet.log is nearly empty with

Running as unit kubelet-173886880.service.

@k8s-bot test this issue #IGNORE

@yujuhong
Copy link
Contributor

The original node e2e test failure is not about this issue, and the kubelet.log is nearly empty with

What image is this?

@Random-Liu
Copy link
Member Author

Random-Liu commented Jun 30, 2016

@yujuhong coreos. :) Seems like unregister_device? But there is no kernel log.

@yujuhong
Copy link
Contributor

@yujuhong coreos. :) Seems like unregister_device? But there is no kernel log.

When did it fail? I'm too lazy to go dig out the logs for the failed build ;) Just wanted to know if it's before or after the fix for #27498 went in.

@Random-Liu
Copy link
Member Author

Random-Liu commented Jun 30, 2016

@yujuhong It failed yesterday evening. :)

@yujuhong
Copy link
Contributor

yujuhong commented Jul 1, 2016

It failed yesterday evening. :)

Oh that's fine. Thanks! Let me know if you see any new failures with the unregister_netdevice message.

@Random-Liu
Copy link
Member Author

The test failed because the docker hub was temporarily down.

Failed: Failed to pull image "alpine:3.1": Tag 3.1 not found in repository docker.io/library/alpine

@k8s-bot test this issue #IGNORE.

@k8s-bot
Copy link

k8s-bot commented Jul 1, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@Random-Liu
Copy link
Member Author

Random-Liu commented Jul 1, 2016

@k8s-bot test this issue #28250.

@k8s-bot
Copy link

k8s-bot commented Jul 1, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@k8s-bot
Copy link

k8s-bot commented Jul 1, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@Random-Liu
Copy link
Member Author

@k8s-bot test this issue #28250.

@k8s-bot
Copy link

k8s-bot commented Jul 1, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@k8s-bot
Copy link

k8s-bot commented Jul 1, 2016

GCE e2e build/test passed for commit 7f6d9b3.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 9470bfd into kubernetes:master Jul 1, 2016
@Random-Liu Random-Liu deleted the add-semver-back branch July 1, 2016 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/docker area/kubelet lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants