github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,607 Commits 1 Branch 31 Tags
454ebc4e30ebc36b4a60d3cf335eaceb2ee7b75b
Commit Graph

9877 Commits

Author SHA1 Message Date
Fabio Yeon
c6253c8d5e Merge pull request #19971 from feihujiang/fixErrorCommentInNodeCondition 
Fix a small error comment in nodecondition type
 2016-01-28 14:01:54 -08:00
Fabio Yeon
4c57ad8379 Merge pull request #19978 from markturansky/typos 
Fixed spelling typo
 2016-01-28 14:01:03 -08:00
Fabio Yeon
547a2e2387 Merge pull request #20131 from thockin/logs-for-19574 
Augment logs in runContainer path
 2016-01-28 13:49:59 -08:00
Brian Grant
282b9eebb8 Merge pull request #20241 from janetkuo/fix-recreatedeployment 
Fix e2e test failure for RecreateDeployment
 2016-01-28 13:28:48 -08:00
Andy Goldstein
86ae623a09 Help debug port forward flakes 2016-01-28 15:28:40 -05:00
Filip Grzadkowski
471e602bcd Merge pull request #20155 from mwielgus/update-heapster-api 
Update Heapster API in Godeps
 2016-01-28 14:14:27 +01:00
Marcin Wielgus
b49cba7182 Update Heapster API in Godeps 2016-01-28 11:55:22 +01:00
Janet Kuo
7255af6de3 Fix e2e test failure for RecreateDeployment 2016-01-27 15:04:54 -08:00
k8s-merge-robot
458eb5284a Merge pull request #19105 from smarterclayton/prepare_negotiate 
Auto commit by PR queue bot
 2016-01-27 13:35:30 -08:00
Filip Grzadkowski
a5a23940bb Speed up UUID generation. 
Fixes #19036
Fixes #18608
 2016-01-27 15:39:23 +01:00
k8s-merge-robot
bd7255a27e Merge pull request #18901 from kargakis/inert-deployments 
Auto commit by PR queue bot
 2016-01-27 05:14:38 -08:00
Filip Grzadkowski
63ec304e42 Merge pull request #20159 from fgrzadkowski/master 
Add tracing information in etcd helper
 2016-01-27 10:01:01 +01:00
k8s-merge-robot
3f5e417999 Merge pull request #19502 from swagiaal/internalize-ownership 
Auto commit by PR queue bot
 2016-01-26 23:06:39 -08:00
Chao Xu
c7ca0821da Add service_expansion.go 2016-01-26 17:09:11 -08:00
k8s-merge-robot
67939eb933 Merge pull request #19958 from caesarxuchao/fix-resource-case 
Auto commit by PR queue bot
 2016-01-26 16:46:41 -08:00
k8s-merge-robot
b8413f6cdd Merge pull request #13853 from jhadvig/extend_secret 
Auto commit by PR queue bot
 2016-01-26 16:19:12 -08:00
Clayton Coleman
38c7eded99 Prepare for content-type negotiation 
Combine the fields that will be used for content transformation
(content-type, codec, and group version) into a single struct in client,
and then pass that struct into the rest client and request. Set the
content-type when sending requests to the server, and accept the content
type as primary.

Will form the foundation for content-negotiation via the client.
 2016-01-26 17:44:30 -05:00
Brendan Burns
f919c3bb66 Merge pull request #19973 from bprashanth/replication_controllers 
Sync pods with store before starting controllers
 2016-01-26 12:47:51 -08:00
Brendan Burns
ca51446101 Merge pull request #20148 from davidopp/flake3 
Manually revert #19580 and #17754.
 2016-01-26 11:56:17 -08:00
Mike Danese
53b9e78db8 Merge pull request #20129 from Clarifai/ecr 
Register ECR credential plugin only when  AWS cloud instance is created
 2016-01-26 10:16:04 -08:00
Michail Kargakis
06c0a4718a extensions: generated code for paused deployments 2016-01-26 18:40:05 +01:00
Eric Paris
8e1ca68760 Merge pull request #20020 from apcera/cleanup-docker-engine-check 
kubelet: Update engine version parsing to handle semantic versioning
 2016-01-26 11:44:02 -05:00
Filip Grzadkowski
2200aacbad Add tracing information in etcd helper. 
Ref #19036
 2016-01-26 17:18:15 +01:00
jhadvig
5927ad81be Additional SecretTypes 2016-01-26 14:34:12 +01:00
k8s-merge-robot
8c821700f3 Merge pull request #19389 from justinsb/internal_cidr 
Auto commit by PR queue bot
 2016-01-26 03:58:48 -08:00
Michail Kargakis
436d2677f9 extensions: support paused deployments 
This commit adds support for paused deployments so a user can choose
when to run a deployment that exists in the system instead of having
the deployment controller automatically reconciling it after every
change or sync interval.
 2016-01-26 12:42:26 +01:00
k8s-merge-robot
a14d0fd641 Merge pull request #19382 from janetkuo/deployment-status 
Auto commit by PR queue bot
 2016-01-26 03:24:37 -08:00
k8s-merge-robot
52cb4c1d9d Merge pull request #18445 from resouer/fix-emptydir 
Auto commit by PR queue bot
 2016-01-26 02:45:54 -08:00
David Oppenheimer
85f88b8645 Run gofmt. 2016-01-25 23:25:38 -08:00
David Oppenheimer
2a6da5871a Revert #19580 and #17754. Fixes #20048. 2016-01-25 23:19:22 -08:00
k8s-merge-robot
88a72c2c9d Merge pull request #19938 from mikedanese/ipvalidate 
Auto commit by PR queue bot
 2016-01-25 21:09:51 -08:00
k8s-merge-robot
2286bd3a38 Merge pull request #19961 from mamikonyana/newrepo 
Auto commit by PR queue bot
 2016-01-25 19:51:23 -08:00
Rudi Chiarito
76e29ed455 Register ECR credential plugin only when an AWS cloud instance is created 2016-01-25 22:18:45 -05:00
Tim Hockin
45e5912c3d Augment logs in runContainer path 
Generating errors that are useful is hard.
 2016-01-25 16:31:32 -08:00
Dawn Chen
19ef0779f1 Merge pull request #20123 from brendandburns/flake3 
Disable closing of the httptest Server due to https://github.com/golang/go/issues/12262
 2016-01-25 16:22:23 -08:00
Dawn Chen
1087803e12 Merge pull request #20004 from thockin/logs-for-17181-flake 
Add logs to try to diagnose #17181
 2016-01-25 15:38:34 -08:00
Brendan Burns
b8b074f41f Disable closing of the httptest Server due to https://github.com/golang/go/issues/12262 2016-01-25 15:31:48 -08:00
Tim Hockin
c924533e45 Add logs to try to diagnose #17181 2016-01-25 15:01:03 -08:00
Janet Kuo
591269c99c Surface available/unavailable pods in deployment describer 2016-01-25 14:30:15 -08:00
Janet Kuo
9739a67833 Deployment status: number of available/unavailable pods 2016-01-25 14:30:15 -08:00
Quinton Hoole
10f7985dfb Merge pull request #19995 from justinsb/gce_label_pd 
Ubernetes-Lite GCE: Label volumes with zone information
 2016-01-25 10:34:10 -08:00
k8s-merge-robot
d7d601b2fc Merge pull request #18876 from erictune/dynamic-job 
Auto commit by PR queue bot
 2016-01-25 08:06:22 -08:00
k8s-merge-robot
d3b869ae14 Merge pull request #17922 from smarterclayton/split_codec 
Auto commit by PR queue bot
 2016-01-25 06:30:39 -08:00
harry
0fa5b6c4f7 Add e2e test for wrapper volumes 
Use git server in e2e and refactor wrapper builder

Update e2e test to use a fake git server
 2016-01-24 16:57:44 +08:00
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
Daniel Smith
c0ffbd58db Remove TestWatchEtcdError 
We decided to remove this test, as there's no way to get an upper bound
on its running time. Etcd restart behavior should be tested in
integration or e2e tests.
 2016-01-22 16:43:44 -08:00
Prashanth Balasubramanian
ffd34311c6 Sync pods for daemon sets. 2016-01-22 16:42:07 -08:00
Prashanth Balasubramanian
1b93ee7b35 Sync all pods with store before starting RC Manager. 2016-01-22 16:42:02 -08:00
Zach Loafman
6397b781ac Merge pull request #20030 from kubernetes/revert-18169-smarter-scaling 
Revert "kubectl: Make scaling smarter"
 2016-01-22 15:07:26 -08:00
Zach Loafman
0791de15e3 Merge pull request #20007 from smarterclayton/ipallocrace 
19848: Retry service IP repair on conflict
 2016-01-22 15:02:05 -08:00