Filipe Brandenburger
da4967fe38
Merge pull request #2988 from jbeda/yaml-quote
...
Quote strings in bash populated YAML files.
2014-12-16 16:26:22 -08:00
Joe Beda
2fc02cb06a
Quote strings in bash populated YAML files.
...
Quoting is hard. When writing strings into YAML files, wrap them in single quotes. Also escape any embedded single quotes in those strings via a double signle quote ('').
2014-12-16 16:13:46 -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
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
Dawn Chen
04b136a7db
Move salt based clusters to Docker 1.4.0
2014-12-16 11:58:45 -08:00
Joe Beda
308b078ee7
Merge pull request #2857 from jainvipin/master
...
ubuntu getting started guide
2014-12-15 16:13:25 -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
Steve Reed
eb0a11717f
Look up master node IP address in a loop
2014-12-15 14:38:30 -08:00
Joe Beda
056fdbb9b8
Merge pull request #2943 from brendandburns/flags
...
Add a log level flag.
2014-12-15 12:59:08 -08:00
Brendan Burns
878d85df0c
Add a log level flag.
2014-12-15 12:00:29 -08:00
Max Forbes
bea37d5b17
Fix up e2e tests.
2014-12-15 11:53:51 -08:00
Brendan Burns
19c88643b8
Merge pull request #2923 from satnam6502/kubelet-log
...
Collect Kubelet logs with Fluentd->(Elasticsearch|Cloud Logging)
2014-12-15 11:46:33 -08:00
Brendan Burns
68c1ac210b
Merge pull request #2940 from deads2k/deads-validate-cluster-broken
...
validate-cluster is broken for vagrant
2014-12-15 11:44:58 -08:00
deads2k
81e01e5099
validate-cluster is broken
2014-12-15 14:07:38 -05:00
deads2k
fd53795bc9
fix e2e for all providers except gce
2014-12-15 11:04:13 -05:00
Satnam Singh
b4fcdd7e47
Collect Kubelet logs with Fluentd->Elasticsearch and Fluentd->Cloud Logging
2014-12-14 01:47:48 -08:00
Satnam Singh
91a75c7620
Add missing detect-project to detect-minions
2014-12-12 15:29:58 -08:00
Filipe Brandenburger
d762dc46e9
Merge pull request #2816 from satnam6502/robust
...
Make multiple attempts to sanity check (GCE) and validate (ALL) cluster
2014-12-12 14:26:07 -08:00
Satnam Singh
1ce71d1e33
Make multiple attempts to sanity check (GCE) and validate (ALL) cluster
2014-12-12 13:53:57 -08:00
Joe Beda
c9acafc98a
Move salt based clusters to Docker 1.3.3
...
Part of #2896
2014-12-12 12:18:07 -08:00
Brendan Burns
9742911697
Only delete attached boot disks, don't delete other attached disks.
2014-12-11 17:09:53 -08:00
Filipe Brandenburger
45dbf16be7
Merge pull request #2803 from satnam6502/cluster
...
Make kube-down more robust for GCE provider
2014-12-11 15:39:22 -08:00
Satnam Singh
d0eeebaa66
Make kube-down more robust for GCE provider
2014-12-11 14:47:38 -08:00
Brendan Burns
6e397cfe31
Merge pull request #2870 from zulily/fix-rackspace-cloud-files-url
...
Fixes malformed OBJECT_URL in rackspace setup script
2014-12-11 13:18:26 -08:00
Steve Reed
4c312caeb0
Fixes the minion yaml as well
2014-12-11 13:01:05 -08:00
Steve Reed
d4f71b7d4a
Fixes malformed OBJECT_URL in rackspace setup script
2014-12-11 12:18:45 -08:00
Brendan Burns
149881e13e
Actually set repository QPS in the kubelet.
2014-12-11 12:06:40 -08:00
Joe Beda
89011f26f4
remove SSLv3 support in nginx config
2014-12-10 13:17:02 -08:00
Eric Tune
edeb96dca9
Merge pull request #2772 from rlarocque2/apiserver_auth
...
Implement apiserver communication for Vagrant
2014-12-10 07:13:40 -08:00
Daniel Smith
0f88d149cd
Merge pull request #2818 from dchen1107/containervm
...
Using container-vm-v20141208 as the default image on GCE.
2014-12-09 17:55:19 -08:00
Dawn Chen
d767e71475
Using container-vm-v20141208 as the default image on GCE.
2014-12-09 17:11:23 -08:00
Brendan Burns
3a7dd589d5
Merge pull request #2735 from erictune/proxy_no_etcd
...
Use apiserver instead of etcd for kube-proxy.
2014-12-09 15:27:20 -08:00
Joe Beda
09a8efefe9
Merge pull request #2791 from derekwaynecarr/salt_api_missing_cherrypy
...
Vagrant fix - Add python-cherrypy as explicit install for salt-api
2014-12-09 12:12:37 -08:00
Joe Beda
90f71ea4d9
Merge pull request #2805 from jlowdermilk/fix-salt
...
Fix conditional docker_opts in salt/docker/docker-defaults
2014-12-09 10:16:55 -08:00
Jeff Lowdermlk
0007257bce
Fix conditional on grains.docker_opts in docker-defaults
2014-12-08 16:42:41 -08:00
Brendan Burns
5b33534dcf
Merge pull request #2652 from justinsb/default_vpc_has_no_tags
...
Don't assume every AWS VPC has tags
2014-12-08 15:53:47 -08:00
Brendan Burns
30656d7522
Merge pull request #2653 from justinsb/default_cluster_monitoring
...
Default ENABLE_CLUSTER_MONITORING to false
2014-12-08 15:53:35 -08:00
derekwaynecarr
aacf2c2780
Add python-cherrypy as explicit install for salt-api
2014-12-08 11:36:26 -05:00
Brendan Burns
8364fa5c93
Fix detect-minions.
2014-12-05 15:42:28 -08:00
Richard Larocque
7d37b24cc7
Implement apiserver communication for Vagrant
...
This implementation is based on the GCE impementation from
618a367dbb48dbaa9c3b50e877858d854322fd0b.
2014-12-05 12:49:51 -08:00
Jeff Lowdermilk
a1faab9ffe
Merge pull request #2730 from satnam6502/scripting
...
Add missing project argument to gcloud commands
2014-12-04 14:30:20 -08:00
Satnam Singh
fcfdd48f8d
Add missing project argument to gcloud commands
2014-12-03 15:38:40 -08:00
Eric Tune
65b38e7af7
Use apiserver instead of etcd for kube-proxy.
...
For cloud-providers that use salt, have kube-proxy use
apiserver instead of etcd as a config source.
2014-12-02 22:21:01 -08:00
Satnam Singh
c2348052b0
Fix the addition of the logging.write scope to the MINION_SCOPES array
2014-12-02 20:25:26 -08:00
Brendan Burns
346dbc6de7
Merge pull request #2716 from zulily/fix-gce-provision-with-gcp-logging
...
Fix GCE scopes when using GCP Logging
2014-12-02 12:40:56 -08:00
Brendan Burns
b07515c5ea
Add some backward compatability for GKE.
2014-12-02 11:32:45 -08:00
Steve Reed
d229c5ba51
Proper appending of logging.write scope to array
2014-12-02 10:29:10 -08:00
Alen Komljen
d83d269c27
Remove empty lines when file is generated from jinja template
2014-12-02 15:00:58 +01:00