Skip to content

Commit

Permalink
Merge pull request #7287 from VibrentHealth/rhel8_support
Browse files Browse the repository at this point in the history
Rhel8 support
  • Loading branch information
k8s-ci-robot committed Jul 22, 2019
2 parents 5e53a44 + 9ba0433 commit 9290330
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 3 deletions.
12 changes: 9 additions & 3 deletions nodeup/pkg/distros/distribution.go
Expand Up @@ -31,6 +31,8 @@ var (
DistributionBionic Distribution = "bionic"
DistributionRhel7 Distribution = "rhel7"
DistributionCentos7 Distribution = "centos7"
DistributionRhel8 Distribution = "rhel8"
DistributionCentos8 Distribution = "centos8"
DistributionCoreOS Distribution = "coreos"
DistributionFlatcar Distribution = "flatcar"
DistributionContainerOS Distribution = "containeros"
Expand All @@ -52,6 +54,10 @@ func (d Distribution) BuildTags() []string {
t = []string{"_centos7"}
case DistributionRhel7:
t = []string{"_rhel7"}
case DistributionCentos8:
t = []string{"_centos8"}
case DistributionRhel8:
t = []string{"_rhel8"}
case DistributionCoreOS:
t = []string{"_coreos"}
case DistributionFlatcar:
Expand Down Expand Up @@ -80,7 +86,7 @@ func (d Distribution) IsDebianFamily() bool {
switch d {
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10:
return true
case DistributionCentos7, DistributionRhel7:
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8:
return false
case DistributionCoreOS, DistributionFlatcar, DistributionContainerOS:
return false
Expand All @@ -92,7 +98,7 @@ func (d Distribution) IsDebianFamily() bool {

func (d Distribution) IsRHELFamily() bool {
switch d {
case DistributionCentos7, DistributionRhel7:
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8:
return true
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10:
return false
Expand All @@ -108,7 +114,7 @@ func (d Distribution) IsSystemd() bool {
switch d {
case DistributionJessie, DistributionXenial, DistributionBionic, DistributionDebian9, DistributionDebian10:
return true
case DistributionCentos7, DistributionRhel7:
case DistributionCentos7, DistributionRhel7, DistributionCentos8, DistributionRhel8:
return true
case DistributionCoreOS, DistributionFlatcar:
return true
Expand Down
6 changes: 6 additions & 0 deletions nodeup/pkg/distros/identify.go
Expand Up @@ -75,6 +75,12 @@ func FindDistribution(rootfs string) (Distribution, error) {
if strings.HasPrefix(line, "CentOS Linux release 7.") {
return DistributionCentos7, nil
}
if strings.HasPrefix(line, "Red Hat Enterprise Linux release 8.") {
return DistributionRhel8, nil
}
if strings.HasPrefix(line, "CentOS Linux release 8.") {
return DistributionCentos8, nil
}
}
klog.Warningf("unhandled redhat-release info %q", string(lsbRelease))
} else if !os.IsNotExist(err) {
Expand Down
11 changes: 11 additions & 0 deletions nodeup/pkg/model/docker.go
Expand Up @@ -766,6 +766,17 @@ var dockerVersions = []dockerVersion{
},
Dependencies: []string{"libtool-ltdl", "libseccomp", "libcgroup", "policycoreutils-python"},
},
// 18.06.3 - CentOS / Rhel8 (two packages)
{
DockerVersion: "18.06.3",
Name: "docker-ce",
Distros: []distros.Distribution{distros.DistributionRhel8, distros.DistributionCentos8},
Architectures: []Architecture{ArchitectureAmd64},
Version: "18.06.3.ce",
Source: "https://download.docker.com/linux/centos/7/x86_64/stable/Packages/docker-ce-18.06.3.ce-3.el7.x86_64.rpm",
Hash: "5369602f88406d4fb9159dc1d3fd44e76fb4cab8",
Dependencies: []string{"container-selinux", "libtool-ltdl", "libseccomp", "libcgroup", "policycoreutils-python-utils", "python3-policycoreutils"},
},

// TIP: When adding the next version, copy the previous
// version, string replace the version, run `VERIFY_HASHES=1
Expand Down

0 comments on commit 9290330

Please sign in to comment.