diff --git a/docs/operations/images.md b/docs/operations/images.md index 9c50e1548b..b3d46c182f 100644 --- a/docs/operations/images.md +++ b/docs/operations/images.md @@ -103,7 +103,7 @@ Available images can be listed using: ```bash aws ec2 describe-images --region us-east-1 --output table \ - --owners 903794441882 \ + --owners 136693071363 \ --query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \ --filters "Name=name,Values=debian-11-amd64-*" ``` @@ -249,7 +249,7 @@ kOps supports owner aliases for the official accounts of supported distros: * `centos` => `125523088429` * `debian9` => `379101102735` * `debian10` => `136693071363` -* `debian11` => `903794441882` +* `debian11` => `136693071363` * `flatcar` => `075585003325` * `redhat` => `309956199498` * `ubuntu` => `099720109477` diff --git a/pkg/resources/aws/aws.go b/pkg/resources/aws/aws.go index c6fc1362fd..f58ebebc7f 100644 --- a/pkg/resources/aws/aws.go +++ b/pkg/resources/aws/aws.go @@ -498,7 +498,7 @@ func guessSSHUser(image *ec2.Image) string { return "ec2-user" case awsup.WellKnownAccountCentOS: return "centos" - case awsup.WellKnownAccountDebian9, awsup.WellKnownAccountDebian10, awsup.WellKnownAccountDebian11, awsup.WellKnownAccountKopeio: + case awsup.WellKnownAccountDebian, awsup.WellKnownAccountDebian9, awsup.WellKnownAccountKopeio: return "admin" case awsup.WellKnownAccountUbuntu: return "ubuntu" diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go index c6d2b3891e..27d33df5b4 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go @@ -99,9 +99,8 @@ const ( WellKnownAccountAmazonLinux2 = "137112412989" WellKnownAccountCentOS = "125523088429" WellKnownAccountCoreOS = "595879546273" + WellKnownAccountDebian = "136693071363" WellKnownAccountDebian9 = "379101102735" - WellKnownAccountDebian10 = "136693071363" - WellKnownAccountDebian11 = "903794441882" WellKnownAccountFlatcar = "075585003325" WellKnownAccountKopeio = "383156758163" WellKnownAccountRedhat = "309956199498" @@ -1716,9 +1715,9 @@ func resolveImage(ec2Client ec2iface.EC2API, name string) (*ec2.Image, error) { case "debian9": owner = WellKnownAccountDebian9 case "debian10": - owner = WellKnownAccountDebian10 + owner = WellKnownAccountDebian case "debian11": - owner = WellKnownAccountDebian11 + owner = WellKnownAccountDebian case "flatcar": owner = WellKnownAccountFlatcar case "kopeio", "kope.io":