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

Merge pull request #13185 from xsamurai/master

Browse Source 
Changed SSH_USER to core instead ubuntu, also applied fixes from #11975
This commit is contained in:
Brendan Burns 2015-09-30 11:29:46 -07:00
commit 5545630641
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/aws/coreos/util.sh
View File

@ -16,7 +16,7 @@
# A library of helper functions for CoreOS. # A library of helper functions for CoreOS.
SSH_USER=ubuntu SSH_USER=core
function detect-minion-image (){ function detect-minion-image (){
if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then
@ -29,9 +29,6 @@ function detect-minion-image (){
} }
function generate-minion-user-data() { function generate-minion-user-data() {
i=$1
# TODO(bakins): Is this actually used?
MINION_PRIVATE_IP=$INTERNAL_IP_BASE.1${i}
# this is a bit of a hack. We make all of our "variables" in # this is a bit of a hack. We make all of our "variables" in
# our cloud config controlled by env vars from this script # our cloud config controlled by env vars from this script
@ -44,7 +41,6 @@ function generate-minion-user-data() {
DNS_SERVER_IP=$(yaml-quote ${DNS_SERVER_IP:-}) DNS_SERVER_IP=$(yaml-quote ${DNS_SERVER_IP:-})
DNS_DOMAIN=$(yaml-quote ${DNS_DOMAIN:-}) DNS_DOMAIN=$(yaml-quote ${DNS_DOMAIN:-})
MASTER_IP=$(yaml-quote ${MASTER_INTERNAL_IP}) MASTER_IP=$(yaml-quote ${MASTER_INTERNAL_IP})
MINION_IP=$(yaml-quote ${MINION_PRIVATE_IP})
KUBELET_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-}) KUBELET_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-})
KUBE_PROXY_TOKEN=$(yaml-quote ${KUBE_PROXY_TOKEN:-}) KUBE_PROXY_TOKEN=$(yaml-quote ${KUBE_PROXY_TOKEN:-})
KUBE_BEARER_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-}) KUBE_BEARER_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-})