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

Merge pull request #7071 from zetaab/feature/debian10 

Add Debian 10 (buster) support
This commit is contained in:
Kubernetes Prow Robot 2019-06-07 02:20:02 -07:00 committed by GitHub
parent bd7420567d 60756136c8
commit 02cb57ee7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ type Distribution string
var (
DistributionJessie Distribution = "jessie"
DistributionDebian9 Distribution = "debian9"
DistributionDebian10 Distribution = "buster"
DistributionXenial Distribution = "xenial"
DistributionBionic Distribution = "bionic"
DistributionRhel7 Distribution = "rhel7"
@ -40,7 +41,7 @@ func (d Distribution) BuildTags() []string {
switch d {
case DistributionJessie:
t = []string{"_jessie"}
case DistributionDebian9:
case DistributionDebian9, DistributionDebian10:
t = []string{} // trying to move away from tags
case DistributionXenial:
t = []string{"_xenial"}
@ -74,7 +75,7 @@ func (d Distribution) BuildTags() []string {
func (d Distribution) IsDebianFamily() bool {
switch d {
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9:
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10:
return true
case DistributionCentos7, DistributionRhel7:
return false
@ -90,7 +91,7 @@ func (d Distribution) IsRHELFamily() bool {
switch d {
case DistributionCentos7, DistributionRhel7:
return true
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9:
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10:
return false
case DistributionCoreOS, DistributionContainerOS:
return false
@ -102,7 +103,7 @@ func (d Distribution) IsRHELFamily() bool {
func (d Distribution) IsSystemd() bool {
switch d {
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9:
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10:
return true
case DistributionCentos7, DistributionRhel7:
return true

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

@ -54,6 +54,8 @@ func FindDistribution(rootfs string) (Distribution, error) {
return DistributionJessie, nil
} else if strings.HasPrefix(debianVersion, "9.") {
return DistributionDebian9, nil
} else if strings.HasPrefix(debianVersion, "10.") {
return DistributionDebian10, nil
} else {
return "", fmt.Errorf("unhandled debian version %q", debianVersion)
}

13
nodeup/pkg/model/docker.go
View File

@ -617,6 +617,19 @@ var dockerVersions = []dockerVersion{
Dependencies: []string{"bridge-utils", "libapparmor1", "libltdl7", "perl"},
},
// 18.06.3 - Debian Buster
{
DockerVersion: "18.06.3",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionDebian10},
Architectures: []Architecture{ArchitectureAmd64},
Version: "18.06.3~ce~3-0~debian",
Source: "https://download.docker.com/linux/debian/dists/buster/pool/stable/amd64/docker-ce_18.06.3~ce~3-0~debian_amd64.deb",
Hash: "05c9b098437bcf1b489c2a3a9764c3b779af7bc4",
Dependencies: []string{"bridge-utils", "libapparmor1", "libltdl7", "perl"},
},
// 18.06.2 - Jessie
{
DockerVersion: "18.06.2",

2
nodeup/pkg/model/kubectl.go
View File

@ -104,7 +104,7 @@ func (b *KubectlBuilder) Build(c *fi.ModelBuilderContext) error {
func (b *KubectlBuilder) findKubeconfigUser() (*fi.User, *fi.Group, error) {
var users []string
switch b.Distribution {
case distros.DistributionJessie, distros.DistributionDebian9:
case distros.DistributionJessie, distros.DistributionDebian9, distros.DistributionDebian10:
users = []string{"admin", "root"}
case distros.DistributionCentos7:
users = []string{"centos"}