Skip to content

Commit

Permalink
feat!: Remove Alpine Linux 3.17 support for NGINX Open Source
Browse files Browse the repository at this point in the history
  • Loading branch information
alessfg committed Nov 28, 2024
1 parent e6a3b34 commit d7c306b
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 91 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ BREAKING CHANGES:
- NGINX Plus requires a JWT license starting with R33. Make sure you include the path to the base64 encoded JWT license using the new `nginx_license['jwt']` parameter.
- 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 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.24.3). Do note that you will only be able to use NGINX versions released as of the date of the aforementioned release (July 11, 2024).
- Remove support for installing NGINX Open Source and NGINX Plus on Alpine Linux 3.16.
- Remove support for installing NGINX Open Source on Alpine Linux 3.17.
- Remove support for installing NGINX Open Source on Ubuntu mantic.
- No longer omit `allow_downgrade` module parameter when running Ansible versions lower than `2.12`.

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ AlmaLinux:
- 8
- 9
Alpine:
- 3.17
- 3.18
- 3.19
- 3.20
Expand Down
8 changes: 0 additions & 8 deletions molecule/agent/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down
8 changes: 0 additions & 8 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down
8 changes: 0 additions & 8 deletions molecule/distribution/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down
8 changes: 4 additions & 4 deletions molecule/downgrade/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
pre_tasks:
- name: Set repo if Alpine
ansible.builtin.set_fact:
version: =1.27.1-r1
version: =1.27.2-r1
cacheable: true
when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian
ansible.builtin.set_fact:
version: =1.27.1-1~{{ ansible_facts['distribution_release'] }}
version: =1.27.2-1~{{ ansible_facts['distribution_release'] }}
cacheable: true
when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat
ansible.builtin.set_fact:
version: -1.27.1-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
version: -1.27.2-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
cacheable: true
when: ansible_facts['os_family'] == "RedHat"
- name: Set repo if SLES
ansible.builtin.set_fact:
version: =1.27.1-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
version: =1.27.2-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
cacheable: true
when: ansible_facts['os_family'] == "Suse"
tasks:
Expand Down
26 changes: 9 additions & 17 deletions molecule/downgrade/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
driver:
name: docker
platforms: # Ubuntu oracular only has one version of NGINX OSS available (at the moment) so it's impossible to test the downgrade scenario
platforms:
- name: almalinux-8
image: almalinux:8
dockerfile: ../common/Dockerfile.j2
Expand All @@ -18,14 +18,6 @@ platforms: # Ubuntu oracular only has one version of NGINX OSS available (at the
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down Expand Up @@ -165,14 +157,14 @@ platforms: # Ubuntu oracular only has one version of NGINX OSS available (at the
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
# - name: ubuntu-oracular
# image: ubuntu:oracular
# dockerfile: ../common/Dockerfile.j2
# privileged: true
# cgroupns_mode: host
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
# command: /sbin/init
- name: ubuntu-oracular
image: ubuntu:oracular
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
provisioner:
name: ansible
log: true
Expand Down
8 changes: 0 additions & 8 deletions molecule/source/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down
8 changes: 0 additions & 8 deletions molecule/stable/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down
8 changes: 0 additions & 8 deletions molecule/uninstall/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down
26 changes: 9 additions & 17 deletions molecule/upgrade/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
driver:
name: docker
platforms: # Ubuntu oracular only has one version of NGINX OSS available (at the moment) so it's impossible to test the upgrade scenario
platforms:
- name: almalinux-8
image: almalinux:8
dockerfile: ../common/Dockerfile.j2
Expand All @@ -18,14 +18,6 @@ platforms: # Ubuntu oracular only has one version of NGINX OSS available (at the
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: alpine-3.17
image: alpine:3.17
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
- name: alpine-3.18
image: alpine:3.18
dockerfile: ../common/Dockerfile.j2
Expand Down Expand Up @@ -165,14 +157,14 @@ platforms: # Ubuntu oracular only has one version of NGINX OSS available (at the
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
# - name: ubuntu-oracular
# image: ubuntu:oracular
# dockerfile: ../common/Dockerfile.j2
# privileged: true
# cgroupns_mode: host
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
# command: /sbin/init
- name: ubuntu-oracular
image: ubuntu:oracular
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /sbin/init
provisioner:
name: ansible
log: true
Expand Down
8 changes: 4 additions & 4 deletions molecule/upgrade/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
pre_tasks:
- name: Set repo if Alpine
ansible.builtin.set_fact:
version: =1.27.1-r1
version: =1.27.2-r1
when: ansible_facts['os_family'] == "Alpine"
- name: Set repo if Debian
ansible.builtin.set_fact:
version: =1.27.1-1~{{ ansible_facts['distribution_release'] }}
version: =1.27.2-1~{{ ansible_facts['distribution_release'] }}
when: ansible_facts['os_family'] == "Debian"
- name: Set repo if Red Hat
ansible.builtin.set_fact:
version: -1.27.1-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
version: -1.27.2-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
when: ansible_facts['os_family'] == "RedHat"
- name: Set repo if SLES
ansible.builtin.set_fact:
version: =1.27.1-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
version: =1.27.2-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
when: ansible_facts['os_family'] == "Suse"
tasks:
- name: Install NGINX
Expand Down

0 comments on commit d7c306b

Please sign in to comment.