kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5796 from justinsb/recognize_ubuntu 

Recognize ubuntu images in sshUser dumping
This commit is contained in:
k8s-ci-robot 2018-09-17 00:34:48 -07:00 committed by GitHub
parent 2aae954a3e 7861a056d8
commit 2a25ea58de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/resources/aws/aws.go
View File

@ -477,6 +477,8 @@ func guessSSHUser(image *ec2.Image) string {
return "core" return "core"
case awsup.WellKnownAccountKopeio: case awsup.WellKnownAccountKopeio:
return "admin" return "admin"
case awsup.WellKnownAccountUbuntu:
return "ubuntu"
} }
return "" return ""
} }

1
upup/pkg/fi/cloudup/awsup/aws_cloud.go
View File

@ -85,6 +85,7 @@ const (
WellKnownAccountRedhat = "309956199498" WellKnownAccountRedhat = "309956199498"
WellKnownAccountCoreOS = "595879546273" WellKnownAccountCoreOS = "595879546273"
WellKnownAccountAmazonSystemLinux2 = "137112412989" WellKnownAccountAmazonSystemLinux2 = "137112412989"
WellKnownAccountUbuntu = "099720109477"
) )
type AWSCloud interface { type AWSCloud interface {