From c070c4def5c25d85d225b806414eac322ff6a8e4 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Thu, 2 Dec 2021 22:14:44 -0800
Subject: [PATCH] Remove support for CentOS 8

---
 docs/releases/1.23-NOTES.md             | 4 ++--
 upup/pkg/fi/nodeup/nodetasks/package.go | 2 +-
 util/pkg/distributions/distributions.go | 1 -
 util/pkg/distributions/identify.go      | 2 --
 util/pkg/distributions/identify_test.go | 4 ++--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/releases/1.23-NOTES.md b/docs/releases/1.23-NOTES.md
index 08013de9a9..146fed1485 100644
--- a/docs/releases/1.23-NOTES.md
+++ b/docs/releases/1.23-NOTES.md
@@ -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 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.
 
 # 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 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 RHEL 7 is deprecated and will be removed in future versions of kOps.
diff --git a/upup/pkg/fi/nodeup/nodetasks/package.go b/upup/pkg/fi/nodeup/nodetasks/package.go
index 260ea34389..4ea593a7f1 100644
--- a/upup/pkg/fi/nodeup/nodetasks/package.go
+++ b/upup/pkg/fi/nodeup/nodetasks/package.go
@@ -333,7 +333,7 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
 			args = []string{"apt-get", "install", "--yes", "--no-install-recommends"}
 			env = append(env, "DEBIAN_FRONTEND=noninteractive")
 		} 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"}
 			} else {
 				args = []string{"/usr/bin/yum", "install", "-y"}
diff --git a/util/pkg/distributions/distributions.go b/util/pkg/distributions/distributions.go
index c0ad194acb..016f829ecf 100644
--- a/util/pkg/distributions/distributions.go
+++ b/util/pkg/distributions/distributions.go
@@ -51,7 +51,6 @@ var (
 	DistributionRhel7        = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel7", version: 7}
 	DistributionCentos7      = Distribution{packageFormat: "rpm", project: "centos", id: "centos7", version: 7}
 	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}
 	DistributionContainerOS  = Distribution{packageFormat: "", project: "containeros", id: "containeros", version: 0}
 )
diff --git a/util/pkg/distributions/identify.go b/util/pkg/distributions/identify.go
index aa9145ccbe..a10709e975 100644
--- a/util/pkg/distributions/identify.go
+++ b/util/pkg/distributions/identify.go
@@ -52,8 +52,6 @@ func FindDistribution(rootfs string) (Distribution, error) {
 		return DistributionAmazonLinux2, nil
 	case "centos-7":
 		return DistributionCentos7, nil
-	case "centos-8":
-		return DistributionCentos8, nil
 	case "debian-9":
 		return DistributionDebian9, nil
 	case "debian-10":
diff --git a/util/pkg/distributions/identify_test.go b/util/pkg/distributions/identify_test.go
index 1dcfe5735c..3b1ac4f083 100644
--- a/util/pkg/distributions/identify_test.go
+++ b/util/pkg/distributions/identify_test.go
@@ -41,8 +41,8 @@ func TestFindDistribution(t *testing.T) {
 		},
 		{
 			rootfs:   "centos8",
-			err:      nil,
-			expected: DistributionCentos8,
+			err:      fmt.Errorf("unsupported distro: centos-8"),
+			expected: Distribution{},
 		},
 		{
 			rootfs:   "coreos",