github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dutchcoders/kubernetes into dutchcoders-master

Browse Source 
Conflicts:
	cluster/aws/config-default.sh
	cluster/saltbase/salt/kube-controller-manager/default
This commit is contained in:
Brendan Burns
2014-12-19 11:43:25 -08:00
parent 5bd560de51 83f3982eee
commit bd712b61e6
4 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/aws/templates/salt-master.sh
View File

@@ -26,11 +26,8 @@ grains:
EOF
cat <<EOF > /etc/aws.conf
{
"Global": {
"Region": "${AWS_ZONE}"
}
}
[Global]
Region:${AWS_ZONE}
EOF
# Auto accept all keys from minions that try to join