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

Debian 11: Release AMIs use same AWS Owner ID as Buster

This commit is contained in:
Reilly Brogan 2021-08-16 11:59:53 -05:00
parent bd58b66c31
commit 1b59233c8e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/operations/images.md
View File

@ -103,7 +103,7 @@ Available images can be listed using:
```bash ```bash
aws ec2 describe-images --region us-east-1 --output table \ aws ec2 describe-images --region us-east-1 --output table \
--owners 903794441882 \ --owners 136693071363 \
--query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \ --query "sort_by(Images, &CreationDate)[*].[CreationDate,Name,ImageId]" \
--filters "Name=name,Values=debian-11-amd64-*" --filters "Name=name,Values=debian-11-amd64-*"
``` ```
@ -249,7 +249,7 @@ kOps supports owner aliases for the official accounts of supported distros:
* `centos` => `125523088429` * `centos` => `125523088429`
* `debian9` => `379101102735` * `debian9` => `379101102735`
* `debian10` => `136693071363` * `debian10` => `136693071363`
* `debian11` => `903794441882` * `debian11` => `136693071363`
* `flatcar` => `075585003325` * `flatcar` => `075585003325`
* `redhat` => `309956199498` * `redhat` => `309956199498`
* `ubuntu` => `099720109477` * `ubuntu` => `099720109477`

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

@ -498,7 +498,7 @@ func guessSSHUser(image *ec2.Image) string {
return "ec2-user" return "ec2-user"
case awsup.WellKnownAccountCentOS: case awsup.WellKnownAccountCentOS:
return "centos" return "centos"
case awsup.WellKnownAccountDebian9, awsup.WellKnownAccountDebian10, awsup.WellKnownAccountDebian11, awsup.WellKnownAccountKopeio: case awsup.WellKnownAccountDebian, awsup.WellKnownAccountDebian9, awsup.WellKnownAccountKopeio:
return "admin" return "admin"
case awsup.WellKnownAccountUbuntu: case awsup.WellKnownAccountUbuntu:
return "ubuntu" return "ubuntu"

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

@ -99,9 +99,8 @@ const (
WellKnownAccountAmazonLinux2 = "137112412989" WellKnownAccountAmazonLinux2 = "137112412989"
WellKnownAccountCentOS = "125523088429" WellKnownAccountCentOS = "125523088429"
WellKnownAccountCoreOS = "595879546273" WellKnownAccountCoreOS = "595879546273"
WellKnownAccountDebian = "136693071363"
WellKnownAccountDebian9 = "379101102735" WellKnownAccountDebian9 = "379101102735"
WellKnownAccountDebian10 = "136693071363"
WellKnownAccountDebian11 = "903794441882"
WellKnownAccountFlatcar = "075585003325" WellKnownAccountFlatcar = "075585003325"
WellKnownAccountKopeio = "383156758163" WellKnownAccountKopeio = "383156758163"
WellKnownAccountRedhat = "309956199498" WellKnownAccountRedhat = "309956199498"
@ -1716,9 +1715,9 @@ func resolveImage(ec2Client ec2iface.EC2API, name string) (*ec2.Image, error) {
case "debian9": case "debian9":
owner = WellKnownAccountDebian9 owner = WellKnownAccountDebian9
case "debian10": case "debian10":
owner = WellKnownAccountDebian10 owner = WellKnownAccountDebian
case "debian11": case "debian11":
owner = WellKnownAccountDebian11 owner = WellKnownAccountDebian
case "flatcar": case "flatcar":
owner = WellKnownAccountFlatcar owner = WellKnownAccountFlatcar
case "kopeio", "kope.io": case "kopeio", "kope.io":