Merge pull request #5796 from justinsb/recognize_ubuntu

Recognize ubuntu images in sshUser dumping
2018-09-17 00:34:48 -07:00 · 2018-09-17 00:34:48 -07:00 · 2a25ea58de
parent 2aae954a3e 7861a056d8
commit 2a25ea58de
2 changed files with 3 additions and 0 deletions
--- a/pkg/resources/aws/aws.go
+++ b/pkg/resources/aws/aws.go
@ -477,6 +477,8 @@ func guessSSHUser(image *ec2.Image) string {
 		return "core"
 	case awsup.WellKnownAccountKopeio:
 		return "admin"
+	case awsup.WellKnownAccountUbuntu:
+		return "ubuntu"
 	}
 	return ""
 }
--- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go
+++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go
@ -85,6 +85,7 @@ const (
 	WellKnownAccountRedhat             = "309956199498"
 	WellKnownAccountCoreOS             = "595879546273"
 	WellKnownAccountAmazonSystemLinux2 = "137112412989"
+	WellKnownAccountUbuntu             = "099720109477"
 )

 type AWSCloud interface {