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

Merge pull request #12877 from johngmyers/centos8 

Remove support for CentOS 8
This commit is contained in:
Kubernetes Prow Robot 2021-12-02 23:48:26 -08:00 committed by GitHub
parent 85bda5a7a8 c070c4def5
commit eea8e2a527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/releases/1.23-NOTES.md
View File

@ -14,6 +14,8 @@ This is a document to gather the release notes prior to the release.
* Support for the Lyft CNI has been removed. * Support for the Lyft CNI has been removed.
* Support for CentOS 8 has been removed.
* Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields. * Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields.
# Required actions # Required actions
@ -26,8 +28,6 @@ This is a document to gather the release notes prior to the release.
* Support for CentOS 7 is deprecated and will be removed in future versions of kOps. * Support for CentOS 7 is deprecated and will be removed in future versions of kOps.
* Support for CentOS 8 is deprecated and will be removed in future versions of kOps.
* Support for Debian 9 (Stretch) is deprecated and will be removed in future versions of kOps. * Support for Debian 9 (Stretch) is deprecated and will be removed in future versions of kOps.
* Support for RHEL 7 is deprecated and will be removed in future versions of kOps. * Support for RHEL 7 is deprecated and will be removed in future versions of kOps.

2
upup/pkg/fi/nodeup/nodetasks/package.go
View File

@ -333,7 +333,7 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
args = []string{"apt-get", "install", "--yes", "--no-install-recommends"} args = []string{"apt-get", "install", "--yes", "--no-install-recommends"}
env = append(env, "DEBIAN_FRONTEND=noninteractive") env = append(env, "DEBIAN_FRONTEND=noninteractive")
} else if d.IsRHELFamily() { } else if d.IsRHELFamily() {
if d == distributions.DistributionCentos8 || d == distributions.DistributionRhel8 { if d == distributions.DistributionRhel8 {
args = []string{"/usr/bin/dnf", "install", "-y", "--setopt=install_weak_deps=False"} args = []string{"/usr/bin/dnf", "install", "-y", "--setopt=install_weak_deps=False"}
} else { } else {
args = []string{"/usr/bin/yum", "install", "-y"} args = []string{"/usr/bin/yum", "install", "-y"}

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

@ -51,7 +51,6 @@ var (
DistributionRhel7 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel7", version: 7} DistributionRhel7 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel7", version: 7}
DistributionCentos7 = Distribution{packageFormat: "rpm", project: "centos", id: "centos7", version: 7} DistributionCentos7 = Distribution{packageFormat: "rpm", project: "centos", id: "centos7", version: 7}
DistributionRhel8 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel8", version: 8} DistributionRhel8 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel8", version: 8}
DistributionCentos8 = Distribution{packageFormat: "rpm", project: "centos", id: "centos8", version: 8}
DistributionFlatcar = Distribution{packageFormat: "", project: "flatcar", id: "flatcar", version: 0} DistributionFlatcar = Distribution{packageFormat: "", project: "flatcar", id: "flatcar", version: 0}
DistributionContainerOS = Distribution{packageFormat: "", project: "containeros", id: "containeros", version: 0} DistributionContainerOS = Distribution{packageFormat: "", project: "containeros", id: "containeros", version: 0}
) )

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

@ -52,8 +52,6 @@ func FindDistribution(rootfs string) (Distribution, error) {
return DistributionAmazonLinux2, nil return DistributionAmazonLinux2, nil
case "centos-7": case "centos-7":
return DistributionCentos7, nil return DistributionCentos7, nil
case "centos-8":
return DistributionCentos8, nil
case "debian-9": case "debian-9":
return DistributionDebian9, nil return DistributionDebian9, nil
case "debian-10": case "debian-10":

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

@ -41,8 +41,8 @@ func TestFindDistribution(t *testing.T) {
}, },
{ {
rootfs: "centos8", rootfs: "centos8",
err: nil, err: fmt.Errorf("unsupported distro: centos-8"),
expected: DistributionCentos8, expected: Distribution{},
}, },
{ {
rootfs: "coreos", rootfs: "coreos",