Skip to content

Commit 1f74312

Browse files
VannTenkpoxo6op
authored andcommitted
Drop support for RHEL 7 / CentOS 7 (kubernetes-sigs#11246)
* Simplify docker systemd unit systemd handles missing unit by ignoring the dependency so we don't need to template them. * Remove RHEL 7/CentOS 7 support - remove ref in kubespray roles - move CI from centos 7 to 8 - remove docs related to centos7 * Remove container-storage-setup Only used for RHEL 7 and CentOS 7
1 parent 19f147d commit 1f74312

File tree

34 files changed

+22
-296
lines changed

34 files changed

+22
-296
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ vagrant up
143143
- **Flatcar Container Linux by Kinvolk**
144144
- **Debian** Bookworm, Bullseye
145145
- **Ubuntu** 20.04, 22.04, 24.04
146-
- **CentOS/RHEL** 7, [8, 9](docs/operating_systems/centos.md#centos-8)
146+
- **CentOS/RHEL** [8, 9](docs/operating_systems/centos.md#centos-8)
147147
- **Fedora** 37, 38
148148
- **Fedora CoreOS** (see [fcos Note](docs/operating_systems/fcos.md))
149149
- **openSUSE** Leap 15.x/Tumbleweed
150-
- **Oracle Linux** 7, [8, 9](docs/operating_systems/centos.md#centos-8)
150+
- **Oracle Linux** [8, 9](docs/operating_systems/centos.md#centos-8)
151151
- **Alma Linux** [8, 9](docs/operating_systems/centos.md#centos-8)
152152
- **Rocky Linux** [8, 9](docs/operating_systems/centos.md#centos-8)
153153
- **Kylin Linux Advanced Server V10** (experimental: see [kylin linux notes](docs/operating_systems/kylinlinux.md))

Vagrantfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ SUPPORTED_OS = {
2222
"ubuntu2004" => {box: "generic/ubuntu2004", user: "vagrant"},
2323
"ubuntu2204" => {box: "generic/ubuntu2204", user: "vagrant"},
2424
"ubuntu2404" => {box: "bento/ubuntu-24.04", user: "vagrant"},
25-
"centos" => {box: "centos/7", user: "vagrant"},
26-
"centos-bento" => {box: "bento/centos-7.6", user: "vagrant"},
2725
"centos8" => {box: "centos/8", user: "vagrant"},
2826
"centos8-bento" => {box: "bento/centos-8", user: "vagrant"},
2927
"almalinux8" => {box: "almalinux/8", user: "vagrant"},
@@ -36,7 +34,6 @@ SUPPORTED_OS = {
3634
"opensuse-tumbleweed" => {box: "opensuse/Tumbleweed.x86_64", user: "vagrant"},
3735
"oraclelinux" => {box: "generic/oracle7", user: "vagrant"},
3836
"oraclelinux8" => {box: "generic/oracle8", user: "vagrant"},
39-
"rhel7" => {box: "generic/rhel7", user: "vagrant"},
4037
"rhel8" => {box: "generic/rhel8", user: "vagrant"},
4138
"debian11" => {box: "debian/bullseye64", user: "vagrant"},
4239
"debian12" => {box: "debian/bookworm64", user: "vagrant"},

contrib/dind/group_vars/all/distro.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ distro_settings:
1818
init: |
1919
/sbin/init
2020
centos: &CENTOS
21-
image: "centos:7"
21+
image: "centos:8"
2222
user: "centos"
2323
pid1_exe: /usr/lib/systemd/systemd
2424
init: |

docs/CNI/calico.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ calico_wireguard_enabled: true
424424

425425
The following OSes will require enabling the EPEL repo in order to bring in wireguard tools:
426426

427-
* CentOS 7 & 8
427+
* CentOS 8
428428
* AlmaLinux 8
429429
* Rocky Linux 8
430430
* Amazon Linux 2

docs/CRI/docker.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ Enabling the `overlay2` graph driver:
1616
docker_storage_options: -s overlay2
1717
```
1818

19-
Enabling `docker_container_storage_setup`, it will configure devicemapper driver on Centos7 or RedHat7.
20-
Deployers must be define a disk path for `docker_container_storage_setup_devs`, otherwise docker-storage-setup will be executed incorrectly.
21-
22-
```yaml
23-
docker_container_storage_setup: true
24-
docker_container_storage_setup_devs: /dev/vdb
25-
```
26-
2719
Changing the Docker cgroup driver (native.cgroupdriver); valid options are `systemd` or `cgroupfs`, default is `systemd`:
2820

2921
```yaml

docs/developers/ci.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ To generate this Matrix run `./tests/scripts/md-table/main.py`
88
|---| --- | --- | --- | --- | --- | --- | --- | --- |
99
almalinux8 | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
1010
amazon | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
11-
centos7 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: |
11+
centos8 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: |
1212
debian11 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: |
1313
debian12 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
1414
fedora37 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
@@ -26,7 +26,7 @@ ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
2626
|---| --- | --- | --- | --- | --- | --- | --- | --- |
2727
almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
2828
amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
29-
centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
29+
centos8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
3030
debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
3131
debian12 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
3232
fedora37 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
@@ -44,7 +44,7 @@ ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
4444
|---| --- | --- | --- | --- | --- | --- | --- | --- |
4545
almalinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
4646
amazon | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
47-
centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
47+
centos8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
4848
debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
4949
debian12 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
5050
fedora37 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |

docs/developers/vagrant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ cat << EOF > vagrant/config.rb
8080
\$instance_name_prefix = "kub"
8181
\$vm_cpus = 1
8282
\$num_instances = 3
83-
\$os = "centos-bento"
83+
\$os = "centos8-bento"
8484
\$subnet = "10.0.20"
8585
\$network_plugin = "flannel"
8686
\$inventory = "$INV"

docs/operating_systems/centos.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# CentOS and derivatives
22

3-
## CentOS 7
4-
5-
The maximum python version officially supported in CentOS is 3.6. Ansible as of version 5 (ansible core 2.12.x) increased their python requirement to python 3.8 and above.
6-
Kubespray supports multiple ansible versions but only the default (5.x) gets wide testing coverage. If your deployment host is CentOS 7 it is recommended to use one of the earlier versions still supported.
7-
83
## CentOS 8
94

105
If you have containers that are using iptables in the host network namespace (`hostNetwork=true`),

inventory/sample/group_vars/all/offline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
# krew_download_url: "{{ files_repo }}/github.com/kubernetes-sigs/krew/releases/download/{{ krew_version }}/krew-{{ host_os }}_{{ image_arch }}.tar.gz"
8383

8484
## CentOS/Redhat/AlmaLinux
85-
### For EL7, base and extras repo must be available, for EL8, baseos and appstream
85+
### For EL8, baseos and appstream must be available,
8686
### By default we enable those repo automatically
8787
# rhel_enable_repos: false
8888
### Docker / Containerd

playbooks/ansible_version.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
tags:
2626
- check
2727

28-
# CentOS 7 provides too old jinja version
2928
- name: "Check that jinja is not too old (install via pip)"
3029
assert:
3130
msg: "Your Jinja version is too old, install via pip"

0 commit comments

Comments
 (0)