From 96f0a391726489934dee924e357c480196499eec Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 4 May 2015 17:00:43 -0400 Subject: [PATCH] AWS: Fix variable naming that meant not all tokens were written To resolve the inconsistency, chose to go closer to GCE --- cluster/aws/templates/create-dynamic-salt-files.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/aws/templates/create-dynamic-salt-files.sh b/cluster/aws/templates/create-dynamic-salt-files.sh index 87abb8cc8c8..e6b7b2346fb 100644 --- a/cluster/aws/templates/create-dynamic-salt-files.sh +++ b/cluster/aws/templates/create-dynamic-salt-files.sh @@ -48,9 +48,9 @@ kube_proxy_token=$(cat /dev/urandom | base64 | tr -d "=+/" | dd bs=32 count=1 2> # Make a list of tokens and usernames to be pushed to the apiserver mkdir -p /srv/salt-overlay/salt/kube-apiserver -known_tokens_file="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv" -(umask u=rw,go= ; echo "$kubelet_token,kubelet,kubelet" > $known_tokens_file ; -echo "$kube_proxy_token,kube_proxy,kube_proxy" >> $known_tokens_file) +readonly KNOWN_TOKENS_FILE="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv" +(umask u=rw,go= ; echo "$kubelet_token,kubelet,kubelet" > $KNOWN_TOKENS_FILE ; +echo "$kube_proxy_token,kube_proxy,kube_proxy" >> $KNOWN_TOKENS_FILE) mkdir -p /srv/salt-overlay/salt/kubelet kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth"