From 6ba6628ce499475a8a571596bd9c60e494bba50d Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 28 Nov 2024 05:29:09 -0900 Subject: [PATCH] feat!: Remove Alpine Linux 3.17 support for NGINX Open Source (#830) --- CHANGELOG.md | 1 + README.md | 1 - molecule/agent/molecule.yml | 8 -------- molecule/default/molecule.yml | 8 -------- molecule/distribution/molecule.yml | 8 -------- molecule/downgrade/converge.yml | 8 ++++---- molecule/downgrade/molecule.yml | 26 +++++++++----------------- molecule/source/molecule.yml | 8 -------- molecule/stable/molecule.yml | 8 -------- molecule/uninstall/molecule.yml | 8 -------- molecule/upgrade/molecule.yml | 26 +++++++++----------------- molecule/upgrade/prepare.yml | 8 ++++---- 12 files changed, 27 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76130cb4c..109348671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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`. diff --git a/README.md b/README.md index 4befb5542..2558c7882 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,6 @@ AlmaLinux: - 8 - 9 Alpine: - - 3.17 - 3.18 - 3.19 - 3.20 diff --git a/molecule/agent/molecule.yml b/molecule/agent/molecule.yml index cbdc75c60..ef891401f 100644 --- a/molecule/agent/molecule.yml +++ b/molecule/agent/molecule.yml @@ -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 diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 532ea3291..47c1fb28f 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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 diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index 532ea3291..47c1fb28f 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -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 diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml index 7734df6b1..20330febd 100644 --- a/molecule/downgrade/converge.yml +++ b/molecule/downgrade/converge.yml @@ -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: diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml index 210d947c2..56fbf6f2e 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -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 @@ -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 @@ -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 diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index 532ea3291..47c1fb28f 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -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 diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index 532ea3291..47c1fb28f 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -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 diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index 2ad2d1159..1604f477c 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -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 diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index 8403c707a..1604f477c 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -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 @@ -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 @@ -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 diff --git a/molecule/upgrade/prepare.yml b/molecule/upgrade/prepare.yml index 72d157031..a283f7b00 100644 --- a/molecule/upgrade/prepare.yml +++ b/molecule/upgrade/prepare.yml @@ -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