Commit Graph

4694 Commits

Author SHA1 Message Date
roberthbailey
9b6aec5e22 Merge pull request #3092 from zmerlynn/gke-kubectl-path
GKE: Adjust the PATH to the right kubectl for gcloud
2014-12-22 10:37:56 -08:00
Zach Loafman
e71798df3f Adjust the PATH to the right kubectl for gcloud, add KUBECTL_PATH override
Force kubectl to the git repo version if we detect a built version.
Add a KUBECTL_PATH override so that system/home directory versions of
kubectl can be used if desired. Remove existing $HOME inference.
2014-12-22 10:14:32 -08:00
Brendan Burns
95d4da98bb Merge pull request #3093 from derekwaynecarr/more_client_updates
Follow-up review comments from 3066
2014-12-22 10:05:15 -08:00
Brendan Burns
6aa57e1573 Merge pull request #3079 from vishh/fix_monitoring
Improve monitoring e2e test.
2014-12-22 10:02:19 -08:00
Brendan Burns
2bc8d2339a Merge pull request #3081 from zmerlynn/i3053
Up cmd/e2e timeout
2014-12-22 10:01:48 -08:00
derekwaynecarr
b47cde2465 Namespace scope events in storage 2014-12-22 13:01:20 -05:00
Brendan Burns
e9f8adfe54 Merge pull request #3082 from zmerlynn/gkecmd
Fix binary detection on GKE
2014-12-22 10:01:18 -08:00
derekwaynecarr
652b7aa665 Rename namespaceAsPath 2014-12-22 12:24:21 -05:00
Sergey Evstifeev
a8461efa29 Fix broken flaky-tests.md documentation link
The link ended up pointing at ./docs/devel/docs/devel/flaky-tests.md instead of .docs/devel/flaky-tests.md
2014-12-22 15:53:32 +01:00
Sergey Evstifeev
fb2466bf21 Remove unnecessary 'sudo'
It seems to me that calling 'sudo' is not necessary at this point. In fact, if kubernetes hasn't been built yet, this will result in _output/ folder being owned by root thus making it not possible to run other consequent commands without 'sudo'.
2014-12-22 14:59:06 +01:00
Zach Loafman
b3ce311fd8 Fix binary detection on GKE
* kubectl is kubectl.sh in the e2es, so not needed in the path
* Use the environment variable, and try to make sure the preview
component is installed.
2014-12-21 08:03:49 -08:00
Zach Loafman
57e1450ca7 Up cmd/e2e timeout
Attempt to fix https://github.com/GoogleCloudPlatform/kubernetes/issues/3053
2014-12-21 06:16:32 -08:00
Daniel Smith
36cfc02c6c Merge pull request #3066 from derekwaynecarr/client_update
Do not use namespace in url paths pre v1beta3 from client
2014-12-19 18:02:55 -08:00
Vishnu Kannan
ad37518fbe Improve monitoring e2e test. 2014-12-20 02:02:03 +00:00
Daniel Smith
3672f93a66 Merge pull request #3076 from dchen1107/podstatus
Fix the conversion routine for PodStatus to PodPhase
2014-12-19 17:41:09 -08:00
Daniel Smith
5cd91a2ba0 Merge pull request #3077 from saad-ali/FixCloudConfigBuildBreak
Fix kube-controller-manager failing to start because "Jinja variable 'cloud_config' is undefined"
2014-12-19 17:26:43 -08:00
Dawn Chen
bbaff08991 Fixed #2632 2014-12-19 17:23:47 -08:00
saadali
ec6d4c6078 Fix kube-controller-manager failing to start because "Jinja variable 'cloud_config' is undefined" 2014-12-19 17:20:22 -08:00
Brendan Burns
ba25ae49d7 Merge pull request #3070 from nikhiljindal/setApiVersion
Adding skeleton swagger UI
2014-12-19 17:16:04 -08:00
Daniel Smith
9fee1b0503 Merge pull request #3051 from brendandburns/flake
Add a PodUnknown phase and make ListPods return even when there are errors
2014-12-19 16:45:44 -08:00
Daniel Smith
8cddfa8dbd Merge pull request #3071 from rlarocque2/vagrant_doc_fixes
Update the Vagrant getting started guide
2014-12-19 16:33:38 -08:00
Daniel Smith
55ad41b4f3 Merge pull request #3073 from rlarocque2/kubectl_scripts
Replace kubecfg with kubectl in setup scripts
2014-12-19 16:30:07 -08:00
Daniel Smith
3072453c83 Merge pull request #3072 from rlarocque2/remove_kubectl_echo
Remove debug print in kubectl.sh
2014-12-19 16:28:50 -08:00
nikhiljindal
bf96e95899 ran gofmt 2014-12-19 16:16:54 -08:00
Richard Larocque
9ac9c69534 Replace kubecfg with kubectl in setup scripts
Replaces two instances of kubecfg with kubectl in cluster startup and
validation scripts.
2014-12-19 16:10:21 -08:00
Richard Larocque
2bc41e1602 Remove debug print in kubectl.sh
Removes a debug print that (it seems to me) was added in erro
as part of PR #3046 / commit c3efef8.
2014-12-19 16:09:04 -08:00
Richard Larocque
56922a7da9 Update the Vagrant getting started guide
Fixes two instances that reference the deprecated kubecfg.sh tool.

Update the kubernetes_vagrant_auth example to more accurately reflect
what happened when I ran the scripts on my local machine.
2014-12-19 16:07:31 -08:00
nikhiljindal
90d19ed7a5 Reverting debug echo statements in script 2014-12-19 15:37:25 -08:00
Joe Beda
bf6ecf4313 Merge pull request #3069 from brendandburns/dutchcoders-master
Update the aws docs with a pointer to instance profile and roles.
2014-12-19 15:31:57 -08:00
Brendan Burns
efd80672c7 Update the aws docs with a pointer to instance profile and roles. 2014-12-19 15:28:29 -08:00
Joe Beda
d8efaab679 Merge pull request #3068 from brendandburns/dutchcoders-master
Fix up AWS support...
2014-12-19 15:14:26 -08:00
nikhiljindal
ffb01165f3 doing 2014-12-19 15:13:21 -08:00
Brendan Burns
5e8490d5fe Add a PodUnknown phase and make ListPods return even when there are errors
obtaining info for some pods.
2014-12-19 15:08:48 -08:00
nikhiljindal
007344c8f7 Actually adding the swagger-ui/dist files 2014-12-19 14:57:28 -08:00
nikhiljindal
f12f5ed34b 1. Adding swagger-ui/dist files.
2. Updating datafile.go to include it.
3. Updating master,go to use it.
2014-12-19 14:56:20 -08:00
Joe Beda
5038fc0ffa Merge pull request #3056 from zmerlynn/testtar
Allow parameterization by environment in cluster/gce/config-test.sh
2014-12-19 14:38:03 -08:00
Brendan Burns
2369f0d50d Update aws. 2014-12-19 14:16:57 -08:00
Zach Loafman
94545889fc Allow parameterization by environment in cluster/gce/config-test.sh
Between this and careful use of "export HOME=/somewhere_else_for_auth/",
you can effectively get ghetto CLI profiles (for GCE tests).
2014-12-19 13:38:33 -08:00
bgrant0607
9550b6b845 Merge pull request #3065 from soltysh/cobra_update
bump(github.com/spf13/cobra):e1e66f7b4e667751cf530ddb6e72b79d6eeb0235
2014-12-19 13:36:16 -08:00
bgrant0607
486e92963b Merge pull request #3043 from brendandburns/api
Add Host to PodSpec and add a predicate to make the scheduler work.
2014-12-19 13:35:05 -08:00
derekwaynecarr
abb6632d75 Do not use namespace in url paths pre v1beta3 from client 2014-12-19 16:32:42 -05:00
Dawn Chen
412b3f4869 Merge pull request #3064 from lavalamp/fix4
better logging
2014-12-19 13:31:49 -08:00
Maciej Szulik
b28cb1a6dd bump(github.com/spf13/cobra):e1e66f7b4e667751cf530ddb6e72b79d6eeb0235 2014-12-19 21:55:52 +01:00
Daniel Smith
be9f3be709 better logging 2014-12-19 12:28:51 -08:00
Brendan Burns
824122f410 Merge pull request #2651 from justinsb/specify_zone_to_ec2
Specify AWS_DEFAULT_REGION to match configured region
2014-12-19 12:26:40 -08:00
roberthbailey
ddbc506820 Merge pull request #3046 from mbforbes/gkeTestsSecure
Add GKE as a provider.
2014-12-19 12:00:13 -08:00
Max Forbes
c3efef86d0 Add GKE as a provider. 2014-12-19 11:47:06 -08:00
Brendan Burns
bd712b61e6 Merge branch 'master' of https://github.com/dutchcoders/kubernetes into dutchcoders-master
Conflicts:
	cluster/aws/config-default.sh
	cluster/saltbase/salt/kube-controller-manager/default
2014-12-19 11:45:46 -08:00
Brendan Burns
5807b3d6bc Merge pull request #3031 from foleymic/master
Sticky Session Implementation
2014-12-19 10:12:08 -08:00
Brendan Burns
5c14fc610b Merge pull request #3045 from nikhiljindal/setApiVersion
Setting apiVersion in restful.WebService
2014-12-19 10:11:15 -08:00