Commit Graph

8594 Commits

Author SHA1 Message Date
Robert Bailey
f15e34a1bf Revert "Merge pull request #6309 from GoogleCloudPlatform/revert-6243-kubelet-ssl"
This reverts commit 96a0a0d618, reversing
changes made to 2af9b54147.
2015-04-02 10:44:37 -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
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
Brendan Burns
cdd6d0f313 Merge pull request #6350 from jsafrane/nfs-example
Add NFS export/import pod examples.
2015-04-02 09:47:09 -07:00
Brendan Burns
51ec400d6d Merge pull request #6353 from fgrzadkowski/perf
Increase ulimit -n for apiserver.
2015-04-02 09:42:48 -07:00
Wojciech Tyczynski
6b08958264 Kubelet watching only its own Node 2015-04-02 18:39:59 +02:00
Brendan Burns
67003f323a Merge pull request #6356 from deads2k/deads-parse-error
abac policy file parsing bug
2015-04-02 09:28:59 -07:00
Eric Tune
ecf39a6d10 Merge pull request #5414 from chuckbutler/juju-cluster-up
Adds JUJU to the Kubernetes Provider listing
2015-04-02 09:27:54 -07:00
Brendan Burns
fdf7ccbcfe Merge pull request #6361 from vmarmol/describe
Include ContainerStatus in "describe pod".
2015-04-02 09:23:21 -07:00
Eric Tune
3025fa8708 Merge pull request #6151 from AntonioMeireles/add_pointer_to_docs
adding to docs pointers to my personal take on k8s on top of CoreOS and Vagrant
2015-04-02 09:15:36 -07:00
Eric Tune
294b71d2af Merge pull request #6138 from bronislav/update-aws-template
A few update AWS template
2015-04-02 09:01:58 -07:00
Victor Marmol
657bc33500 Include ContainerStatus in "describe pod".
Fixes #6076.
2015-04-02 08:51:41 -07:00
Zach Loafman
9f60dde320 Revert "Parallelize architectures in both the building and packaging phases of make release" 2015-04-02 08:49:11 -07:00
Victor Marmol
de8359e885 Merge pull request #6358 from thockin/swag
Update swagger
2015-04-02 08:47:10 -07:00
Tim Hockin
79c4cfba0c update swagger 2015-04-02 08:33:09 -07:00
deads2k
00fc17e690 abac policy file parsing bug 2015-04-02 11:13:20 -04:00
Filip Grzadkowski
65c2942a82 Increase ulimit -n for apiserver. 2015-04-02 17:01:23 +02:00
Victor Marmol
1065302bf4 Merge pull request #6327 from mikedanese/readiness-probe-busted
Fix readiness probe
2015-04-02 07:54:47 -07:00
Mike Danese
32c7de290c fix readiness probe 2015-04-02 06:56:34 -07:00
Jan Safranek
ed46c4db51 Add NFS export/import pod examples. 2015-04-02 10:47:21 +02:00
Jerzy Szczepkowski
a94ffc8625 Merge pull request #6331 from vishh/heapster_release
Update heapster version to v0.10.0
2015-04-02 10:21:47 +02:00
Jerzy Szczepkowski
860257e01f Merge pull request #6050 from piosz/docs
Changed merge policy
2015-04-02 10:09:05 +02:00
Jerzy Szczepkowski
eac24b3241 Merge pull request #6337 from gosharplite/patch-4
Fix typo.
2015-04-02 09:37:45 +02:00
Jerzy Szczepkowski
ad306c9c6e Merge pull request #6340 from zmerlynn/upgrade_gcloud
Automatically upgrade gcloud in Jenkins (reenable)
2015-04-02 09:37:27 +02:00
Jerzy Szczepkowski
8cff43dfb7 Merge pull request #6330 from jayunit100/local-up-fix
Check to prevent split brain api-servers/api-clients which can happen if...
2015-04-02 09:34:19 +02:00
Zach Loafman
723aa86013 Merge pull request #6344 from jlowdermilk/fix-e2e
fix e2e/kubectl for gke
2015-04-01 21:40:38 -07:00
Tim Hockin
c63f4c71ba Remove dead, buggy code 2015-04-01 21:25:49 -07:00
Jeff Lowdermilk
1857aa0388 fix e2e/kubectl for gke 2015-04-01 21:24:16 -07:00
Quinton Hoole
46e5ec3617 Merge pull request #6339 from zmerlynn/skip_paranoia
Skip cleaning docker cache prior to build
2015-04-01 20:21:49 -07:00
Zach Loafman
6ba14f1c28 Skip cleaning docker cache prior to build
This seems to be more trouble than its worth, and much of
the remaining build time (except the push itself). We can
cache the cross-build/golang images between builds - it's
not going to kill us, and it'll save the occasional weird
flake of not finding an image when it tries to rm one of
these.
2015-04-01 20:04:24 -07:00
jayunit100
1cc61174ea Check to prevent split brain api-servers/api-clients which can happen if etcd dies between rerun of local-up-cluster.sh 2015-04-01 22:56:34 -04:00
Zach Loafman
4fa84a4f41 Automatically upgrade gcloud in Jenkins (reenable) 2015-04-01 19:27:17 -07:00
Zach Loafman
1ff0a1e2a1 Merge pull request #6270 from jlowdermilk/gcloud-updates
Updates for gcloud 0.9.54
2015-04-01 19:14:57 -07:00
Tony Hsu
d9bb420410 Fix typo. 2015-04-02 10:13:29 +08:00
Brian Grant
0e67b299d5 Merge pull request #6325 from rjnagal/node
Remove validation for Capacity. Add default for ExternalID
2015-04-01 18:25:32 -07:00
Alex Robinson
9949936b5c Merge pull request #6300 from cjcullen/tokens
Add an alternative TokenSource to the GCE CloudProvider.
2015-04-01 18:02:40 -07:00
Quinton Hoole
3a724b2622 Merge pull request #6196 from zmerlynn/parallel_arch
Parallelize architectures in both the building and packaging phases of `make release`
2015-04-01 17:55:43 -07:00
CJ Cullen
5e6e67ba59 Add an alternative TokenSource to the GCE CloudProvider. 2015-04-01 17:52:30 -07:00
Rohit Jnagal
e0ff139279 Remove validation for Capacity as it got moved from Spec to Status.
Also fix breakage from ExternalID validation: Default ExternalID to node name when not specified.
2015-04-02 00:51:52 +00:00
Jeff Lowdermilk
ce72839153 Merge pull request #6329 from mbforbes/fixUp
Fix pod that's looked for on kube up.
2015-04-01 17:51:37 -07:00
Zach Loafman
b3413eaa59 Merge pull request #6332 from a-robinson/bust
Don't ever give up on retrying downloads in the GCE download-or-bust function
2015-04-01 17:44:12 -07:00
Alex Robinson
4f9b1c486f Don't ever give up on retrying downloads in the GCE download-or-bust function. 2015-04-02 00:40:19 +00:00
Vishnu Kannan
e6833639a2 Update heapster version to v0.10.0 2015-04-02 00:39:24 +00:00