From 7861a056d82d84be31005803cced4609535032ff Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 24 Jul 2018 18:17:06 -0400 Subject: [PATCH] Recognize ubuntu images in sshUser dumping --- pkg/resources/aws/aws.go | 2 ++ upup/pkg/fi/cloudup/awsup/aws_cloud.go | 1 + 2 files changed, 3 insertions(+) diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index 4a7e4aeb451bd..ecdd80e784d90 100644 --- 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 "" } diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go index 330ea746c1bb1..be1166abe38fc 100644 --- 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 {