github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 06:32:32 +00:00
Code Issues Projects Releases Wiki Activity
23,118 Commits 42 Branches 8,159 Tags
a7b07c01df197d40c677709d953ad0d538d49b75
Commit Graph

23118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brendan Burns
6504b74823 Merge pull request #19800 from justinsb/aws_update_vivid_amis 
AWS: Update AMIs for Ubuntu Vivid
 2016-01-19 13:13:55 -08:00
Justin Santa Barbara
dcd7e813f7 AWS: Update AMIs for Ubuntu Vivid 
Update to the latest AMIs for Vivid, as sourced from:
http://cloud-images.ubuntu.com/locator/ec2/
 2016-01-18 16:47:06 -05:00
Marek Grabowski
810544633e Merge pull request #19751 from mikedanese/fix-nil 
deployment: fix nil pointer panic
 2016-01-18 18:08:33 +01:00
Clayton Coleman
dc83a11758 Merge pull request #19768 from madhusudancs/fix-update-codecgen 
Do not dirname on the dependency file's path twice while generating types using codecgen.
 2016-01-18 11:15:12 -05:00
Piotr Szczesniak
59cc907189 Merge pull request #19789 from kubernetes/revert-19436-status_cache_p2 
Revert "Enable kubecontainer.Cache in kubelet"
 2016-01-18 14:17:20 +01:00
Piotr Szczesniak
9659057986 Revert "Enable kubecontainer.Cache in kubelet" 2016-01-18 13:35:41 +01:00
Piotr Szczesniak
1534672b4b Merge pull request #19787 from kubernetes/revert-19743-scale 
Revert "Increase api call latency threshold."
 2016-01-18 12:06:50 +01:00
Piotr Szczesniak
bd26e6eae0 Revert "Increase api call latency threshold." 2016-01-18 11:09:47 +01:00
Lantao Liu
4c37dbe6e6 Merge pull request #19690 from Random-Liu/fix-bug-in-status-test 
Fix bug in status/manager_test.go
 2016-01-18 01:15:16 -08:00
Tim Hockin
1a5bd79dc3 Merge pull request #15353 from tpounds/cleanup-scratch-doc-formatting 
Minor documentation formatting cleanup.
 2016-01-17 23:46:08 -08:00
k8s-merge-robot
ad827c6b62 Merge pull request #19573 from madhusudancs/daemonset-update-move-utils 
Auto commit by PR queue bot
 2016-01-17 08:16:11 -08:00
k8s-merge-robot
fcf8263b1b Merge pull request #19572 from pwittrock/exportfsmetrics 
Auto commit by PR queue bot
 2016-01-17 07:46:02 -08:00
k8s-merge-robot
0051dcc83e Merge pull request #19560 from Random-Liu/format-reconcile-log 
Auto commit by PR queue bot
 2016-01-17 04:51:05 -08:00
k8s-merge-robot
a5e79a9f47 Merge pull request #19536 from bprashanth/daemon_replace 
Auto commit by PR queue bot
 2016-01-17 04:22:56 -08:00
k8s-merge-robot
98b190acf4 Merge pull request #19527 from hongchaodeng/pred 
Auto commit by PR queue bot
 2016-01-17 03:52:16 -08:00
k8s-merge-robot
bd8d37f6f2 Merge pull request #19522 from apcera/dev_python3 
Auto commit by PR queue bot
 2016-01-17 03:21:07 -08:00
Madhusudan.C.S
1511466b9d Do not dirname on the dependency file's path twice while generating types using codecgen. 2016-01-17 02:23:26 -08:00
k8s-merge-robot
37945771dc Merge pull request #19478 from mfojtik/go-dockerclient-bump 
Auto commit by PR queue bot
 2016-01-16 20:40:47 -08:00
k8s-merge-robot
7d02cf6310 Merge pull request #19691 from piosz/doc-cleanup 
Auto commit by PR queue bot
 2016-01-16 19:46:40 -08:00
k8s-merge-robot
d5dde09e10 Merge pull request #19465 from thockin/docs-nit 
Auto commit by PR queue bot
 2016-01-16 13:32:36 -08:00
k8s-merge-robot
4cd20f54fc Merge pull request #19460 from bprashanth/kubectl_desc_ing 
Auto commit by PR queue bot
 2016-01-16 12:55:54 -08:00
k8s-merge-robot
9e7da41481 Merge pull request #19440 from Random-Liu/add-update-count-in-density-test 
Auto commit by PR queue bot
 2016-01-16 11:47:32 -08:00
Mike Danese
912e54e496 Merge pull request #19749 from bprashanth/color 
Remove undefined color_ variables
 2016-01-16 10:46:31 -08:00
k8s-merge-robot
4969f11089 Merge pull request #19439 from bprashanth/compute_dep 
Auto commit by PR queue bot
 2016-01-16 10:38:11 -08:00
k8s-merge-robot
f2d273d481 Merge pull request #19128 from resouer/qps-limit 
Auto commit by PR queue bot
 2016-01-16 10:03:00 -08:00
k8s-merge-robot
ac0d01f8ca Merge pull request #19436 from yujuhong/status_cache_p2 
Auto commit by PR queue bot
 2016-01-16 09:24:19 -08:00
k8s-merge-robot
ffed4e1a3a Merge pull request #19428 from yifan-gu/rkt_isolator 
Auto commit by PR queue bot
 2016-01-16 08:48:38 -08:00
k8s-merge-robot
3816c1798f Merge pull request #19411 from eparis/boolflag-def-val 
Auto commit by PR queue bot
 2016-01-16 06:23:48 -08:00
k8s-merge-robot
c678ef3592 Merge pull request #19410 from mesosphere/jdef_run_job_with_timeout 
Auto commit by PR queue bot
 2016-01-16 05:53:40 -08:00
k8s-merge-robot
4010c214e4 Merge pull request #19752 from hongchaodeng/listandwatch 
Auto commit by PR queue bot
 2016-01-15 23:01:37 -08:00
k8s-merge-robot
f26713f997 Merge pull request #19137 from gmarek/fix-test 
Auto commit by PR queue bot
 2016-01-15 20:38:24 -08:00
Hongchao Deng
9a10e95f6e docs: Reflector ListAndWatch 2016-01-15 18:19:19 -08:00
k8s-merge-robot
fab5fbde7c Merge pull request #19507 from mikedanese/kubelet-config 
Auto commit by PR queue bot
 2016-01-15 18:14:53 -08:00
Prashanth Balasubramanian
7a97163914 Remove undefined color_ variables. 2016-01-15 18:06:32 -08:00
Mike Danese
78d27a5d2f deployment: fix nil pointer panic 2016-01-15 17:58:01 -08:00
Mike Danese
936c8cd597 Merge pull request #19685 from resouer/testing 
Replace fake handler using testing pkg
 2016-01-15 17:47:53 -08:00
Mike Danese
abf81b694b Merge pull request #19743 from bprashanth/scale 
Increase api call latency threshold.
 2016-01-15 17:12:04 -08:00
Prashanth Balasubramanian
6d172bcad4 Increase api call latency threshold. 2016-01-15 16:59:26 -08:00
Mike Danese
fe8ae1a28a autogenerated 2016-01-15 16:05:49 -08:00
Chao Xu
9d23d75071 Merge pull request #19499 from caesarxuchao/scale-client-gen 
client-gen: typed client with only the expansion interface
 2016-01-15 15:49:25 -08:00
Isaac Hollander McCreery
d4379ef9cb Merge pull request #19713 from ihmccreery/serial-job 
Add gce-serial and gke-serial jobs
 2016-01-15 15:43:03 -08:00
Mike Danese
1162cfd3b1 kubelet: move most of kubelet server configuration to a config object. 
This is part of migrating kubelet configuration to the componentconfig api
group and is preliminary to retrofitting client configuration and
implementing full fledged API group mechinary.

Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-01-15 15:31:59 -08:00
Isaac Hollander McCreery
78ea78e26b Collapse into one project 2016-01-15 15:16:00 -08:00
k8s-merge-robot
5054ab6458 Merge pull request #19712 from mikedanese/godep-pty 
Auto commit by PR queue bot
 2016-01-15 13:24:52 -08:00
k8s-merge-robot
df90bb44d9 Merge pull request #19679 from NanXiao/patch-1 
Auto commit by PR queue bot
 2016-01-15 13:24:43 -08:00
Random-Liu
8fb056d258 Add getTestPod() to avoid sharing object among test cases 2016-01-15 11:22:15 -08:00
Isaac Hollander McCreery
e61f6614ca Add gce-serial and gke-serial jobs to start deflaking serial, disruptive, and restart tests 2016-01-15 11:07:36 -08:00
Mike Danese
aa502874c4 godeps: update github.com/kr/pty 
Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-01-15 10:56:52 -08:00
k8s-merge-robot
7f095c1f8e Merge pull request #19391 from timstclair/pod-waiting 
Auto commit by PR queue bot
 2016-01-15 09:33:38 -08:00