Merge pull request #29428 from justinsb/aws_abac

Automatic merge from submit-queue AWS kube-up: export kube_user to salt This was done for GCE in #29164, but not for AWS. Fixes #29424
kubernetes · Jul 22, 2016 · 33f96bb · 33f96bb
2 parents ee9de64 + 55d0d3b
commit 33f96bb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/cluster/aws/templates/configure-vm-aws.sh b/cluster/aws/templates/configure-vm-aws.sh
@@ -102,6 +102,7 @@ EOF
   fi
 
   env-to-grains "runtime_config"
+  env-to-grains "kube_user"
 }
 
 salt-node-role() {