Skip to content

Commit e44e446

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1795 from giantswarm/remove-rhel-7
Remove RHEL-7 as end of life
2 parents a6bdbc9 + 9376e12 commit e44e446

File tree

10 files changed

+7
-164
lines changed

10 files changed

+7
-164
lines changed

‎docs/book/src/capi/providers/vsphere.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ In addition to the configuration found in `images/capi/packer/config`, the `ova`
7979
|--------------------|--------------------------------------------------------------|
8080
| `flatcar.json` | The settings for the Flatcar image |
8181
| `photon-4.json` | The settings for the Photon 4 image |
82-
| `rhel-7.json` | The settings for the RHEL 7 image |
82+
| `rhel-8.json` | The settings for the RHEL 8 image |
83+
| `rhel-9.json` | The settings for the RHEL 9 image |
8384
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
8485
| `ubuntu-2204-efi.json` | The settings for the Ubuntu 22.04 EFI image |
8586
| `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
@@ -98,7 +99,7 @@ an environment where you require DNS resolution .local, then add `leak_local_mdn
9899
When building the RHEL image, the OS must register itself with the Red Hat Subscription Manager (RHSM). To do this, the current supported method is to supply a username and password via environment variables. The two environment variables are `RHSM_USER` and `RHSM_PASS`. Although building RHEL images has been tested via this method, if an error is encountered during the build, the VM is deleted without the machine being unregistered with RHSM. To prevent this, it is recommended to build with the following command:
99100

100101
```shell
101-
PACKER_FLAGS=-on-error=ask RHSM_USER=user RHSM_PASS=pass make build-node-ova-<hypervisor>-rhel-7
102+
PACKER_FLAGS=-on-error=ask RHSM_USER=user RHSM_PASS=pass make build-node-ova-<hypervisor>-rhel-9
102103
```
103104

104105
The addition of `PACKER_FLAGS=-on-error=ask` means that if an error is encountered, the build will pause, allowing you to SSH into the machine and unregister manually.

‎images/capi/Makefile‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ PACKER_POWERVS_NODE_FLAGS := $(foreach f,$(abspath $(COMMON_POWERVS_VAR_FILES)),
339339
## --------------------------------------
340340
FLATCAR_VERSIONS := flatcar
341341
PHOTON_VERSIONS := photon-4 photon-5
342-
RHEL_VERSIONS := rhel-7 rhel-8 rhel-9
342+
RHEL_VERSIONS := rhel-8 rhel-9
343343
ROCKYLINUX_VERSIONS := rockylinux-8 rockylinux-9
344344
UBUNTU_VERSIONS := ubuntu-2204 ubuntu-2204-efi ubuntu-2404 ubuntu-2404-efi
345345
WINDOWS_VERSIONS := windows-2019 windows-2019-efi windows-2022 windows-2022-efi
@@ -745,7 +745,6 @@ build-huaweicloud-all: $(HUAWEICLOUD_BUILD_TARGETS) ## Builds all HuaweiCloud im
745745
build-node-ova-local-flatcar: ## Builds Flatcar stable Node OVA w local hypervisor
746746
build-node-ova-local-photon-4: ## Builds Photon 4 Node OVA w local hypervisor
747747
build-node-ova-local-photon-5: ## Builds Photon 5 Node OVA w local hypervisor
748-
build-node-ova-local-rhel-7: ## Builds RHEL 7 Node OVA w local hypervisor
749748
build-node-ova-local-rhel-8: ## Builds RHEL 8 Node OVA w local hypervisor
750749
build-node-ova-local-rhel-9: ## Builds RHEL 9 Node OVA w local hypervisor
751750
build-node-ova-local-rockylinux-8: ## Builds RockyLinux 8 Node OVA w local hypervisor
@@ -756,7 +755,6 @@ build-node-ova-local-all: $(NODE_OVA_LOCAL_BUILD_TARGETS) ## Builds all Node OVA
756755
build-node-ova-vsphere-flatcar: ## Builds Flatcar stable Node OVA and template on vSphere
757756
build-node-ova-vsphere-photon-4: ## Builds Photon 4 Node OVA and template on vSphere
758757
build-node-ova-vsphere-photon-5: ## Builds Photon 5 Node OVA and template on vSphere
759-
build-node-ova-vsphere-rhel-7: ## Builds RHEL 7 Node OVA and template on vSphere
760758
build-node-ova-vsphere-rhel-8: ## Builds RHEL 8 Node OVA and template on vSphere
761759
build-node-ova-vsphere-rhel-9: ## Builds RHEL 9 Node OVA and template on vSphere
762760
build-node-ova-vsphere-rockylinux-8: ## Builds RockyLinux 8 Node OVA and template on vSphere
@@ -773,7 +771,6 @@ build-node-ova-vsphere-all: $(NODE_OVA_VSPHERE_BUILD_TARGETS) ## Builds all Node
773771

774772
build-node-ova-vsphere-clone-photon-4: ## Builds Photon 4 Node OVA and template on vSphere
775773
build-node-ova-vsphere-clone-photon-5: ## Builds Photon 5 Node OVA and template on vSphere
776-
build-node-ova-vsphere-clone-rhel-7: ## Builds RHEL 7 Node OVA and template on vSphere
777774
build-node-ova-vsphere-clone-rhel-8: ## Builds RHEL 8 Node OVA and template on vSphere
778775
build-node-ova-vsphere-clone-rhel-9: ## Builds RHEL 9 Node OVA and template on vSphere
779776
build-node-ova-vsphere-clone-rockylinux-8: ## Builds RockyLinux 8 Node OVA and template on vSphere
@@ -786,7 +783,6 @@ build-node-ova-vsphere-clone-all: $(NODE_OVA_VSPHERE_CLONE_BUILD_TARGETS) ## Bui
786783

787784
build-node-ova-vsphere-base-photon-4: ## Builds base Photon 4 Node OVA and template on vSphere
788785
build-node-ova-vsphere-base-photon-5: ## Builds base Photon 5 Node OVA and template on vSphere
789-
build-node-ova-vsphere-base-rhel-7: ## Builds base RHEL 7 Node OVA and template on vSphere
790786
build-node-ova-vsphere-base-rhel-8: ## Builds base RHEL 8 Node OVA and template on vSphere
791787
build-node-ova-vsphere-base-rhel-9: ## Builds base RHEL 9 Node OVA and template on vSphere
792788
build-node-ova-vsphere-base-rockylinux-8: ## Builds base RockyLinux 8 Node OVA and template on vSphere
@@ -799,15 +795,13 @@ build-node-ova-vsphere-base-all: $(NODE_OVA_VSPHERE_BASE_BUILD_TARGETS) ## Build
799795

800796
build-node-ova-local-vmx-photon-4: ## Builds Photon 4 Node OVA from VMX file w local hypervisor
801797
build-node-ova-local-vmx-photon-5: ## Builds Photon 5 Node OVA from VMX file w local hypervisor
802-
build-node-ova-local-vmx-rhel-7: ## Builds RHEL 7 Node OVA from VMX file w local hypervisor
803798
build-node-ova-local-vmx-rhel-8: ## Builds RHEL 8 Node OVA from VMX file w local hypervisor
804799
build-node-ova-local-vmx-rhel-9: ## Builds RHEL 9 Node OVA from VMX file w local hypervisor
805800
build-node-ova-local-vmx-rockylinux-8: ## Builds RockyLinux 8 Node OVA from VMX file w local hypervisor
806801
build-node-ova-local-vmx-rockylinux-9: ## Builds RockyLinux 9 Node OVA from VMX file w local hypervisor
807802

808803
build-node-ova-local-base-photon-4: ## Builds Photon 4 Base Node OVA w local hypervisor
809804
build-node-ova-local-base-photon-5: ## Builds Photon 5 Base Node OVA w local hypervisor
810-
build-node-ova-local-base-rhel-7: ## Builds RHEL 7 Base Node OVA w local hypervisor
811805
build-node-ova-local-base-rhel-8: ## Builds RHEL 8 Base Node OVA w local hypervisor
812806
build-node-ova-local-base-rhel-9: ## Builds RHEL 9 Base Node OVA w local hypervisor
813807
build-node-ova-local-base-rockylinux-8: ## Builds RockyLinux 8 Base Node OVA w local hypervisor
@@ -945,7 +939,6 @@ validate-gce-all: $(GCE_VALIDATE_TARGETS) ## Validates all GCE Snapshot Packer c
945939
validate-node-ova-local-flatcar: ## Validates Flatcar stable Node OVA Packer config w local hypervisor
946940
validate-node-ova-local-photon-4: ## Validates Photon 4 Node OVA Packer config w local hypervisor
947941
validate-node-ova-local-photon-5: ## Validates Photon 5 Node OVA Packer config w local hypervisor
948-
validate-node-ova-local-rhel-7: ## Validates RHEL 7 Node OVA Packer config w local hypervisor
949942
validate-node-ova-local-rhel-8: ## Validates RHEL 8 Node OVA Packer config w local hypervisor
950943
validate-node-ova-local-rhel-9: ## Validates RHEL 9 Node OVA Packer config w local hypervisor
951944
validate-node-ova-local-rockylinux-8: ## Validates RockyLinux 8 Node OVA Packer config w local hypervisor
@@ -958,7 +951,6 @@ validate-node-ova-local-all: $(NODE_OVA_LOCAL_VALIDATE_TARGETS) ## Validates all
958951

959952
validate-node-ova-local-vmx-photon-4: ## Validates Photon 4 Node OVA from VMX file w local hypervisor
960953
validate-node-ova-local-vmx-photon-5: ## Validates Photon 5 Node OVA from VMX file w local hypervisor
961-
validate-node-ova-local-vmx-rhel-7: ## Validates RHEL 7 Node OVA from VMX file w local hypervisor
962954
validate-node-ova-local-vmx-rhel-8: ## Validates RHEL 8 Node OVA from VMX file w local hypervisor
963955
validate-node-ova-local-vmx-rhel-9: ## Validates RHEL 9 Node OVA from VMX file w local hypervisor
964956
validate-node-ova-local-vmx-rockylinux-8: ## Validates RockyLinux 8 Node OVA from VMX file w local hypervisor
@@ -968,7 +960,6 @@ validate-node-ova-local-vmx-ubuntu-2404: ## Validates Ubuntu 24.04 Node OVA from
968960

969961
validate-node-ova-local-base-photon-4: ## Validates Photon 4 Base Node OVA w local hypervisor
970962
validate-node-ova-local-base-photon-5: ## Validates Photon 5 Base Node OVA w local hypervisor
971-
validate-node-ova-local-base-rhel-7: ## Validates RHEL 7 Base Node OVA w local hypervisor
972963
validate-node-ova-local-base-rhel-8: ## Validates RHEL 8 Base Node OVA w local hypervisor
973964
validate-node-ova-local-base-rhel-9: ## Validates RHEL 9 Base Node OVA w local hypervisor
974965
validate-node-ova-local-base-rockylinux-8: ## Validates RockyLinux 8 Base Node OVA w local hypervisor

‎images/capi/ansible/roles/firstboot/meta/main.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ dependencies:
2222
- role: setup
2323
vars:
2424
rpms: >-
25-
{{ ( ( common_rpms + rh7_rpms + lookup('vars', 'common_' + build_target + '_rpms') )
26-
if (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7')
27-
else ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) ) }}
25+
{{ ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) }}
2826
debs: "{{ common_debs + lookup('vars', 'common_' + build_target + '_debs') }}"
2927
when: packer_builder_type is search('qemu')

‎images/capi/ansible/roles/node/defaults/main.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ azurelinux_rpms:
4444
- yum-utils
4545
- lsof
4646

47-
# Used for RedHat based distributions == 7 (ex. RHEL-7, CentOS-7 etc.)
48-
rh7_rpms:
49-
- curl
50-
- yum-utils
51-
- ebtables
52-
- python-netifaces
53-
- python-requests
54-
5547
# Used for RedHat based distributions =! 7 (ex. RHEL-8, RockyLinux-8, RockyLinux-9 etc.)
5648
rh8_rpms:
5749
- curl

‎images/capi/ansible/roles/node/meta/main.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ dependencies:
4141
- role: setup
4242
vars:
4343
rpms: >-
44-
{{ ( ( common_rpms + rh7_rpms + lookup('vars', 'common_' + build_target + '_rpms') )
45-
if (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7')
46-
else ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) ) }}
44+
{{ ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) }}
4745
debs: "{{ common_debs + lookup('vars', 'common_' + build_target + '_debs') }}"
4846
when: >
4947
ansible_distribution not in ["VMware Photon OS", "Amazon"]

‎images/capi/hack/generate-goss-specs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def main():
140140
os_versions = ["2019", "2022"]
141141
elif system == 'rhel':
142142
runtimes = ["containerd"]
143-
os_versions = ["7", "8"]
143+
os_versions = ["8", "9"]
144144
elif system == 'photon':
145145
runtimes = ["containerd"]
146146
os_versions = ["3", "4", "5"]

‎images/capi/hack/image-build-ova.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ def main():
110110
OS_id_map = {"vmware-photon-64": {"id": "36", "version": "", "type": "vmwarePhoton64Guest"},
111111
"centos7-64": {"id": "107", "version": "7", "type": "centos7_64Guest"},
112112
"centos8-64": {"id": "107", "version": "8", "type": "centos8_64Guest"},
113-
"rhel7-64": {"id": "80", "version": "7", "type": "rhel7_64Guest"},
114113
"rhel8-64": {"id": "80", "version": "8", "type": "rhel8_64Guest"},
115114
"rhel9-64": {"id": "80", "version": "9", "type": "rhel9_64Guest"},
116115
"rockylinux-64": {"id": "80", "version": "", "type": "rockylinux_64Guest"},

‎images/capi/packer/goss/goss-vars.yaml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ al2023_rpms: &al2023_rpms
2323
unzip:
2424
awscli-2:
2525

26-
rh7_rpms: &rh7_rpms
27-
curl:
28-
yum-utils:
29-
ebtables:
30-
python-netifaces:
31-
python-requests:
32-
3326
rh8_rpms: &rh8_rpms
3427
curl:
3528
yum-utils:
@@ -151,10 +144,6 @@ centos:
151144
amazon:
152145
package:
153146
amazon-ssm-agent:
154-
os_version:
155-
- distro_version: "7"
156-
package:
157-
<<: *rh7_rpms
158147
command:
159148
/usr/local/sbin/aws --version:
160149
exit-status: 0
@@ -167,20 +156,12 @@ centos:
167156
package:
168157
python2-pip:
169158
open-vm-tools:
170-
os_version:
171-
- distro_version: "7"
172-
package:
173-
<<: *rh7_rpms
174159
qemu:
175160
package:
176161
open-vm-tools:
177162
cloud-init:
178163
cloud-utils-growpart:
179164
os_version:
180-
- distro_version: "7"
181-
package:
182-
python2-pip:
183-
<<: *rh7_rpms
184165
- distro_version: "9"
185166
package:
186167
<<: *rh9_rpms
@@ -380,10 +361,6 @@ rhel:
380361
package:
381362
open-vm-tools:
382363
os_version:
383-
- distro_version: "7"
384-
package:
385-
python2-pip:
386-
<<: *rh7_rpms
387364
- distro_version: "8"
388365
package:
389366
python2-pip:

‎images/capi/packer/ova/linux/rhel/http/7/ks.cfg.tmpl‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎images/capi/packer/ova/rhel-7.json‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)