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

Merge pull request #8727 from hakman/ubuntu-focal 

Add support for Ubuntu 20.04 (Focal)
This commit is contained in:
Kubernetes Prow Robot 2020-03-11 09:29:37 -07:00 committed by GitHub
parent 1236695ee4 17bb98b7d7
commit 1400528fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nodeup/pkg/distros/distribution.go
View File

@ -29,6 +29,7 @@ var (
DistributionDebian10 Distribution = "buster" DistributionDebian10 Distribution = "buster"
DistributionXenial Distribution = "xenial" DistributionXenial Distribution = "xenial"
DistributionBionic Distribution = "bionic" DistributionBionic Distribution = "bionic"
DistributionFocal Distribution = "focal"
DistributionAmazonLinux2 Distribution = "amazonlinux2" DistributionAmazonLinux2 Distribution = "amazonlinux2"
DistributionRhel7 Distribution = "rhel7" DistributionRhel7 Distribution = "rhel7"
DistributionCentos7 Distribution = "centos7" DistributionCentos7 Distribution = "centos7"
@ -51,6 +52,8 @@ func (d Distribution) BuildTags() []string {
t = []string{"_xenial"} t = []string{"_xenial"}
case DistributionBionic: case DistributionBionic:
t = []string{"_bionic"} t = []string{"_bionic"}
case DistributionFocal:
t = []string{"_focal"}
case DistributionAmazonLinux2: case DistributionAmazonLinux2:
t = []string{"_amazonlinux2"} t = []string{"_amazonlinux2"}
case DistributionCentos7: case DistributionCentos7:
@ -89,7 +92,7 @@ func (d Distribution) IsDebianFamily() bool {
switch d { switch d {
case DistributionJessie, DistributionDebian9, DistributionDebian10: case DistributionJessie, DistributionDebian9, DistributionDebian10:
return true return true
case DistributionXenial, DistributionBionic: case DistributionXenial, DistributionBionic, DistributionFocal:
return true return true
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2: case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2:
return false return false
@ -105,7 +108,7 @@ func (d Distribution) IsUbuntu() bool {
switch d { switch d {
case DistributionJessie, DistributionDebian9, DistributionDebian10: case DistributionJessie, DistributionDebian9, DistributionDebian10:
return false return false
case DistributionXenial, DistributionBionic: case DistributionXenial, DistributionBionic, DistributionFocal:
return true return true
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2: case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2:
return false return false
@ -121,7 +124,7 @@ func (d Distribution) IsRHELFamily() bool {
switch d { switch d {
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2: case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2:
return true return true
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10: case DistributionJessie, DistributionXenial, DistributionBionic, DistributionFocal, DistributionDebian9, DistributionDebian10:
return false return false
case DistributionCoreOS, DistributionFlatcar, DistributionContainerOS: case DistributionCoreOS, DistributionFlatcar, DistributionContainerOS:
return false return false
@ -133,7 +136,7 @@ func (d Distribution) IsRHELFamily() bool {
func (d Distribution) IsSystemd() bool { func (d Distribution) IsSystemd() bool {
switch d { switch d {
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10: case DistributionJessie, DistributionXenial, DistributionBionic, DistributionFocal, DistributionDebian9, DistributionDebian10:
return true return true
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2: case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8, DistributionAmazonLinux2:
return true return true

4
nodeup/pkg/distros/identify.go
View File

@ -37,9 +37,9 @@ func FindDistribution(rootfs string) (Distribution, error) {
if line == "DISTRIB_CODENAME=xenial" { if line == "DISTRIB_CODENAME=xenial" {
return DistributionXenial, nil return DistributionXenial, nil
} else if line == "DISTRIB_CODENAME=bionic" { } else if line == "DISTRIB_CODENAME=bionic" {
klog.Warningf("bionic is not fully supported nor tested for Kops and Kubernetes")
klog.Warningf("this should only be used for testing purposes.")
return DistributionBionic, nil return DistributionBionic, nil
} else if line == "DISTRIB_CODENAME=focal" {
return DistributionFocal, nil
} }
} }
} else if !os.IsNotExist(err) { } else if !os.IsNotExist(err) {

6
nodeup/pkg/model/kubelet.go
View File

@ -597,8 +597,10 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro
// In certain configurations systemd-resolved will put the loopback address 127.0.0.53 as a nameserver into /etc/resolv.conf // In certain configurations systemd-resolved will put the loopback address 127.0.0.53 as a nameserver into /etc/resolv.conf
// https://github.com/coredns/coredns/blob/master/plugin/loop/README.md#troubleshooting-loops-in-kubernetes-clusters // https://github.com/coredns/coredns/blob/master/plugin/loop/README.md#troubleshooting-loops-in-kubernetes-clusters
if b.Distribution == distros.DistributionBionic && c.ResolverConfig == nil { if c.ResolverConfig == nil {
c.ResolverConfig = s("/run/systemd/resolve/resolv.conf") if b.Distribution == distros.DistributionBionic || b.Distribution == distros.DistributionFocal {
c.ResolverConfig = s("/run/systemd/resolve/resolv.conf")
}
} }
// As of 1.16 we can no longer set critical labels. // As of 1.16 we can no longer set critical labels.