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
2016-07-22 00:05:15 -07:00
parent ee9de6457c 55d0d3b4fa
commit 33f96bbbcb
1 changed files with 1 additions and 0 deletions
--- 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() {