Skip to content

e2e: remove any reference to RHEL 8.8 #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ansible/molecule/ec2_full/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ platforms:
instance_type: p2.xlarge
spot_price: false
ssh_user: ec2-user
- name: konvoyimage-rhel8.4-${USER:-ci}-${HOSTNAME:-local}
image_search_name: "RHEL-8.4.0_HVM-*"
image_search_owner: "309956199498"
region: us-east-1
instance_type: p2.xlarge
spot_price: false
ssh_user: ec2-user
- name: konvoyimage-ubuntu-20.04-${USER:-ci}-${HOSTNAME:-local}
image_search_name: "*ubuntu-focal-20.04-amd64-server-*"
image_search_owner: "099720109477"
Expand Down
7 changes: 0 additions & 7 deletions ansible/molecule/ec2_gpu/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ platforms:
instance_type: p2.xlarge
spot_price: false
ssh_user: ec2-user
- name: konvoyimage-rhel8.4-${USER:-ci}-${HOSTNAME:-local}
image_search_name: "RHEL-8.4.0_HVM-*"
image_search_owner: "309956199498"
region: us-east-1
instance_type: p2.xlarge
spot_price: false
ssh_user: ec2-user
- name: konvoyimage-flatcar-stable-${USER:-ci}-${HOSTNAME:-local}
image_search_name: "Flatcar*stable*"
image_search_owner: "075585003325"
Expand Down
8 changes: 0 additions & 8 deletions ansible/roles/gpu/tasks/nvidia-gpu-RHEL.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
---
- name: enable RHEL 8 repos
shell: subscription-manager repos --enable=rhel-8-for-x86_64-baseos-eus-rpms
when:
- rhelorg != None or rheluser != None
- ansible_distribution_major_version == '8'
- ansible_distribution_version is version('8.10', '<')


- name: install kernel headers and devel for kernel version on remote detected {{ hostvars[inventory_hostname].ansible_kernel }}
yum:
name:
Expand Down
20 changes: 0 additions & 20 deletions ansible/roles/networking/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,6 @@
[keyfile]
unmanaged-devices=interface-name:cali*;interface-name:tunl*;interface-name:vxlan.calico;interface-name:wireguard.cali

# The NetworkManager bug in RHEL 8.4 (https://bugzilla.redhat.com/show_bug.cgi?id=2007341) adds conflicting entry in route table
# the conflicting entry hijacks traffic from host to containers.
# Until the fix is available in upstream RHEL 8.X AMI, configure the nm-cloud-setup to prevent adding conflicting entry in route table in AWS.
- name: configure NetworkManager-cloud-setup service to disable cloud setup on RHEL 8.x on AWS
when:
- packer_builder_type.startswith('amazon')
- ansible_os_family == "RedHat"
- ansible_distribution_major_version == '8'
block:
- name: ensure /etc/systemd/system/nm-cloud-setup.service.d exists
file:
path: /etc/systemd/system/nm-cloud-setup.service.d
state: directory
- name: create drop-in to disable nm-cloud-setup for AWS
copy:
dest: /etc/systemd/system/nm-cloud-setup.service.d/override.conf
content: |
[Service]
Environment=NM_CLOUD_SETUP_EC2=no

- name: add iptable ALLOW rules for control-plane
iptables:
chain: INPUT
Expand Down
6 changes: 1 addition & 5 deletions cmd/konvoy-image-wrapper/cmd/create-package-bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ type OSConfig struct {
}

var osToConfig = map[string]OSConfig{
"redhat-8.8": {
configDir: "bundles/redhat8.8",
containerImage: "registry.access.redhat.com/ubi8/ubi:8.8",
},
"redhat-8.10": {
configDir: "bundles/redhat8.10",
containerImage: "registry.access.redhat.com/ubi8/ubi:8.10",
Expand Down Expand Up @@ -138,7 +134,7 @@ func (r *Runner) CreatePackageBundle(args []string) error {
"fetch-kernel-headers",
false,
//nolint:lll // its ok to have long help texts
"If enabled fetches kernel headers for the target operating system. To modify the version, edit the file at bundles/{OS_NAME}{VERSION}/packages.txt.gotmpl directly eg: bundles/redhat8.8/packages.txt.gotmpl. This is required for operating systems that will use NVIDIA GPU drivers.",
"If enabled fetches kernel headers for the target operating system. To modify the version, edit the file at bundles/{OS_NAME}{VERSION}/packages.txt.gotmpl directly eg: bundles/redhat8.10/packages.txt.gotmpl. This is required for operating systems that will use NVIDIA GPU drivers.",
)
err := flagSet.Parse(args)
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion cmd/konvoy-image/cmd/create-package-bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ var (
packageCmd = "create-package-bundle"
packageCmdExample = "create-package-bundle --os redhat-8.10 --output-directory=artifacts"
validOS = []string{
"redhat-8.8",
"redhat-8.10",
"rocky-9.1",
"ubuntu-20.04",
Expand Down
2 changes: 1 addition & 1 deletion docs/cli/konvoy-image_create-package-bundle.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ create-package-bundle --os redhat-8.10 --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 [redhat-8.8 redhat-8.10 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.10 rocky-9.1 ubuntu-20.04 oracle-9.4]
--output-directory string The directory to place the bundle in. (default "artifacts")
```

Expand Down
14 changes: 0 additions & 14 deletions images/ami/rhel-88.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions images/azure/rhel-84.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions images/ova/rhel-88.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ var (
rhck = "rhck"

validOS = []string{
"redhat 8.8",
"redhat 8.10",
"oracle 8.9",
"oracle 9.4",
Expand Down Expand Up @@ -411,9 +410,6 @@ func createOSBundle(osName, kubernetesVersion, downloadDir string, fips, gpu boo
if fips {
args = append(args, "--fips=true")
}
if osName == "redhat 8.8" || osName == "redhat 8.6" {
args = append(args, "--enable-eus-repos=true")
}
if gpu {
args = append(args, "--fetch-kernel-headers=true")
}
Expand Down
Loading