Merge pull request #15137 from brendandburns/flakes3

Add an environment variable override for AWS ssh keys
pull/6/head
Brendan Burns 2015-10-06 10:43:45 -07:00
commit 7ba48583fa
1 changed files with 6 additions and 0 deletions

View File

@ -1782,6 +1782,12 @@ func getSigner(provider string) (ssh.Signer, error) {
case "gce", "gke":
keyfile = "google_compute_engine"
case "aws":
// If there is an env. variable override, use that.
aws_keyfile := os.Getenv("AWS_SSH_KEY")
if len(aws_keyfile) != 0 {
return util.MakePrivateKeySignerFromFile(aws_keyfile)
}
// Otherwise revert to home dir
keyfile = "kube_aws_rsa"
default:
return nil, fmt.Errorf("getSigner(...) not implemented for %s", provider)