Commit Graph

105211 Commits

Author SHA1 Message Date
Brendan Burns
b46d8d2337 Merge branch 'net' of https://github.com/brendandburns/kubernetes-1 into net 2014-06-20 09:01:17 -07:00
brendandburns
0a3996a5a6 Merge pull request #185 from thockin/master
Minor doc clarification regarding hooks symlinks.
2014-06-20 08:45:21 -07:00
brendandburns
3a9a3b1114 Merge pull request #174 from monnand/kubelet-cadvisor
Letting kubelet retrieve container stats from cAdvisor
2014-06-20 08:36:22 -07:00
brendandburns
62265126c5 Merge pull request #183 from proppy/client-coverage
pkg/client: refactor tests
2014-06-20 08:34:16 -07:00
Tim Hockin
853fd6e525 Minor doc clarification regarding hooks symlinks. 2014-06-20 08:31:51 -07:00
Ingo Gottwald
de062f6720 Fix guestbook example json syntax error 2014-06-20 11:51:38 +02:00
Johan Euphrosine
fe589a3f64 pkg/client: refactor tests 2014-06-19 23:12:27 -07:00
brendandburns
0c8d556afb Fix IP affinity to be per-pod, not per-container. 2014-06-19 23:09:21 -07:00
brendandburns
ba7fe835ce Add a travis build image. 2014-06-19 21:59:40 -07:00
brendandburns
168ec29f54 Merge pull request #178 from vmarmol/add-external-mounts
Adding support for external mounts
2014-06-19 21:28:40 -07:00
Nan Deng
a10a64856d use json.Marshal directly 2014-06-20 04:21:57 +00:00
Victor Marmol
e794f539d8 Adding support for external mounts 2014-06-19 21:14:19 -07:00
Nan Deng
7c7dfe3eeb style 2014-06-20 04:06:28 +00:00
jkaplowitz
33e12cf991 Merge pull request #181 from brendandburns/cmd
Fix the container manifest to so that Command is an array, not a string.
2014-06-19 20:30:42 -07:00
Brendan Burns
ae9fce1358 Fix the container manifest to so that Command is an array, not a string. 2014-06-19 20:21:20 -07:00
Daniel Smith
466be48c74 Merge pull request #166 from brendandburns/sync
Part #1 of synchronous requests: Add channels and a mechanism for waiting
2014-06-19 16:40:25 -07:00
Brendan Burns
2640de5c02 Part #1 of synchronous requests: Add channels and a mechanism for waiting on them 2014-06-19 16:13:13 -07:00
brendandburns
fced42719c Merge pull request #176 from lavalamp/master
Fix schema, regen docs
2014-06-19 15:46:25 -07:00
Nan Deng
865ba190ff write headers after error checking 2014-06-19 22:28:48 +00:00
brendandburns
4f9ed15bc5 Merge pull request #177 from lavalamp/test_fix
fix e2e test
2014-06-19 15:21:06 -07:00
Nan Deng
979f832a0c write StatusOK to the header after json.Encode() 2014-06-19 22:12:32 +00:00
Daniel Smith
53f6f3ead2 fix e2e test 2014-06-19 14:57:06 -07:00
Daniel Smith
f666131b5a Fix schema, regen docs 2014-06-19 14:55:17 -07:00
Nan Deng
d001110df1 gofmt -s -w -l 2014-06-19 20:59:20 +00:00
brendandburns
e031c193a3 Merge pull request #164 from lavalamp/master
Standardize terminology on "selector"
2014-06-19 13:55:27 -07:00
Nan Deng
2cc3a88411 unit test for GetContainerStats() 2014-06-19 20:44:53 +00:00
Nan Deng
1b9cb5d501 more unit test 2014-06-19 20:44:53 +00:00
Nan Deng
b01a12fe34 more unit test for GetContainerStats() 2014-06-19 20:44:53 +00:00
Nan Deng
3080262f12 unit test for cadvisor 2014-06-19 20:44:53 +00:00
Nan Deng
b66a822166 testify 2014-06-19 20:44:53 +00:00
Nan Deng
c7eaa2095c GOPATH... 2014-06-19 20:44:52 +00:00
Nan Deng
037cfd257f add /containerStats 2014-06-19 20:44:52 +00:00
Nan Deng
2402e939c2 Add cAdvisor into third_party 2014-06-19 20:44:52 +00:00
Daniel Smith
936ce13862 Merge pull request #171 from brendandburns/poll
Wire in the pod cache.  Just used for List for now.
2014-06-19 13:37:53 -07:00
Daniel Smith
5a1a793784 fix after rebase 2014-06-19 13:33:36 -07:00
Daniel Smith
64b419072f Fix one more service example 2014-06-19 13:31:42 -07:00
Daniel Smith
cfce408266 Rename ReplicasInSet to ReplicaSelector 2014-06-19 13:31:42 -07:00
Daniel Smith
ee02cb2bf8 Update api sources. Still need to regen documentation. 2014-06-19 13:31:42 -07:00
Daniel Smith
f9e9a7c686 Update guestbook example 2014-06-19 13:31:42 -07:00
Daniel Smith
bc02b3c21a Rename [label] query to selector 2014-06-19 13:31:42 -07:00
Daniel Smith
c4649d539b Separate labels and selector in services for clarity 2014-06-19 13:30:04 -07:00
brendandburns
59c08db4c1 Merge pull request #43 from drewcsillag/master
Add location of where to get the gcloud tools.
2014-06-19 10:12:03 -07:00
Drew Csillag
a824581941 Add location of where to get the gcloud tools to README.md 2014-06-19 09:51:09 -04:00
Brendan Burns
302ec0f37b Wire in the pod cache. Just used for List for now. 2014-06-18 22:26:35 -07:00
Daniel Smith
4c7cc33066 Merge pull request #165 from brendandburns/replicas
On delete, also attempt to update controller state
2014-06-18 22:10:13 -07:00
Brendan Burns
84b2a9e9f3 On delete, also attempt to update controller state, in case we
missed a previous update.  Add a test to validate that this works
2014-06-18 21:32:55 -07:00
Daniel Smith
6cf4585ae8 Merge pull request #162 from brendandburns/poll
Add a PodCache that is responsible for caching pod information.
2014-06-18 21:06:38 -07:00
Brendan Burns
4f549aae54 Add a PodCache that is responsible for caching pod information.
Not wired in yet.
2014-06-18 20:04:52 -07:00
Daniel Smith
e2974a0a75 Merge pull request #163 from brendandburns/cloudcfg
Add IP to hostname in cloudcfg printing.
2014-06-18 15:31:56 -07:00
Brendan Burns
b3f0e1724d Add IP to hostname in cloudcfg printing. 2014-06-18 15:25:47 -07:00