feat: remove rhel 8.6 support (#1253)

* feat: remove rhel 8.6 support * ci: updates docs
mesosphere · Jan 13, 2025 · 3a6e83a · 3a6e83a
1 parent edbd2f7
commit 3a6e83a
Showing 12 changed files with 4 additions and 213 deletions.
diff --git a/.github/workflows/aws-e2e.yaml b/.github/workflows/aws-e2e.yaml
@@ -15,19 +15,6 @@ jobs:
       max-parallel: 30
       matrix:
         include:
-          # RHEL 8.6
-          - os: "redhat 8.6"
-            buildConfig: "basic"
-          - os: "redhat 8.6"
-            buildConfig: "fips"
-          - os: "redhat 8.6"
-            buildConfig: "nvidia"
-          - os: "redhat 8.6"
-            buildConfig: "offline"
-          - os: "redhat 8.6"
-            buildConfig: "offline-fips"
-          - os: "redhat 8.6"
-            buildConfig: "offline-nvidia"
           # RHEL 8.8
           - os: "redhat 8.8"
             buildConfig: "basic"

diff --git a/.github/workflows/release-ami.yaml b/.github/workflows/release-ami.yaml
@@ -19,10 +19,6 @@ jobs:
         include:
           - os: "oracle 8.9"
             buildConfig: "fips"
-          - os: "redhat 8.6"
-            buildConfig: "offline"
-          - os: "redhat 8.6"
-            buildConfig: "offline-fips"
           - os: "redhat 8.8"
             buildConfig: "offline"
           - os: "redhat 8.8"

diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
@@ -15,10 +15,6 @@ jobs:
       max-parallel: 8
       matrix:
         include:
-        - os: "redhat 8.6"
-          buildConfig: "offline"
-        - os: "redhat 8.6"
-          buildConfig: "offline-fips"
         - os: "redhat 8.8"
           buildConfig: "offline"
         - os: "redhat 8.8"

diff --git a/bundles/redhat8.6/bundle.sh.gotmpl b/bundles/redhat8.6/bundle.sh.gotmpl
diff --git a/bundles/redhat8.6/packages.txt.gotmpl b/bundles/redhat8.6/packages.txt.gotmpl
diff --git a/bundles/redhat8.6/repo-templates/kubernetes.repo.gotmpl b/bundles/redhat8.6/repo-templates/kubernetes.repo.gotmpl
diff --git a/cmd/konvoy-image-wrapper/cmd/create-package-bundle.go b/cmd/konvoy-image-wrapper/cmd/create-package-bundle.go
@@ -31,10 +31,6 @@ type OSConfig struct {
 }
 
 var osToConfig = map[string]OSConfig{
-	"redhat-8.6": {
-		configDir:      "bundles/redhat8.6",
-		containerImage: "registry.access.redhat.com/ubi8/ubi:8.6",
-	},
 	"redhat-8.8": {
 		configDir:      "bundles/redhat8.8",
 		containerImage: "registry.access.redhat.com/ubi8/ubi:8.8",

diff --git a/cmd/konvoy-image/cmd/create-package-bundle.go b/cmd/konvoy-image/cmd/create-package-bundle.go
@@ -8,13 +8,10 @@ import (
 
 var (
 	packageCmd        = "create-package-bundle"
-	packageCmdExample = "create-package-bundle --os redhat-8.4 --output-directory=artifacts"
+	packageCmdExample = "create-package-bundle --os redhat-8.10 --output-directory=artifacts"
 	validOS           = []string{
-		"centos-7.9",
-		"redhat-7.9",
-		"redhat-8.4",
-		"redhat-8.6",
 		"redhat-8.8",
+		"redhat-8.10",
 		"rocky-9.1",
 		"ubuntu-20.04",
 		"oracle-9.4",

diff --git a/docs/cli/konvoy-image_create-package-bundle.md b/docs/cli/konvoy-image_create-package-bundle.md
@@ -9,7 +9,7 @@ konvoy-image create-package-bundle [flags]
 ### Examples
 
 ```
-create-package-bundle --os redhat-8.4 --output-directory=artifacts
+create-package-bundle --os redhat-8.10 --output-directory=artifacts
 ```
 
 ### Options
@@ -19,7 +19,7 @@ create-package-bundle --os redhat-8.4 --output-directory=artifacts
       --fips                        If the package bundle should include fips packages.
   -h, --help                        help for create-package-bundle
       --kubernetes-version string   The version of kubernetes to download packages for.
-      --os string                   The target OS you wish to create a package bundle for. Must be one of [centos-7.9 redhat-7.9 redhat-8.4 redhat-8.6 redhat-8.8 rocky-9.1 ubuntu-20.04 oracle-9.4]
+      --os string                   The target OS you wish to create a package bundle for. Must be one of [redhat-8.8 redhat-8.10 rocky-9.1 ubuntu-20.04 oracle-9.4]
       --output-directory string     The directory to place the bundle in. (default "artifacts")
 ```
 

diff --git a/images/ami/rhel-86.yaml b/images/ami/rhel-86.yaml
diff --git a/images/ova/rhel-86.yaml b/images/ova/rhel-86.yaml
diff --git a/magefile.go b/magefile.go
@@ -43,14 +43,12 @@ var (
 	rhck          = "rhck"
 
 	validOS = []string{
-		"redhat 8.6",
 		"redhat 8.8",
 		"redhat 8.10",
 		"sles 15",
 		"oracle 8.9",
 		"oracle 9.4",
 		"flatcar",
-		"ubuntu 18.04",
 		"ubuntu 20.04",
 		"ubuntu 22.04",
 		"rocky 9.0",