github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-09 00:26:58 +00:00
Code Issues Projects Releases Wiki Activity
31,709 Commits 42 Branches 8,159 Tags
fec83a9e288d2d846d41e4660adb7589d8e8b340
Commit Graph

6 Commits

Author SHA1 Message Date
Euan Kemp
fec83a9e28 docker_manager: Correct determineContainerIP args 
This could result in the network plugin not retrieving the pod ip in a
call to SyncPod when using the `exec` network plugin.
The CNI and kubenet network plugins ignore the name/namespace arguments,
so they are not impacted by this bug.

I verified the second included test failed prior to correcting the
argument order.

Fixes #29161
 2016-07-18 23:29:27 -07:00
k8s-merge-robot
9470bfd692 Merge pull request #28240 from Random-Liu/add-semver-back 
Automatic merge from submit-queue

Kubelet: Add the docker semver back.

Fixes #28221.
This PR:
1) Add the semver back https://github.com/kubernetes/kubernetes/pull/20020
2) Remove the code in https://github.com/kubernetes/kubernetes/pull/20827, because docker 1.8 is not officially supported now, and we want to deprecate it. https://github.com/kubernetes/kubernetes/pull/27208
3) Add a test for docker version comparison.

XRef https://github.com/kubernetes/kubernetes/pull/28223

@yujuhong 
/cc @ingvagabund 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-06-30 23:20:56 -07:00
David McMahon
ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
Random Liu
7f6d9b3bc6 Add the semver back. 2016-06-29 14:35:12 -07:00
Dr. Stefan Schimanski
186c6b29c1 Use : as seccomp security option operator for Docker 1.10 2016-06-28 16:44:48 +02:00
Tim St. Clair
f2f3caf744 Rename **/manager.go 2016-06-21 15:11:31 -07:00