From dcd91666b9606424c216dcaf035db0d7afd2af08 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 29 Jun 2015 17:58:38 -0700 Subject: [PATCH 1/2] wait until a token shows up to start addons --- cluster/saltbase/salt/kube-addons/kube-addons.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cluster/saltbase/salt/kube-addons/kube-addons.sh b/cluster/saltbase/salt/kube-addons/kube-addons.sh index 4c1f6b452b4..7f365d3a7f3 100644 --- a/cluster/saltbase/salt/kube-addons/kube-addons.sh +++ b/cluster/saltbase/salt/kube-addons/kube-addons.sh @@ -134,6 +134,15 @@ for k,v in yaml.load(sys.stdin).iteritems(): ''' < "${kube_env_yaml}") fi +# Wait for the default service account +token_found="" +while [ -z "${token_made}" ]; do + sleep .5 + token_found=$(${KUBECTL} get serviceaccount default -o template -t "{{with index .secrets 0}}{{.name}}{{end}}" || echo "") +done + +echo "default service account has token ${token_found}" + # Generate secrets for "internal service accounts". # TODO(etune): move to a completely yaml/object based # workflow so that service accounts can be created From f21b6b89d109d44662c4041a0378804b26f1a26c Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Tue, 30 Jun 2015 06:51:10 -0700 Subject: [PATCH 2/2] Fix issues mentioned in #10520 --- cluster/saltbase/salt/kube-addons/kube-addons.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cluster/saltbase/salt/kube-addons/kube-addons.sh b/cluster/saltbase/salt/kube-addons/kube-addons.sh index 7f365d3a7f3..969ae469266 100644 --- a/cluster/saltbase/salt/kube-addons/kube-addons.sh +++ b/cluster/saltbase/salt/kube-addons/kube-addons.sh @@ -136,12 +136,12 @@ fi # Wait for the default service account token_found="" -while [ -z "${token_made}" ]; do +while [ -z "${token_found}" ]; do sleep .5 - token_found=$(${KUBECTL} get serviceaccount default -o template -t "{{with index .secrets 0}}{{.name}}{{end}}" || echo "") + token_found=$(${KUBECTL} get serviceaccount default -o template -t "{{with index .secrets 0}}{{.name}}{{end}}" || true) done -echo "default service account has token ${token_found}" +echo "== default service account has token ${token_found} ==" # Generate secrets for "internal service accounts". # TODO(etune): move to a completely yaml/object based @@ -180,6 +180,3 @@ while true; do `dirname $0`/kube-addon-update.sh /etc/kubernetes/addons sleep $ADDON_CHECK_INTERVAL_SEC done - - -