Commit Graph

4301 Commits

Author SHA1 Message Date
Joe Beda
93ed9173e3 Merge pull request #2781 from commonlisp/master
simplify util.ErrorList by eliminating errorListInternal
2014-12-16 15:43:55 -08:00
Joe Beda
940e5ed34c Merge pull request #2929 from resouer/harry-fix-box
Add kuber box location env to make it faster.
2014-12-16 15:42:24 -08:00
Dawn Chen
ec9e6fb87a Merge pull request #2987 from lavalamp/fix6
fix Godeps.json; upgrade context, html, and websocket packages
2014-12-16 15:30:19 -08:00
Daniel Smith
f27bfc52ce fix Godeps.json; upgrade context, html, and websocket packages 2014-12-16 15:15:36 -08:00
Brendan Burns
bb28949291 Merge pull request #2831 from jdef/unit_test_for_2815
unit test for #2815, as requested by @brendandburns
2014-12-16 15:08:41 -08:00
Jeff Lowdermilk
c2fa72d6ba Merge pull request #2986 from jbeda/docker-default-fix
Make the test for the 'docker_opts' grain more robust.
2014-12-16 15:04:16 -08:00
bgrant0607
003ba68e4c Merge pull request #2978 from brendandburns/exec
Add an e2e test for exec liveness probes.  Fix the docker exec integration
2014-12-16 14:53:21 -08:00
Joe Beda
911a437c1b Make the test for the 'docker_opts' grain more robust.
Fixes #2982
2014-12-16 14:26:36 -08:00
bgrant0607
8ba169f6a4 Merge pull request #2983 from jbeda/local-clarify
Make it clearer how to run kubectl after bringing up a local cluster.
2014-12-16 14:24:06 -08:00
Joe Beda
e933ac5784 Make it clearer how to run kubectl after bringing up a local cluster.
Fixes #2935.
2014-12-16 14:21:22 -08:00
Brendan Burns
3a0d16ff35 Add an e2e test for exec liveness probes. Fix the docker exec integration. 2014-12-16 13:53:32 -08:00
bgrant0607
56ee66831b Merge pull request #2979 from brendandburns/e2e
Wait for not pending, not for running.
2014-12-16 13:49:49 -08:00
Brendan Burns
12803c1a0e Merge pull request #2944 from deads2k/deads-make-monitoring.sh-run
make e2e/monitor.sh work outside gce
2014-12-16 13:28:49 -08:00
Brendan Burns
d2ff21d3d5 Wait for not pending, not for running.
When failures occur, we go to 'Terminated' which can cause
indefinite blocking.
2014-12-16 13:27:34 -08:00
Brendan Burns
58ba3c7faa Merge pull request #2976 from dchen1107/newdocker
Move salt based clusters to Docker 1.4.0
2014-12-16 12:14:54 -08:00
deads2k
8313e5d9bf make e2e/monitor.sh work outside gce 2014-12-16 15:01:16 -05:00
Dawn Chen
04b136a7db Move salt based clusters to Docker 1.4.0 2014-12-16 11:58:45 -08:00
Daniel Smith
e62280d84a Merge pull request #2957 from brendandburns/e2e
Add an e2e test for http liveness.
2014-12-16 11:42:33 -08:00
Brendan Burns
f1b55c04e2 Add an e2e test for http liveness. 2014-12-16 11:38:52 -08:00
Clayton Coleman
eb0f32bf0f Merge pull request #2911 from smarterclayton/event_field_should_be_condition
Rename Event.Status to Event.Condition to match v1beta3 agreement
2014-12-16 14:28:18 -05:00
Daniel Smith
36aeef009d Merge pull request #2964 from deads2k/deads-typo
typo in authorization.md
2014-12-16 10:22:10 -08:00
Joe Beda
52e165a4fd Merge pull request #2954 from brendandburns/rev7
Release v0.7.0
2014-12-16 09:25:26 -08:00
Clayton Coleman
9868587568 Merge pull request #2966 from eparis/fedora-guide-fqdn
fedora guide: include http in the --master statement
2014-12-16 10:47:23 -05:00
Eric Paris
4c00228ca7 fedora guide: include http in the --master statement
otherwise you end up with:
  unsupported protocol scheme "fqdn.example.com"
2014-12-16 10:44:32 -05:00
Clayton Coleman
4760b287f9 Merge pull request #2956 from ddysher/fix-magic-number
Use constant for port number
2014-12-16 09:44:15 -05:00
Clayton Coleman
88715cc6ef Rename Event.Status to Event.Condition to match v1beta3 agreement
Question - should this be a phase?  Seems like no, since phase implies
defined lifecycle and this field is explicitly not defined.
2014-12-16 09:43:10 -05:00
deads2k
d163092c2e typo in authorization.md 2014-12-16 09:21:09 -05:00
Clayton Coleman
61e8baeef9 Merge pull request #2662 from ddysher/node-watch
Enable watch on node labels.
2014-12-16 09:17:43 -05:00
Deyuan Deng
3f84924095 Use constant for port number 2014-12-16 11:45:27 +08:00
Daniel Smith
0fd1ed2ba9 Merge pull request #2720 from brendandburns/tap
Add support for TAP (test anything protocol) output
2014-12-15 18:29:04 -08:00
Daniel Smith
6902f6ab21 Merge pull request #2844 from brendandburns/fix
Handle a missing apiserver flag better.
2014-12-15 17:25:09 -08:00
Brendan Burns
feb80f0c52 Kubernetes version v0.7.0-dev 2014-12-15 16:57:39 -08:00
Brendan Burns
ad44234f71 Kubernetes version v0.7.0 2014-12-15 16:57:39 -08:00
Daniel Smith
5b15d3a1ea Merge pull request #2829 from a-robinson/upgrade
Make it easy to use the e2e tests to test upgrading a running master
2014-12-15 16:56:19 -08:00
Joe Beda
308b078ee7 Merge pull request #2857 from jainvipin/master
ubuntu getting started guide
2014-12-15 16:13:25 -08:00
bgrant0607
f621a05d74 Merge pull request #2945 from smarterclayton/support_optional_swagger
Make Swagger API support optional, so that consumers can define their own
2014-12-15 16:13:13 -08:00
Deyuan Deng
45bfcb451b Enable watch on node changes. 2014-12-16 08:12:31 +08:00
Alex Robinson
fe76243b05 Make it easy to use the e2e tests to test upgrading a running master
by adding support for testing official release versions and writing a
simple script to first bring up and test the old version before
upgrading it and testing it again. Related to supporting in-place
upgrades of masters (#2524).
2014-12-15 16:03:11 -08:00
Vipin Jain
cf24c77e78 ubuntu getting started guide 2014-12-15 15:43:35 -08:00
Brendan Burns
f2a5457296 Merge pull request #2952 from satnam6502/colour
Avoid redeclaration errors for kube-up.sh
2014-12-15 15:33:33 -08:00
Satnam Singh
c928c43a15 Avoid redeclaration errors for kube-up.sh 2014-12-15 15:23:04 -08:00
bgrant0607
9bc8915eeb Merge pull request #2912 from smarterclayton/small_v1beta3_refactors_2
More small refactors for v1beta3 -> internal
2014-12-15 15:16:36 -08:00
Brendan Burns
1a5a7ebd69 Handle a missing apiserver flag better. 2014-12-15 15:14:41 -08:00
Brendan Burns
3add708390 Merge pull request #2950 from zulily/rax-master-ip-loop
Look up master node IP address in a loop
2014-12-15 15:05:54 -08:00
Brendan Burns
2c64db5943 Merge pull request #2938 from vishh/exec
Updated docker version that supports exec to '1.3.0'.
2014-12-15 14:49:12 -08:00
Joe Beda
cf5eff0cc2 Merge pull request #2925 from mscherer/patch-1
Fix typo in comment
2014-12-15 14:42:12 -08:00
Steve Reed
eb0a11717f Look up master node IP address in a loop 2014-12-15 14:38:30 -08:00
Clayton Coleman
d9ad8cfac0 Conversions missing from v1beta1
They were in v1beta2, not sure how they got removed.
2014-12-15 16:50:05 -05:00
Clayton Coleman
dadb8431c4 Remove internal PodState in favor of internal PodStatus object 2014-12-15 16:50:05 -05:00
Clayton Coleman
787b5c488a Add PodIP and Image to v1beta3
Fixes #2900
2014-12-15 16:50:05 -05:00