github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,339 Commits 1 Branch 31 Tags
87e32c75321bad09707683cb15d6a0c41f4b6f0d
Commit Graph

923 Commits

Author SHA1 Message Date
Ken Robertson
66c99d5e9c kubelet: Update FakeDockerClient used in integration tests 
This updates the mock for the docker client used in integration tests to
include the engine version in its VersionInfo response.
 2016-01-22 17:14:01 -08:00
Ken Robertson
fff8a7c371 kubelet: Update engine version parsing to handle semantic versioning 
This updates the dockertools.dockerVersion to use a semantic versioning
library to more gracefully support engine versions which include
additional version fields.

Previously, go-dockerclient's APIVersion struct was use which only
handles plain numeric x.y.z version strings. With #19675, the library
was now used on the Docker engine string, however it is possible for the
engine string to include include additional information for beta, rc, or
distro specific builds.

This PR also enables the TestDockerRuntimeVersion test which was
previously just a FIXME and updates it to pass, and be used to test the
version string that cause #20005.

This negates the need for fsouza/go-dockerclient#451, since even with
that change, if a user was running Docker 1.10.0-rc1, this would cause
the kubelet to report it as simply 1.10.0.
 2016-01-22 13:18:52 -08:00
Clayton Coleman
4a6935b31f Remaining codec change refactors 2016-01-22 13:27:27 -05:00
Clayton Coleman
33085c0cf2 Update tests to handle codec changes 2016-01-22 13:27:26 -05:00
nikhiljindal
2ad642d370 Merge registered and latest and move to apimachinery 2016-01-21 14:42:21 -08:00
Alex Mohr
c52122cab5 Merge pull request #19675 from apcera/kubelet-report-runtime-version 
Update container runtime to properly report the engine and version
 2016-01-21 10:31:19 -08:00
k8s-merge-robot
d0f59e2126 Merge pull request #18172 from Random-Liu/generate-sync-event 
Auto commit by PR queue bot
 2016-01-20 22:48:35 -08:00
Random-Liu
eb56d46b74 Minor clean up in kubelet syncPod() 2016-01-20 17:31:59 -08:00
Ken Robertson
a7b07c01df Update container runtime to properly report the engine and version 
This address a TODO when collecting the node version information so it
will properly report the configured runtime and its version. Previously,
this was hardcoded to "docker://" and the docker version, and would show
"docker://1.9.1" even when the kubelet was configured to use rkt.

With this change, it will use the runtime's Type() and Version() data.

This also changes the container.Runtime interface to add an APIVersion()
method. This can be used when the runtime has separate versions for the
engine and the API, such as with Docker. The Docker minimum version
validation has been updated to use APIVersion(), and
DockerManager.Version() now returns the engine version.
 2016-01-20 16:42:25 -08:00
Random-Liu
0e612afa98 Start using PodSyncResult in dockertools 2016-01-17 00:42:45 -08:00
Mike Danese
33c72db59c Merge pull request #19528 from resouer/strings-util 
Create strings pkg to fix util issue
 2016-01-14 21:19:17 -08:00
harry
7405c7899b Add strings pkg to hold strings utils 
Replace funtions with strings pkg

Fix all references and rename the pkg
 2016-01-15 12:37:50 +08:00
Mike Danese
41df8749a8 Merge pull request #19470 from gmarek/kubemark-performance 
Shorten the sleep amount in the fake docker client
 2016-01-14 11:55:24 -08:00
k8s-merge-robot
c255181509 Merge pull request #18248 from resouer/images-dev 
Auto commit by PR queue bot
 2016-01-11 23:53:43 -08:00
Saad Ali
651206fd90 Merge pull request #19393 from yujuhong/fix_dockerclient 
Fix fake docker client to corretly report status of containers
 2016-01-11 13:56:41 -08:00
gmarek
573c3ca320 Shorten the sleep amount in the fake docker client 2016-01-11 12:15:11 +01:00
k8s-merge-robot
609cdfd267 Merge pull request #19331 from resouer/hash-util 
Auto commit by PR queue bot
 2016-01-09 13:08:01 -08:00
harry zhang
27ca7dc71e Expose image list in node status 
Change image manager to use repotag
 2016-01-08 17:01:31 +08:00
Yu-Ju Hong
b969599daf Fix fake docker client to corretly report status of containers 2016-01-07 18:20:41 -08:00
Clayton Coleman
791d160b42 Split the Kubelet flag options and struct 
Reduces the size of the app/server.go file and ensures that the flags
and their defaults are clearly separated.
 2016-01-06 21:23:06 -05:00
harry
2a52976983 Use hashutil to hold hash tools 2016-01-06 22:28:58 +08:00
k8s-merge-robot
38f926dbb9 Merge pull request #19206 from Random-Liu/remove-wired-docker-label 
Auto commit by PR queue bot
 2016-01-05 19:32:01 -08:00
Random-Liu
884dc5c9e5 Put TerminationGracePeriod, DeletionGracePeriod and PreStopHandler to docker labels 2016-01-05 15:45:29 -08:00
Random-Liu
2ea11690b8 Remove running pod from SyncPod() of container runtime 2016-01-04 10:18:46 -08:00
Random-Liu
b2a72ca384 Change my TODO to be the same with others 2015-12-31 00:41:05 -08:00
Random-Liu
6e92ddf9e1 Cleanup pod print in dockertools/manager.go, prober/prober.go and 
runonce.go
 2015-12-28 14:07:37 -08:00
Vishnu Kannan
3c0745211f Fix docker root dir detection. 2015-12-17 10:24:30 -08:00
deads2k
d0aaf13920 use constants for group names 2015-12-14 10:04:10 -05:00
k8s-merge-robot
3d24d25fd8 Merge pull request #17764 from jiangyaoguo/make-containerspecchange-private 
Auto commit by PR queue bot
 2015-12-11 17:40:34 -08:00
Yu-Ju Hong
c646255579 Replace podFullName with format.Pod() in logging messages 2015-12-07 13:41:52 -08:00
jiangyaoguo
5f77f2b5a9 make PodContainerSpecChange private 2015-12-07 09:28:15 +08:00
k8s-merge-robot
810181fb7b Merge pull request #17278 from ZJU-SEL/fix-nil-tag 
Auto commit by PR queue bot
 2015-12-06 12:52:39 -08:00
Random-Liu
3cbdf79f8c Change original PodStatus to APIPodStatus, and start using kubelet internal PodStatus in dockertools 2015-12-04 17:37:39 -08:00
Harry Zhang
5552d7007c Add default when latest not claimed 2015-11-30 17:10:50 +08:00
harry zhang
121c7046aa Move parsers into util 2015-11-29 22:15:11 -08:00
k8s-merge-robot
4eb010b1f7 Merge pull request #17694 from hongchaodeng/ratelimit 
Auto commit by PR queue bot
 2015-11-26 13:12:26 -08:00
Random-Liu
c6d02b83e5 Cleanup container_gc_test.go 2015-11-25 10:37:39 -08:00
k8s-merge-robot
ff3f240de2 Merge pull request #17533 from Random-Liu/fix-fake-docker-client 
Auto commit by PR queue bot
 2015-11-25 08:44:26 -08:00
Avesh Agarwal
3d5207fd73 This commit adds type information to events. 
This addresses issue #15624.
 2015-11-24 09:59:54 -05:00
Hongchao Deng
13d152a873 RateLimiter: change CanAccept() to TryAccept() 2015-11-23 16:42:53 -08:00
k8s-merge-robot
8a306a7527 Merge pull request #17234 from Random-Liu/move-more-info-to-docker-label 
Auto commit by PR queue bot
 2015-11-21 10:45:09 -08:00
Daniel Smith
874b4f85d9 Merge pull request #17259 from yujuhong/raw_pod_status 
kubelet: add RawPodStatus and related functions
 2015-11-20 14:23:19 -08:00
Lantao Liu
90ac508524 Cleanup fake_docker_client.go and manager_test.go 2015-11-19 19:03:35 -08:00
Lantao Liu
f08097515f Move more things into docke label, and add label test 2015-11-18 23:17:16 -08:00
Yu-Ju Hong
760309f349 kubelet: add RawPodStatus and related functions 
RawPodStatus will be the internal status of the pod that kubelet relies on for
syncing.
 2015-11-17 17:04:05 -08:00
k8s-merge-robot
1334401888 Merge pull request #17202 from brendandburns/fix2 
Auto commit by PR queue bot
 2015-11-17 00:49:13 -08:00
k8s-merge-robot
0c9bc3215d Merge pull request #14469 from thockin/intstr 
Auto commit by PR queue bot
 2015-11-16 23:20:37 -08:00
k8s-merge-robot
138a78db1f Merge pull request #16580 from jiangyaoguo/check-image-exist-after-pulled 
Auto commit by PR queue bot
 2015-11-16 22:53:34 -08:00
Jeff Lowdermilk
70d89a3541 Merge pull request #13571 from yujuhong/lifecycle_v0 
kubelet: add a generic pod lifecycle event generator
 2015-11-16 14:59:40 -08:00
Tim Hockin
ba383bcfeb Refactor IntOrString into a new pkg 
pkg/util/intstr is a cleaner encapsulation for this type and supporting
functions.  No behavioral change.
 2015-11-16 10:57:52 -08:00