Merge pull request #35886 from MrHohn/addon-manager-token

Automatic merge from submit-queue Fixes token_found bug in addon manager From #35832. Above PR exposed addon manager's logs on Jenkins, found below error on the gce e2e test artifacts: ``` Error from server: serviceaccounts "default" not found error executing template "{{with index .secrets 0}}{{.name}}{{end}}": template: output:1:7: executing "output" at <index .secrets 0>: error calling index: index of untyped nil == default service account in the kube-system namespace has token Error executing template: template: output:1:7: executing "output" at <index .secrets 0>: error calling index: index of untyped nil. Printing more information for debugging the template: template was: {{with index .secrets 0}}{{.name}}{{end}} raw data was: {"kind":"ServiceAccount","apiVersion":"v1","metadata":{"name":"default","namespace":"kube-system","selfLink":"/api/v1/namespaces/kube-system/serviceaccounts/default","uid":"de3f2f85-9d6a-11e6-9df3-42010af00002","resourceVersion":"48","creationTimestamp":"2016-10-29T00:01:40Z"}} object given to template engine was: map[apiVersion:v1 metadata:map[selfLink:/api/v1/namespaces/kube-system/serviceaccounts/default uid:de3f2f85-9d6a-11e6-9df3-42010af00002 resourceVersion:48 creationTimestamp:2016-10-29T00:01:40Z name:default namespace:kube-system] kind:ServiceAccount] == ``` Seems like the script failed to retrieve service token at the first time and mistakenly used the error message as the token content. Fixes by replacing `|| true` with if condition.

Merge pull request #35886 from MrHohn/addon-manager-token
986839e9 · Kubernetes Submit Queue · GitHub · 6ea9ff68 · 4088e001 · 986839e9
Commit 986839e9 authored Nov 09, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 09, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

kube-addons.sh cluster/addons/addon-manager/kube-addons.sh +5 -2

No files found.
--- a/cluster/addons/addon-manager/kube-addons.sh
+++ b/cluster/addons/addon-manager/kube-addons.sh
@@ -36,7 +36,6 @@ ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-60}
 ADDON_PATH=${ADDON_PATH:-/etc/kubernetes/addons}
 SYSTEM_NAMESPACE=kube-system
-trusty_master=${TRUSTY_MASTER:-false}
 # Remember that you can't log from functions that print some output (because
 # logs are also printed on stdout).
@@ -172,7 +171,11 @@ start_addon /opt/namespace.yaml 100 10 "" &
 token_found=""
 while [ -z "${token_found}" ]; do
  sleep .5
-  token_found=$(${KUBECTL} ${KUBECTL_OPTS} get --namespace="${SYSTEM_NAMESPACE}" serviceaccount default -o go-template="{{with index .secrets 0}}{{.name}}{{end}}" || true)
+  token_found=$(${KUBECTL} ${KUBECTL_OPTS} get --namespace="${SYSTEM_NAMESPACE}" serviceaccount default -o go-template="{{with index .secrets 0}}{{.name}}{{end}}")
+  if [[ $? -ne 0 ]]; then
+    token_found="";
+    log WRN "== Error getting default service account, retry in 0.5 second =="
+  fi
 done
 log INFO "== Default service account in the ${SYSTEM_NAMESPACE} namespace has token ${token_found} =="