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

Initial Amazon Linux 2023 support 

This is untested, I'll add an e2e job once this merges
This commit is contained in:
Peter Rifel 2023-03-16 18:03:31 -05:00
parent edc5df1ee7
commit 036bb8c62b
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
util/pkg/distributions/distributions.go
View File

@ -37,20 +37,21 @@ type Distribution struct {
} }
var ( var (
DistributionDebian10 = Distribution{packageFormat: "deb", project: "debian", id: "buster", version: 10} DistributionDebian10 = Distribution{packageFormat: "deb", project: "debian", id: "buster", version: 10}
DistributionDebian11 = Distribution{packageFormat: "deb", project: "debian", id: "bullseye", version: 11} DistributionDebian11 = Distribution{packageFormat: "deb", project: "debian", id: "bullseye", version: 11}
DistributionDebian12 = Distribution{packageFormat: "deb", project: "debian", id: "bookworm", version: 12} DistributionDebian12 = Distribution{packageFormat: "deb", project: "debian", id: "bookworm", version: 12}
DistributionUbuntu1804 = Distribution{packageFormat: "deb", project: "ubuntu", id: "bionic", version: 18.04} DistributionUbuntu1804 = Distribution{packageFormat: "deb", project: "ubuntu", id: "bionic", version: 18.04}
DistributionUbuntu2004 = Distribution{packageFormat: "deb", project: "ubuntu", id: "focal", version: 20.04} DistributionUbuntu2004 = Distribution{packageFormat: "deb", project: "ubuntu", id: "focal", version: 20.04}
DistributionUbuntu2010 = Distribution{packageFormat: "deb", project: "ubuntu", id: "groovy", version: 20.10} DistributionUbuntu2010 = Distribution{packageFormat: "deb", project: "ubuntu", id: "groovy", version: 20.10}
DistributionUbuntu2104 = Distribution{packageFormat: "deb", project: "ubuntu", id: "hirsute", version: 21.04} DistributionUbuntu2104 = Distribution{packageFormat: "deb", project: "ubuntu", id: "hirsute", version: 21.04}
DistributionUbuntu2110 = Distribution{packageFormat: "deb", project: "ubuntu", id: "impish", version: 21.10} DistributionUbuntu2110 = Distribution{packageFormat: "deb", project: "ubuntu", id: "impish", version: 21.10}
DistributionUbuntu2204 = Distribution{packageFormat: "deb", project: "ubuntu", id: "jammy", version: 22.04} DistributionUbuntu2204 = Distribution{packageFormat: "deb", project: "ubuntu", id: "jammy", version: 22.04}
DistributionAmazonLinux2 = Distribution{packageFormat: "rpm", project: "amazonlinux2", id: "amazonlinux2", version: 0} DistributionAmazonLinux2 = Distribution{packageFormat: "rpm", project: "amazonlinux2", id: "amazonlinux2", version: 0}
DistributionRhel8 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel8", version: 8} DistributionAmazonLinux2023 = Distribution{packageFormat: "rpm", project: "amazonlinux2023", id: "amzn", version: 2023}
DistributionRocky8 = Distribution{packageFormat: "rpm", project: "rocky", id: "rocky8", version: 8} DistributionRhel8 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel8", version: 8}
DistributionFlatcar = Distribution{packageFormat: "", project: "flatcar", id: "flatcar", version: 0} DistributionRocky8 = Distribution{packageFormat: "rpm", project: "rocky", id: "rocky8", version: 8}
DistributionContainerOS = Distribution{packageFormat: "", project: "containeros", id: "containeros", version: 0} DistributionFlatcar = Distribution{packageFormat: "", project: "flatcar", id: "flatcar", version: 0}
DistributionContainerOS = Distribution{packageFormat: "", project: "containeros", id: "containeros", version: 0}
) )
// IsDebianFamily returns true if this distribution uses deb packages and generally follows debian package names // IsDebianFamily returns true if this distribution uses deb packages and generally follows debian package names
@ -82,7 +83,7 @@ func (d *Distribution) DefaultUsers() ([]string, error) {
return []string{"ubuntu", "root"}, nil return []string{"ubuntu", "root"}, nil
case "centos": case "centos":
return []string{"centos"}, nil return []string{"centos"}, nil
case "rhel", "amazonlinux2": case "rhel", "amazonlinux2", "amazonlinux2023":
return []string{"ec2-user"}, nil return []string{"ec2-user"}, nil
case "rocky": case "rocky":
return []string{"rocky"}, nil return []string{"rocky"}, nil

2
util/pkg/distributions/identify.go
View File

@ -50,6 +50,8 @@ func FindDistribution(rootfs string) (Distribution, error) {
switch distro { switch distro {
case "amzn-2": case "amzn-2":
return DistributionAmazonLinux2, nil return DistributionAmazonLinux2, nil
case "amzn-2023":
return DistributionAmazonLinux2023, nil
case "debian-10": case "debian-10":
return DistributionDebian10, nil return DistributionDebian10, nil
case "debian-11": case "debian-11":

5
util/pkg/distributions/identify_test.go
View File

@ -34,6 +34,11 @@ func TestFindDistribution(t *testing.T) {
err: nil, err: nil,
expected: DistributionAmazonLinux2, expected: DistributionAmazonLinux2,
}, },
{
rootfs: "amazonlinux2023",
err: nil,
expected: DistributionAmazonLinux2023,
},
{ {
rootfs: "centos7", rootfs: "centos7",
err: fmt.Errorf("unsupported distro: centos-7"), err: fmt.Errorf("unsupported distro: centos-7"),

12
util/pkg/distributions/tests/amazonlinux2023/etc/os-release Normal file
View File

@ -0,0 +1,12 @@
NAME="Amazon Linux"
VERSION="2023"
ID="amzn"
ID_LIKE="fedora"
VERSION_ID="2023"
PLATFORM_ID="platform:al2023"
PRETTY_NAME="Amazon Linux 2023"
ANSI_COLOR="0;33"
CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
HOME_URL="https://aws.amazon.com/linux/"
BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
SUPPORT_END="2028-03-01"