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

Merge pull request #11327 from hakman/ubuntu-21.04 

Recognize Ubuntu 21.04
This commit is contained in:
Kubernetes Prow Robot 2021-04-27 13:35:38 -07:00 committed by GitHub
parent 75999163df e0eab51c5c
commit 5207933bca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ var (
DistributionUbuntu1804 = Distribution{packageFormat: "deb", project: "ubuntu", id: "bionic", version: 18.04}
DistributionUbuntu2004 = Distribution{packageFormat: "deb", project: "ubuntu", id: "focal", version: 20.04}
DistributionUbuntu2010 = Distribution{packageFormat: "deb", project: "ubuntu", id: "groovy", version: 20.10}
DistributionUbuntu2104 = Distribution{packageFormat: "deb", project: "ubuntu", id: "hirsute", version: 21.04}
DistributionAmazonLinux2 = Distribution{packageFormat: "rpm", project: "amazonlinux2", id: "amazonlinux2", version: 0}
DistributionRhel7 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel7", version: 7}
DistributionCentos7 = Distribution{packageFormat: "rpm", project: "centos", id: "centos7", version: 7}

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

@ -66,6 +66,8 @@ func FindDistribution(rootfs string) (Distribution, error) {
return DistributionUbuntu2004, nil
case "ubuntu-20.10":
return DistributionUbuntu2010, nil
case "ubuntu-21.04":
return DistributionUbuntu2104, nil
}
// Some distros have a more verbose VERSION_ID

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

@ -104,6 +104,11 @@ func TestFindDistribution(t *testing.T) {
err: nil,
expected: DistributionUbuntu2010,
},
{
rootfs: "ubuntu2104",
err: nil,
expected: DistributionUbuntu2104,
},
{
rootfs: "notfound",
err: fmt.Errorf("reading /etc/os-release: open tests/notfound/etc/os-release: no such file or directory"),

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

@ -0,0 +1,12 @@
NAME="Ubuntu"
VERSION="21.04 (Hirsute Hippo)"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 21.04"
VERSION_ID="21.04"
HOME_URL="https://www.ubuntu.com/"
SUPPORT_URL="https://help.ubuntu.com/"
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
VERSION_CODENAME=hirsute
UBUNTU_CODENAME=hirsute