Skip to content

Commit 9f48812

Browse files
authored
chore!: Remove support for RHEL 7 based distributions (#304)
1 parent 6ac90e8 commit 9f48812

File tree

18 files changed

+58
-262
lines changed

18 files changed

+58
-262
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Main global owner #
22
#####################
3-
* @alessfg @aknot242
3+
* @alessfg
44
/.github/workflows/
55
*.md

CHANGELOG.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# Changelog
22

3-
## 0.9.1 (Unreleased)
3+
## 0.10.0 (Unreleased)
4+
5+
BREAKING CHANGES:
6+
7+
- Remove support for RHEL 7 based distributions (RHEL/CentOS/Oracle Linux 7). CentOS 7 has reached EoL, RHEL 7 has reached EoM, and Oracle Linux 7 will reach EoL shortly. These distributions will not be supported by new NGINX App Protect releases moving forward. If you are still using one of these distributions, please consider upgrading. If you still want to use this role for the time being, please use the previous release (0.9.0). Do note that you will only be able to use NGINX App Protect versions released as of the date of the aforementioned release (January 29, 2023).
48

59
FEATURES:
610

7-
- Add support for installing NGINX App Protect WAF on Alpine Linux 3.16/3.17, RHEL 9, and Ubuntu jammy.
8-
- Remove support for installing NGINX App Protect WAF on Ubuntu bionic.
11+
- Add support for installing NGINX App Protect WAF on Alpine Linux 3.17, RHEL 9, and Ubuntu jammy.
12+
- Remove support for installing NGINX App Protect WAF/DoS on Alpine Linux 3.15/3.16 and Ubuntu bionic.
913

1014
ENHANCEMENTS:
1115

@@ -44,7 +48,7 @@ BUG FIXES:
4448
TESTS:
4549

4650
- Update GitHub actions to run on Ubuntu 22.04 (and thus support `cgroups` v2).
47-
- Explicitly specify `amd64` as the platform used in Molecule tests. This will ensure that tests work as expected when run on different host architectures (e.g. newer Macbooks with `arm` processors).
51+
- Explicitly specify `x86_64` as the platform used in Molecule tests. This will ensure that tests work as expected when run on different host architectures (e.g. newer Macbooks with `arm` processors).
4852

4953
## 0.8.1 (September 28, 2022)
5054

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@ The NGINX App Protect Ansible role supports all platforms supported by [NGINX Pl
9191
```yaml
9292
Amazon Linux 2:
9393
- any
94-
CentOS:
95-
- 7.4+
9694
Debian:
9795
- buster (10)
9896
RHEL:
99-
- 7.4+
10097
- 8.1+
10198
Ubuntu:
10299
- bionic (18.04)
@@ -108,15 +105,10 @@ Ubuntu:
108105
The NGINX App Protect Ansible role supports all platforms supported by [NGINX Plus](https://www.nginx.com/products/technical-specs/) that intersect with the following list of distributions of App Protect DoS:
109106

110107
```yaml
111-
Alpine:
112-
- 3.15
113-
CentOS:
114-
- 7.4+
115108
Debian:
116109
- buster (10)
117110
- bullseye (11)
118111
RHEL:
119-
- 7.4+
120112
- 8.0+
121113
Ubuntu:
122114
- bionic (18.04)

defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ nginx_app_protect_log_policy_file:
112112
- src: files/config/log-policy.json
113113
dest: /etc/app_protect/conf/log-policy.json
114114

115-
# Set SELinux enforcing for NGINX (CentOS/Red Hat only) - you may need to open ports on your own
115+
# Set SELinux enforcing for NGINX (Red Hat only) - you may need to open ports on your own
116116
nginx_app_protect_selinux: false
117117

118118
# Enable enforcing mode if true. Permissive if false (audit only, no enforcing) globally (only works with nginx_selinux: true)

meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ galaxy_info:
1717
- name: Debian
1818
versions: [bullseye]
1919
- name: EL
20-
versions: ['7', '8', '9']
20+
versions: ['8', '9']
2121
- name: OracleLinux
2222
versions: ['8']
2323
- name: Ubuntu

molecule/advanced/molecule.yml

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,15 @@ driver:
88
platforms:
99
- name: test-workload
1010
image: nginxdemos/hello
11-
platform: amd64
11+
platform: x86_64
1212
privileged: true
1313
groups:
1414
- workload
1515
networks:
1616
- name: molecule-test
17-
- name: centos-7
18-
image: centos:7
19-
dockerfile: ../common/Dockerfile.j2
20-
platform: amd64
21-
privileged: true
22-
cgroupns_mode: host
23-
volumes:
24-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25-
command: /usr/sbin/init
26-
groups:
27-
- nap
28-
networks:
29-
- name: molecule-test
30-
- name: debian-buster
31-
image: debian:buster-slim
32-
platform: amd64
33-
dockerfile: ../common/Dockerfile.j2
34-
privileged: true
35-
cgroupns_mode: host
36-
volumes:
37-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
38-
command: /sbin/init
39-
groups:
40-
- nap
41-
networks:
42-
- name: molecule-test
43-
- name: ubuntu-bionic
44-
image: ubuntu:bionic
45-
platform: amd64
46-
dockerfile: ../common/Dockerfile.j2
47-
privileged: true
48-
cgroupns_mode: host
49-
volumes:
50-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
51-
command: /sbin/init
52-
groups:
53-
- nap
54-
networks:
55-
- name: molecule-test
5617
- name: ubuntu-focal
5718
image: ubuntu:focal
58-
platform: amd64
19+
platform: x86_64
5920
dockerfile: ../common/Dockerfile.j2
6021
privileged: true
6122
cgroupns_mode: host

molecule/common/Dockerfile.j2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ RUN \
2525
&& dnf clean all; \
2626
elif [ $(command -v yum) ]; then \
2727
yum makecache fast \
28-
&& yum install -y bash iproute initscripts sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl \
29-
&& yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/yum-plugin-copr-1.1.31-54.el7_8.noarch.rpm http://mirror.centos.org/centos/7/os/x86_64/Packages/libseccomp-2.3.1-4.el7.x86_64.rpm \
28+
&& yum install -y bash iproute initscripts sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-copr yum-plugin-ovl \
3029
&& yum copr enable -y jsynacek/systemd-backports-for-centos-7 \
3130
&& yum update --disableplugin=priorities -y systemd \
3231
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \

molecule/default/molecule.yml

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22
driver:
33
name: docker
44
platforms:
5-
- name: alpine-3.16
6-
image: alpine:3.16
7-
platform: amd64
8-
dockerfile: ../common/Dockerfile.j2
9-
privileged: true
10-
cgroupns_mode: host
11-
volumes:
12-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
13-
command: /sbin/init
145
- name: alpine-3.17
156
image: alpine:3.17
16-
platform: amd64
7+
platform: x86_64
178
dockerfile: ../common/Dockerfile.j2
189
privileged: true
1910
cgroupns_mode: host
@@ -22,16 +13,7 @@ platforms:
2213
command: /sbin/init
2314
- name: amazonlinux-2
2415
image: amazonlinux:2
25-
platform: amd64
26-
dockerfile: ../common/Dockerfile.j2
27-
privileged: true
28-
cgroupns_mode: host
29-
volumes:
30-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
31-
command: /usr/sbin/init
32-
- name: centos-7
33-
image: centos:7
34-
platform: amd64
16+
platform: x86_64
3517
dockerfile: ../common/Dockerfile.j2
3618
privileged: true
3719
cgroupns_mode: host
@@ -40,7 +22,7 @@ platforms:
4022
command: /usr/sbin/init
4123
- name: debian-bullseye
4224
image: debian:bullseye-slim
43-
platform: amd64
25+
platform: x86_64
4426
dockerfile: ../common/Dockerfile.j2
4527
privileged: true
4628
cgroupns_mode: host
@@ -49,16 +31,7 @@ platforms:
4931
command: /sbin/init
5032
- name: oraclelinux-8
5133
image: oraclelinux:8
52-
platform: amd64
53-
dockerfile: ../common/Dockerfile.j2
54-
privileged: true
55-
cgroupns_mode: host
56-
volumes:
57-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
58-
command: /usr/sbin/init
59-
- name: rhel-7
60-
image: registry.access.redhat.com/ubi7:7.9
61-
platform: amd64
34+
platform: x86_64
6235
dockerfile: ../common/Dockerfile.j2
6336
privileged: true
6437
cgroupns_mode: host
@@ -67,7 +40,7 @@ platforms:
6740
command: /usr/sbin/init
6841
- name: rhel-8
6942
image: redhat/ubi8:8.7
70-
platform: amd64
43+
platform: x86_64
7144
dockerfile: ../common/Dockerfile.j2
7245
privileged: true
7346
cgroupns_mode: host
@@ -78,7 +51,7 @@ platforms:
7851
image: redhat/ubi9:9.1.0
7952
env:
8053
SMDEV_CONTAINER_OFF: "1"
81-
platform: amd64
54+
platform: x86_64
8255
dockerfile: ../common/Dockerfile.j2
8356
privileged: true
8457
cgroupns_mode: host
@@ -87,7 +60,7 @@ platforms:
8760
command: /usr/sbin/init
8861
- name: ubuntu-focal
8962
image: ubuntu:focal
90-
platform: amd64
63+
platform: x86_64
9164
dockerfile: ../common/Dockerfile.j2
9265
privileged: true
9366
cgroupns_mode: host
@@ -96,7 +69,7 @@ platforms:
9669
command: /sbin/init
9770
- name: ubuntu-jammy
9871
image: ubuntu:jammy
99-
platform: amd64
72+
platform: x86_64
10073
dockerfile: ../common/Dockerfile.j2
10174
privileged: true
10275
cgroupns_mode: host

molecule/dos/molecule.yml

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,27 @@
22
driver:
33
name: docker
44
platforms:
5-
- name: alpine-3.15
6-
image: alpine:3.15
7-
platform: amd64
8-
dockerfile: ../common/Dockerfile.j2
9-
privileged: true
10-
cgroupns_mode: host
11-
volumes:
12-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
13-
command: /sbin/init
14-
- name: centos-7
15-
image: centos:7
16-
platform: amd64
17-
dockerfile: ../common/Dockerfile.j2
18-
privileged: true
19-
cgroupns_mode: host
20-
volumes:
21-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
22-
command: /usr/sbin/init
235
- name: debian-bullseye
246
image: debian:bullseye-slim
25-
platform: amd64
7+
platform: x86_64
268
dockerfile: ../common/Dockerfile.j2
279
privileged: true
2810
cgroupns_mode: host
2911
volumes:
3012
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3113
command: /sbin/init
32-
- name: rhel-7
33-
image: registry.access.redhat.com/ubi7:7.9
34-
platform: amd64
35-
dockerfile: ../common/Dockerfile.j2
36-
privileged: true
37-
cgroupns_mode: host
38-
volumes:
39-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
40-
command: /usr/sbin/init
4114
- name: rhel-8
4215
image: redhat/ubi8:8.7
43-
platform: amd64
16+
platform: x86_64
4417
dockerfile: ../common/Dockerfile.j2
4518
privileged: true
4619
cgroupns_mode: host
4720
volumes:
4821
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4922
command: /usr/sbin/init
50-
- name: ubuntu-bionic
51-
image: ubuntu:bionic
52-
platform: amd64
53-
dockerfile: ../common/Dockerfile.j2
54-
privileged: true
55-
cgroupns_mode: host
56-
volumes:
57-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
58-
command: /sbin/init
5923
- name: ubuntu-focal
6024
image: ubuntu:focal
61-
platform: amd64
25+
platform: x86_64
6226
dockerfile: ../common/Dockerfile.j2
6327
privileged: true
6428
cgroupns_mode: host

molecule/specific-version/molecule.yml

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@ driver:
44
platforms:
55
- name: amazonlinux-2
66
image: amazonlinux:2
7-
platform: amd64
8-
dockerfile: ../common/Dockerfile.j2
9-
privileged: true
10-
cgroupns_mode: host
11-
volumes:
12-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
13-
command: /usr/sbin/init
14-
- name: centos-7
15-
image: centos:7
16-
platform: amd64
7+
platform: x86_64
178
dockerfile: ../common/Dockerfile.j2
189
privileged: true
1910
cgroupns_mode: host
@@ -22,7 +13,7 @@ platforms:
2213
command: /usr/sbin/init
2314
- name: debian-bullseye
2415
image: debian:bullseye-slim
25-
platform: amd64
16+
platform: x86_64
2617
dockerfile: ../common/Dockerfile.j2
2718
privileged: true
2819
cgroupns_mode: host
@@ -31,34 +22,16 @@ platforms:
3122
command: /sbin/init
3223
- name: oraclelinux-8
3324
image: oraclelinux:8
34-
platform: amd64
35-
dockerfile: ../common/Dockerfile.j2
36-
privileged: true
37-
cgroupns_mode: host
38-
volumes:
39-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
40-
command: /usr/sbin/init
41-
- name: rhel-7
42-
image: registry.access.redhat.com/ubi7:7.9
43-
platform: amd64
25+
platform: x86_64
4426
dockerfile: ../common/Dockerfile.j2
4527
privileged: true
4628
cgroupns_mode: host
4729
volumes:
4830
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4931
command: /usr/sbin/init
50-
- name: ubuntu-bionic
51-
image: ubuntu:bionic
52-
platform: amd64
53-
dockerfile: ../common/Dockerfile.j2
54-
privileged: true
55-
cgroupns_mode: host
56-
volumes:
57-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
58-
command: /sbin/init
5932
- name: ubuntu-focal
6033
image: ubuntu:focal
61-
platform: amd64
34+
platform: x86_64
6235
dockerfile: ../common/Dockerfile.j2
6336
privileged: true
6437
cgroupns_mode: host

0 commit comments

Comments
 (0)