Commit Graph

4366 Commits

Author SHA1 Message Date
saadali
0db4b8e2ad Fix Issue #3002: kubectl get pods/log podname don't work well together 2014-12-18 18:15:47 -08:00
Vish Kannan
c34f2d354c Merge pull request #3035 from dchen1107/master
Update fsouza/go-dockerclient pkg to latest revision and fix some compiling issues.
2014-12-18 14:07:40 -08:00
Dawn Chen
8860851f94 Merge pull request #3039 from brendandburns/e2e
Remove some dead code.
2014-12-18 14:04:27 -08:00
Dawn Chen
608c3d5046 Update kubelet package on latest go-dockerclient package. 2014-12-18 13:49:13 -08:00
Dawn Chen
95e3efdad8 Really upgrade fsouza/go-dockerclient pkg to latest revision, so that we can have
Error and OOMKilled from docker ContainerStatus.
2014-12-18 13:49:12 -08:00
Daniel Smith
a50f8034c8 Merge pull request #3037 from smarterclayton/hide_spurious_watch_errors
When connections are broken on Watch, write fewer errors to logs
2014-12-18 13:33:03 -08:00
Brendan Burns
845fb5013d Remove some dead code. 2014-12-18 13:32:20 -08:00
Daniel Smith
3ade280f89 Merge pull request #2813 from derekwaynecarr/ns_url
Move namespace from query param to path part
2014-12-18 13:31:45 -08:00
Clayton Coleman
b2434de777 When connections are broken on Watch, write fewer errors to logs
Watch depends on long running connections, which intervening proxies
may break without the control of the remote server. Specific errors
handled are io.EOF, io.EOF wrapped by *url.Error, http connection
reset errors (caused by race conditions in golang http code), and
connection reset by peer (simply tolerated).
2014-12-18 16:15:51 -05:00
Daniel Smith
cd2432891d Merge pull request #3038 from vishh/fix_monitoring
Fix bug in gce monitoring setup.
2014-12-18 13:07:18 -08:00
Vishnu Kannan
aa7a311c34 Fix bug in gce monitoring setup. 2014-12-18 20:47:41 +00:00
Daniel Smith
3f926e943a Merge pull request #3036 from liggitt/cert_cn
Make cert CN unique to avoid certificate serial number clashes
2014-12-18 12:30:09 -08:00
derekwaynecarr
cbbe61d115 Fix path ordering in client 2014-12-18 15:27:27 -05:00
Jordan Liggitt
2de478f16c Make cert CN unique to avoid certificate serial number clashes 2014-12-18 15:13:32 -05:00
Daniel Smith
af571a239e Merge pull request #3011 from saad-ali/2948
Issue 2948: fix "kubectl get events" result not sorted
2014-12-18 11:18:27 -08:00
saadali
ae1db31a0f Issue 2948: fix "kubectl get events" result not sorted 2014-12-18 11:02:12 -08:00
Dawn Chen
b489757b5a Merge pull request #3033 from lavalamp/dockerObjWrap
Update fsouza/go-dockerclient.
2014-12-18 10:48:23 -08:00
Daniel Smith
5b188a5842 Update fsouza/go-dockerclient. This grabs an unexpected number of dependencies. 2014-12-18 10:28:25 -08:00
Brendan Burns
82d0d68571 Merge pull request #3027 from jdef/rest_no_network_settings
only log about no network settings for running pods
2014-12-18 10:19:20 -08:00
Brendan Burns
36bc3604b9 Merge pull request #2893 from brendandburns/pd3
Make it easier to update nodes, make it possible to update capacity.
2014-12-18 10:18:54 -08:00
bgrant0607
0892fd3d6d Merge pull request #3029 from ddysher/get-err-code
Fix node Get() error code
2014-12-18 09:52:45 -08:00
Joe Beda
eed5252993 Merge pull request #3023 from tozd/fix-salt-deps
Add missing Salt requisites
2014-12-18 09:16:16 -08:00
Joe Beda
a781bd6b04 Merge pull request #3008 from cjcullen/deploy
Only create a single firewall rule for all minions.
2014-12-18 09:00:46 -08:00
Joe Beda
a781c02229 Merge pull request #3032 from zmerlynn/testtar
Fix OS X testtar build break
2014-12-18 08:49:54 -08:00
Zach Loafman
a4c4746f7c Fix OS X testtar build break
Handle copy in super portable way. Every tar on the planet should
accept this. Oblig XKCD: http://xkcd.com/1168/
2014-12-18 08:23:46 -08:00
bgrant0607
19f0b8b807 Merge pull request #2825 from mikedanese/scheduler-factory-plugins
Scheduler plugin configuration
2014-12-18 07:12:01 -08:00
Deyuan Deng
677f68ec02 Fix node Get() error code 2014-12-18 23:03:52 +08:00
James DeFelice
b3c7aa8a53 only log about no network settings for running pods 2014-12-18 08:41:56 -05:00
Jernej Kos
430a04af45 Added missing Salt requisites. 2014-12-18 10:29:39 +01:00
Brendan Burns
fd7b4d46cb Merge pull request #3022 from IanLewis/master
Fixed position of NUM_MINIONS example
2014-12-17 22:22:08 -08:00
Brendan Burns
b58785b27d Merge pull request #3019 from dchen1107/cleanup
suppress unnecessary stacktrace when http status code is redirect relate...
2014-12-17 22:08:43 -08:00
Ian Lewis
ed1962c1ca Fixed position of NUM_MINIONS example 2014-12-18 15:04:04 +09:00
Brendan Burns
4427672cde Merge pull request #2875 from foleymic/master
add SessionAffinity type to ServiceSpec
2014-12-17 21:53:35 -08:00
Brendan Burns
cf0b41535f Make it easier to update nodes, make it possible to update capacity. 2014-12-17 21:50:26 -08:00
Brendan Burns
1720a4f170 Merge pull request #3001 from zmerlynn/taptimes
Fix duration_ms output to seconds (_ms obviously means measure-in-second...
2014-12-17 21:42:01 -08:00
Dawn Chen
71fc5940f1 suppress unnecessary stacktrace when http status code is redirect related. 2014-12-17 18:42:11 -08:00
Daniel Smith
8379966ac5 Merge pull request #3015 from brendandburns/fix
Remove HTTP Server support for pushing pods onto the kubelet.
2014-12-17 17:30:14 -08:00
Daniel Smith
305596edd6 Merge pull request #3014 from smarterclayton/fix_name_of_minion_in_v1beta1
v1beta1 should return Minion as kind, rather than Node
2014-12-17 17:20:21 -08:00
Brendan Burns
928f52056e Remove HTTP Server support for pushing pods onto the kubelet. 2014-12-17 17:15:36 -08:00
CJ Cullen
90364b30b0 Only create a single firewall rule for all minions. 2014-12-17 17:10:07 -08:00
Clayton Coleman
7fde4583f2 v1beta1 should return Minion as kind, rather than Node
This changes the internal name logic (for conversion) to prefer the
internal registered preferred name for a resource, and then makes
v1beta1 and v1beta2 prefer Minion.

Fixes #3010
2014-12-17 19:55:56 -05:00
Dawn Chen
edfae8660e Merge pull request #2994 from brendandburns/exec
Track the sources that the kubelet has seen
2014-12-17 16:17:48 -08:00
Joe Beda
da7d5d1a62 Merge pull request #3007 from zmerlynn/testtar
Add kubernetes-test.tar.gz
2014-12-17 15:59:28 -08:00
Mike Danese
4850bdbe63 refactor scheduler factory to use plugin architecture style like credentialprovider and cloudprovider for configuring priority functions and fit predicates 2014-12-17 14:55:28 -08:00
Zach Loafman
d3aed6c9cd Add kubernetes-test.tar.gz
Add test artifacts to the build. This lets you do:

tar -xzf kubernetes.tar.gz
tar -xzf kubernetes-test.tar.gz
cd kubernetes
go run ./hack/e2e.go -up -test -down

without having a git checkout.
2014-12-17 14:30:30 -08:00
Dawn Chen
7c66ebe2e0 Merge pull request #2985 from lavalamp/fix4
fix godep instructions
2014-12-17 13:52:18 -08:00
bgrant0607
3f22854e77 Merge pull request #2999 from dchen1107/podstatus
Determine PodStatus based on ContainerStatus and RestartPolicy
2014-12-17 13:51:41 -08:00
Joe Beda
fec6b887dd Merge pull request #2955 from jbeda/vagrant-docker-extra
Rework vagrant cluster set up.
2014-12-17 13:23:10 -08:00
Joe Beda
428aeacf6d Rework vagrant cluster set up.
* Have a single config file that mirrors other cluster providers
* Warn users not to use 'vagrant up' directly
* Allow 'extra' parameters to the docker daemon.  Fixes #2685
* Renumbers things so that they are more sane.  Master/minions are 10.245.1.x, container subnets are 10.246.x.1/24, portal is 10.247.0.0/16
2014-12-17 13:23:39 -08:00
Brendan Burns
7da0378f3c Track the sources that the kubelet has seen, and only delete pods
when every source has been seen at least once.
2014-12-17 13:08:43 -08:00