Commit Graph

5804 Commits

Author SHA1 Message Date
Brian Grant
d2feaade9e Merge pull request #4195 from smarterclayton/add_endpoints_to_service
Kubectl should be able to display endpoints directly and for service
2015-02-05 17:22:34 -08:00
Brian Grant
175e9caa55 Merge pull request #4194 from dchen1107/podstatus
Kubelet decides podStatus
2015-02-05 17:18:39 -08:00
Tim Hockin
fcb739f284 Merge pull request #4197 from brendandburns/pd
Start using GCE safe format and mount for mounting disks.
2015-02-05 17:08:54 -08:00
Brendan Burns
3f109d6d46 Start using GCE safe format and mount for mounting disks.
This removes the need for disks to be formatted.
2015-02-05 17:01:37 -08:00
Tim Hockin
7c5625b2dd Merge pull request #4120 from justinsb/fix_4118
Fix enable_cluster_dns test
2015-02-05 16:28:46 -08:00
Tim Hockin
ae6e25f4af Merge pull request #4001 from mikedanese/probe-result
rename probe.Status to probe.Result
2015-02-05 16:12:13 -08:00
Dawn Chen
4da829ef20 comment. 2015-02-05 15:57:26 -08:00
Mike Danese
14bfec92f2 rename probe.Status to probe.Result. 2015-02-05 15:49:58 -08:00
Dawn Chen
f762e062f2 Kubelet decides podStatus 2015-02-05 15:49:41 -08:00
Clayton Coleman
698e8dd06f Kubectl should be able to display endpoints directly and for service
kubectl get endpoints <servicename>
    kubectl describe service <servicename>

should have printers for endpoints
2015-02-05 18:46:09 -05:00
Brendan Burns
8e6f5c7201 Merge pull request #3593 from commonlisp/master
Add timeouts to HealthChecks and retry checks
2015-02-05 15:40:22 -08:00
Brendan Burns
50e855953f Merge pull request #4131 from a-robinson/validate
Add a few extra test cases for API validation of labels
2015-02-05 15:37:45 -08:00
Zach Loafman
963c4d38d1 Merge pull request #4193 from rsokolowski/fix-e2e
Fix hack/e2e-test.sh broken due to removed flag from hack/e2e.go
2015-02-05 15:29:06 -08:00
Jeff Lowdermilk
122124f9e1 Merge pull request #4175 from wojtek-t/kubectl_silent
kubectl doesn't fail silently with no k8s master
2015-02-05 14:58:24 -08:00
rsokolowski
df26b43a9d Fix hack/e2e-test.sh broken due to removed flag from hack/e2e.go 2015-02-05 23:56:43 +01:00
Brendan Burns
b08bd8671f Merge pull request #4157 from saad-ali/updateEventApi
Add "Update Event" to Kubernetes API
2015-02-05 14:50:48 -08:00
Brendan Burns
775a04c230 Merge pull request #4167 from eparis/unit-quotes
Do not use {} in systemd environment variables
2015-02-05 14:49:08 -08:00
Brendan Burns
f153a27235 Merge pull request #4147 from jlowdermilk/kubeconfig-view
Allow output formatting for kubectl config view
2015-02-05 14:48:02 -08:00
Brendan Burns
7a21bed3c7 Merge pull request #4190 from zmerlynn/kill_e2e_timeout
Remove timeout from cmd/e2e now that all tests are under it
2015-02-05 14:45:17 -08:00
Zach Loafman
9261c5a655 Remove timeout from cmd/e2e now that all tests are under it 2015-02-05 14:35:24 -08:00
Filipe Brandenburger
5de4c49792 Merge pull request #4153 from brendandburns/e2e
Add a simple endpoints test.
2015-02-05 13:54:33 -08:00
Tim Hockin
a20fb598bc Merge pull request #4132 from jszczepkowski/master
Improve "constraint violation" error message.
2015-02-05 13:43:29 -08:00
Brian Grant
7a13c2f0e3 Merge pull request #4169 from brendandburns/shell_sucks
Fix a regression where we never cleared out failed nodes.
2015-02-05 13:41:11 -08:00
Brian Grant
c1ca07338f Merge pull request #4149 from nikhiljindal/autoSwaggerSpec
Adding static swagger spec and a script to update it
2015-02-05 12:13:33 -08:00
Zach Loafman
3fbfecccff Merge pull request #4163 from rrati/e2e-services-4162
E2e services 4162
2015-02-05 12:06:37 -08:00
nikhiljindal
fe27529d7e Adding static swagger spec and a script to update it 2015-02-05 12:00:28 -08:00
CJ Cullen
079dd4dba6 Merge pull request #4172 from mike-schiller/aws_cf_user_data_fix
fixes kube-apiserver failure when using  aws/cloudformation-template.json
2015-02-05 11:37:08 -08:00
Jerzy Szczepkowski
18c5fa1ae7 Applied comments. 2015-02-05 20:32:51 +01:00
Zach Loafman
9674939860 Merge pull request #4178 from zmerlynn/jenkins_fix_status
Breakfix for #4177, not a real solution
2015-02-05 11:25:39 -08:00
Zach Loafman
49a1984e98 Breakfix for #4177, not a real solution 2015-02-05 11:24:45 -08:00
Brendan Burns
6d0b8ea7a7 Fix a regression where we never cleared out failed nodes. 2015-02-05 10:55:57 -08:00
Jeff Lowdermilk
5a702ad123 Allow --output formatting of kubectl config view, make merge default 2015-02-05 10:44:16 -08:00
Wojciech Tyczynski
9d9bca9958 kubectl doesn't fail silently with no k8s master 2015-02-05 19:37:20 +01:00
CJ Cullen
3a16a9c39e Merge pull request #4161 from pierredup/patch-1
Typo
2015-02-05 10:36:08 -08:00
Zach Loafman
f904484b38 Merge pull request #4173 from zmerlynn/fix_jenkins_3
Revert jenkins/e2e.sh back to 606b517a, minus -tap
2015-02-05 10:30:00 -08:00
Zach Loafman
c15595fdf7 Revert jenkins/e2e.sh back to 606b517a, minus -tap 2015-02-05 10:25:59 -08:00
Robert Rati
70237e9cc6 Changed to return in the success case testing testContext instead of using
an else statement.  #4162
2015-02-05 13:09:46 -05:00
Brendan Burns
8b25b43039 Merge pull request #4117 from wojtek-t/validate_docker_version
Check Docker version in Kubelet /healthz handler
2015-02-05 10:06:33 -08:00
Zach Loafman
253752d830 Merge pull request #4171 from zmerlynn/fix_jenkins_2
Add more logging
2015-02-05 10:02:35 -08:00
Zach Loafman
dad85ef4f1 Add more logging 2015-02-05 10:01:45 -08:00
Jeff Lowdermilk
d46ae5d841 Refactor kubectl/cmd helpers into pkg/kubectl/cmd/util
Allows helpers to be used by config commands.
2015-02-05 09:39:42 -08:00
Mike Schiller
3efb4527f4 inserted mising = in kube-apiserver's portal_net parameter that prevented the kube-apiserver from starting 2015-02-05 12:27:41 -05:00
Zach Loafman
afeaf8fc6f Merge pull request #4168 from zmerlynn/fix_jenkins
Fix jenkins/hack/e2e.sh, log errors better
2015-02-05 09:17:50 -08:00
Zach Loafman
0b456e40bf Fix jenkins/hack/e2e.sh, log errors better 2015-02-05 09:16:11 -08:00
Eric Paris
4b309aa864 Do not use {} in systemd environment variables
From the systemd man page:
 Use "${FOO}" as part of a word, or as a word of its own, on the command
 line, in which case it will be
 replaced by the value of the environment variable including
 all whitespace it contains, resulting in a single argument.
 Use "$FOO" as a separate word on the
 command line, in which case it will be replaced
 by the value of the environment variable split at
 whitespace, resulting in zero or more arguments.

Since we want people to be able to use these for multiple arguments we
need to make sure we don't use {} around the env vars...
2015-02-05 11:36:55 -05:00
Filipe Brandenburger
827dcbc623 Merge pull request #4145 from zmerlynn/contort_shell_under_go_tests
Pervert e2e shell tests to run under Ginkgo
2015-02-05 08:30:41 -08:00
Zach Loafman
2f33c06c21 Remove cluster/test-network.sh
To fix this, it would be an alias for:

  hack/ginkgo-e2e.sh -t TestNetwork

... which may not work on binary distributions, because it's relying
on test assets, so it probably shouldn't live in cluster/ ...
2015-02-05 08:14:39 -08:00
Zach Loafman
f21a25e7fc Add hack/ginkgo-e2e.sh to kubernetes-test.tgz 2015-02-05 08:06:50 -08:00
Zach Loafman
bace7593d0 Enable ginkgo.v (console output is missing spec without it) 2015-02-05 07:24:05 -08:00
Zach Loafman
688f96cd33 Run shell tests under Ginkgo, changing all reporting to JUnit
* Add a test/e2e/shell.go that slurps up everything in hack/e2e-suite
and runs it as a bash test, borrowing all the code from hack/e2e.go.

* Rip out all the crap in hack/e2e.go that deal with multiple tests

* Move hack/e2e-suite/goe2e.sh to hack/ginkgo-e2e.sh so that it
doesn't get slurped up.
2015-02-05 07:24:05 -08:00