8643 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Quinton Hoole	40e2eae5b4	Retry replication controller rolling updates on version mismatch. ... When kubectl does rolling updates of replication controllers, retry updates that fail due to version mismatches (caused by concurrent updates by other clients). These failed rolling updates were causing intermittent e2e test failures (e.g. issue 5821)	2015-04-02 17:53:34 -07:00
Quinton Hoole	dca645d416	Merge pull request #6388 from ixdy/e2e-sigterm-sigint ... Convert SIGTERM into SIGINT in e2e test runner	2015-04-02 17:03:55 -07:00
Abhi Shah	a918a719e0	Merge pull request #6334 from brendandburns/nginx ... Add an nginx docker image for use on the master.	2015-04-02 16:58:02 -07:00
Robert Bailey	fb4366b178	Merge pull request #6390 from satnam6502/serve_hostnames ... Adjust defaults and reporting for serve_hostnames	2015-04-02 16:49:24 -07:00
Brendan Burns	9f48a2f4e6	Add an nginx docker image for use on the master.	2015-04-02 16:42:17 -07:00
Brian Grant	b6f6de150a	Merge pull request #6118 from ghodss/kubectl-naming ... Make naming of kubectl subcommands consistent	2015-04-02 16:24:59 -07:00
Sam Ghods	ca18e86877	Make naming of kubectl subcommands consistent	2015-04-02 16:14:53 -07:00
Prashanth B	620af16892	Merge pull request #6097 from derekwaynecarr/limit_range_default_value ... Limit range supporting a default resource limits value	2015-04-02 16:04:09 -07:00
Saad Ali	e0cbe3853b	Merge pull request #6290 from simon3z/fix-event-update ... event: fallback to creations when update fails	2015-04-02 16:03:21 -07:00
Satnam Singh	1c2a903e78	Adjust defaults and reporting for serve_hostnames	2015-04-02 16:01:58 -07:00
Prashanth B	3fe4224b6c	Merge pull request #6314 from bparees/tokenbucket ... add a blocking accept method to RateLimiter	2015-04-02 16:01:17 -07:00
Quinton Hoole	4a2000c4aa	Merge pull request #6207 from brendandburns/server ... Add a limit to the number of in-flight requests that a server processes.	2015-04-02 15:46:54 -07:00
Vish Kannan	ee98731a2a	Merge pull request #6269 from ddysher/extend-mount ... Abstract IsMountPoint and improve FakeMounter	2015-04-02 15:29:38 -07:00
Jeff Grafton	8c7d6806d4	Convert SIGTERM into SIGINT in e2e test runner.	2015-04-02 14:54:22 -07:00
Zach Loafman	c627a3598c	Merge pull request #6384 from erictune/cleanup-addons.sh ... Use same addons script for init.d and systemd.	2015-04-02 14:49:44 -07:00
Prashanth B	66c6c48d68	Merge pull request #6383 from krousey/phabricator_example_json ... Fixing a couple of JSON files	2015-04-02 14:46:00 -07:00
Derek Carr	4ae016e022	Merge pull request #6382 from derekwaynecarr/fix_vagrant_kubelet ... Fix vagrant with etcd in pod	2015-04-02 17:22:44 -04:00
Dawn Chen	67c1678e7e	Merge pull request #6378 from yujuhong/docker_manager ... RFC: Kubelet: a step towards to better encapsulation of docker functions	2015-04-02 14:22:26 -07:00
Eric Tune	b9570b3daa	Use same addons script for init.d and systemd.	2015-04-02 14:07:23 -07:00
Quinton Hoole	bac5cd38c8	Merge pull request #6381 from lavalamp/fix ... Stop the bleeding for #6059	2015-04-02 14:06:45 -07:00
Kris Rousey	db99f78faf	Fixing a couple of JSON files so that kubectl create -f doesn't error out while parsing them.	2015-04-02 14:01:54 -07:00
Dawn Chen	6ac59c8969	Merge pull request #6257 from lavalamp/fix6 ... Add a test verifying that etcd watches work even when there's a bunch of unrelated changes	2015-04-02 14:00:20 -07:00
derekwaynecarr	c6bf46acd7	Fix vagrant with etcd in pod	2015-04-02 16:55:29 -04:00
Daniel Smith	6be09c5e97	Stop the bleeding for #6059	2015-04-02 13:54:10 -07:00
Daniel Smith	a3276577d8	Demonstration of etcd watch problem	2015-04-02 13:41:41 -07:00
Jeff Lowdermilk	96bdee8c28	Merge pull request #6312 from brendandburns/services ... Make expose use introspection to grab the port value if possible.	2015-04-02 13:32:50 -07:00
Satnam Singh	d0dcc379cb	Merge pull request #6341 from jayunit100/networking-test-reorder ... Reorder/Modularize networking e2e + pod launch phase, clean up comments.	2015-04-02 13:28:12 -07:00
Yu-Ju Hong	d01bc660b5	Kubelet: a step towards to better encapsulation of docker functions ... We want to stop leaking more docker details into kubelet, and we also want to consolidate some of the existing docker interfaces/structs. This change creates DockerManager as the new home of some functions in dockertools/docker.go. It also absorbs containerRunner. In addition, GetDockerPodStatus is renamed to GetPodStatus with the entire pod passed to it so that it is simialr to the what is defined in the container Runtime interface. Eventually, DockerManager should implement the container Runtime interface, and integrate DockerCache with a flag to turn on/off caching. Code in kubelet.go should not be using docker client directly.	2015-04-02 13:26:39 -07:00
Daniel Smith	4a3b1a2b9d	Merge pull request #6375 from abhgupta/abhgupta-dev ... Validating against negative weights for priority functions	2015-04-02 13:22:55 -07:00
Brian Grant	414be101b6	Merge pull request #6352 from piosz/api ... Removed PodStatus.Host	2015-04-02 13:16:24 -07:00
Dawn Chen	9b2f835a01	Merge pull request #6326 from ArtfulCoder/docker_image_creation ... Create Docker images for master components	2015-04-02 13:12:17 -07:00
Brendan Burns	674efe6de8	Make expose use introspection to grab the port value if possible. ... Also improve service printing to include public IP addresses.	2015-04-02 13:08:47 -07:00
David Oppenheimer	e03f035fdb	Merge pull request #6374 from brendandburns/docs ... Add some more clarity around "controversial" or "complex" PRs and merging.	2015-04-02 13:01:15 -07:00
Abhishek Shah	b1b779a8d5	docker image creation	2015-04-02 12:39:12 -07:00
Abhishek Gupta	8deedf8e1f	Validating against negative weights for priority functions	2015-04-02 12:30:22 -07:00
Brendan Burns	bd0ee98538	Add some more clarity around "controversial" or "complex" PRs and merging.	2015-04-02 12:05:49 -07:00
Jeff Lowdermilk	25724f7e31	Merge pull request #6333 from satnam6502/serve_hostnames ... Support GKE for serve_hostnames soak test	2015-04-02 11:58:29 -07:00
Ben Parees	70be667cf8	add a blocking accept method to RateLimiter	2015-04-02 14:33:18 -04:00
Satnam Singh	b21db4b214	Support GKE	2015-04-02 11:18:50 -07:00
Nikhil Jindal	75f8c3aec4	Merge pull request #6367 from bgrant0607/docfix ... Removed ancient api doc files.	2015-04-02 10:46:19 -07:00
Eric Paris	acdce749a3	Merge pull request #6335 from zmerlynn/fix_git_remote ... Infer the URL from the existing git setup. (I don't push via ssh)	2015-04-02 12:39:07 -05:00
Zach Loafman	20f856974c	Merge pull request #6366 from jlowdermilk/e2e-sisyphus ... Use an up-to-date nginx image for e2e tests	2015-04-02 10:37:45 -07:00
Victor Marmol	894fbc1e8a	Merge pull request #6368 from fgrzadkowski/measure_scheduler_latency ... Add basic latency metrics to scheduler.	2015-04-02 10:36:03 -07:00
Brendan Burns	4adc20e933	Merge pull request #6360 from GoogleCloudPlatform/revert-6196-parallel_arch ... Revert "Parallelize architectures in both the building and packaging pha...	2015-04-02 10:26:11 -07:00
Filip Grzadkowski	25f95b0672	Add basic latency metrics to scheduler.	2015-04-02 19:24:55 +02:00
Victor Marmol	f8f14b1cc1	Merge pull request #6349 from wojtek-t/node_watch_fields ... Kubelet watching only its own Node object	2015-04-02 10:20:39 -07:00
Brian Grant	b1a9e81e1f	Removed ancient api doc files.	2015-04-02 17:20:34 +00:00
Jeff Lowdermilk	7abcba9017	Use an up-to-date nginx image for e2e tests	2015-04-02 10:15:20 -07:00
Zach Loafman	e4b613b514	Infer the URL from the existing git setup. (I don't push via ssh) ... Also document using the recursive/ours merge strategy, because it's almost certainly what we want to do in this case.	2015-04-02 10:15:18 -07:00
Daniel Smith	c25a1be03a	Merge pull request #6345 from thockin/equalities_bug ... Remove dead, buggy code	2015-04-02 10:09:44 -07:00