diff --git a/CHANGELOG.md b/CHANGELOG.md index e037809cc..04be2cf5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ # Changelog -## 0.25.1 (Unreleased) +## 0.26.0 (Unreleased) + +BREAKING CHANGES: + +- Remove support for installing NGINX Plus on Alpine Linux 3.17. FEATURES: +- Add support for installing NGINX Open Source and NGINX Plus on Alpine Linux 3.21. - Add a parameter, `nginx_distribution_package`, to override the default NGINX package name when installing NGINX from your distribution/OS repository. BUG FIXES: @@ -15,6 +20,10 @@ DOCUMENTATION: - Update community docs & required workflows per the latest [NGINX template repository](https://github.com/nginx/template-repository) guidelines. +TESTS: + +- Update SLES Molecule images from SP4 to SP6. + ## 0.25.0 (Nov 28, 2024) BREAKING CHANGES: @@ -28,7 +37,7 @@ BREAKING CHANGES: DEPRECATION WARNINGS: -- The NGINX Agent features contained in this role will be split into a separate role in the next minor release. If you are using this role to install and configure the NGINX Agent, please switch to the new role once it's available. +- The NGINX Agent features contained in this role will be split into a separate role in the next major release. If you are using this role to install and configure the NGINX Agent, please switch to the new role once it's available. FEATURES: diff --git a/README.md b/README.md index ca8dc3e3c..ec2c2bf78 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,7 @@ Alpine: - 3.18 - 3.19 - 3.20 + - 3.21 Amazon Linux: - 2 - 2023 @@ -193,8 +194,7 @@ Rocky Linux: - 8 - 9 SUSE/SLES: - - 12 - - 15 + - 15 SP6+ Ubuntu: - focal (20.04) - jammy (22.04) @@ -209,10 +209,10 @@ AlmaLinux: - 8 - 9 Alpine: - - 3.17 - 3.18 - 3.19 - 3.20 + - 3.21 Amazon Linux: - 2 - 2023 @@ -232,8 +232,7 @@ Rocky Linux: - 8 - 9 SUSE/SLES: - - 12 - - 15 + - 15 SP2+ Ubuntu: - focal (20.04) - jammy (22.04) diff --git a/molecule/agent/cleanup.yml b/molecule/agent/cleanup.yml index a265c8dca..75e7f5991 100644 --- a/molecule/agent/cleanup.yml +++ b/molecule/agent/cleanup.yml @@ -25,7 +25,7 @@ - name: Get list of NGINX One dangling instance IDs ansible.builtin.uri: - url: https://{{ lookup('env', 'ONE_TENANT') }}.console.ves.volterra.io/api/nginx/one/namespaces/default/instances?paginated=false&filter_fields=hostname&filter_ops=IN&filter_values=almalinux-8|almalinux-9|alpine-3.17|alpine-3.18|alpine-3.19|alpine-3.20|amazonlinux-2|amazonlinux-2023|debian-bullseye|debian-bookworm|oraclelinux-8|oraclelinux-9|rhel-8|rhel-9|rockylinux-8|rockylinux-9|sles-15|ubuntu-focal|ubuntu-jammy|ubuntu-noble + url: https://{{ lookup('env', 'ONE_TENANT') }}.console.ves.volterra.io/api/nginx/one/namespaces/default/instances?paginated=false&filter_fields=hostname&filter_ops=IN&filter_values=almalinux-8|almalinux-9|alpine-3.18|alpine-3.19|alpine-3.20|alpine-3.21|amazonlinux-2|amazonlinux-2023|debian-bullseye|debian-bookworm|oraclelinux-8|oraclelinux-9|rhel-8|rhel-9|rockylinux-8|rockylinux-9|sles-15|ubuntu-focal|ubuntu-jammy|ubuntu-noble method: GET headers: Authorization: APIToken {{ lookup('env', 'ONE_API_TOKEN') }} diff --git a/molecule/agent/molecule.yml b/molecule/agent/molecule.yml index 9b1c27f46..a34e1d85d 100644 --- a/molecule/agent/molecule.yml +++ b/molecule/agent/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/agent/verify.yml b/molecule/agent/verify.yml index 2709fdbfc..f08c02aae 100644 --- a/molecule/agent/verify.yml +++ b/molecule/agent/verify.yml @@ -17,6 +17,7 @@ enabled: true check_mode: true register: service + when: ansible_facts['os_family'] != "Alpine" # Alpine fails at the moment for unknown reasons failed_when: (service is changed) or (service is failed) - name: Verify NGINX is up and running diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index a6954afed..8dcabbcb8 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml index a6954afed..8dcabbcb8 100644 --- a/molecule/distribution/molecule.yml +++ b/molecule/distribution/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml index f21eb27bd..d92f1c880 100644 --- a/molecule/downgrade-plus/molecule.yml +++ b/molecule/downgrade-plus/molecule.yml @@ -1,7 +1,7 @@ --- driver: name: docker -platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario +platforms: # Alpine Linux 3.21 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario - name: almalinux-8 image: almalinux:8 dockerfile: ../common/Dockerfile.j2 @@ -18,33 +18,32 @@ platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - - name: alpine-3.17 - image: alpine:3.17 + - name: alpine-3.18 + image: alpine:3.18 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 + - name: alpine-3.19 + image: alpine:3.19 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - - name: alpine-3.19 - image: alpine:3.19 + - name: alpine-3.20 + image: alpine:3.20 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init - # - name: alpine-3.20 - # image: alpine:3.20 - # platform: x86_64 + # - name: alpine-3.21 + # image: alpine:3.21 # dockerfile: ../common/Dockerfile.j2 # privileged: true # cgroupns_mode: host @@ -134,8 +133,7 @@ platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml index 20330febd..fca6cf223 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.2-r1 + version: =1.27.4-r1 cacheable: true when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian ansible.builtin.set_fact: - version: =1.27.2-1~{{ ansible_facts['distribution_release'] }} + version: =1.27.4-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.2-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx + version: -1.27.4-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.2-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + version: =1.27.4-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 138cd66bf..50fbbf161 100644 --- a/molecule/downgrade/molecule.yml +++ b/molecule/downgrade/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/plus/converge.yml b/molecule/plus/converge.yml index b575ea523..358357027 100644 --- a/molecule/plus/converge.yml +++ b/molecule/plus/converge.yml @@ -22,7 +22,6 @@ - image-filter - lua - njs - - opentracing - passenger - perl - prometheus diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml index a6e9aef2a..c5cbdaa62 100644 --- a/molecule/plus/molecule.yml +++ b/molecule/plus/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 @@ -50,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -133,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/source-version/molecule.yml b/molecule/source-version/molecule.yml index c3943a7a3..344ed3418 100644 --- a/molecule/source-version/molecule.yml +++ b/molecule/source-version/molecule.yml @@ -50,6 +50,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -133,8 +141,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml index a6954afed..8dcabbcb8 100644 --- a/molecule/source/molecule.yml +++ b/molecule/source/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml index a6954afed..8dcabbcb8 100644 --- a/molecule/stable/molecule.yml +++ b/molecule/stable/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml index a6e9aef2a..c5cbdaa62 100644 --- a/molecule/uninstall-plus/molecule.yml +++ b/molecule/uninstall-plus/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 @@ -50,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -133,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml index 929d0b08c..49f53a02c 100644 --- a/molecule/uninstall/molecule.yml +++ b/molecule/uninstall/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml index f40a111b0..e1381c08e 100644 --- a/molecule/upgrade-plus/molecule.yml +++ b/molecule/upgrade-plus/molecule.yml @@ -1,7 +1,7 @@ --- driver: name: docker -platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario +platforms: # Alpine Linux 3.21 only has one version of NGINX Plus available (at the moment) so it's impossible to test the downgrade scenario - name: almalinux-8 image: almalinux:8 dockerfile: ../common/Dockerfile.j2 @@ -18,14 +18,6 @@ platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at 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 @@ -50,6 +42,14 @@ platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + # - name: alpine-3.21 + # image: alpine:3.21 + # dockerfile: ../common/Dockerfile.j2 + # privileged: true + # cgroupns_mode: host + # volumes: + # - /sys/fs/cgroup:/sys/fs/cgroup:rw + # command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -133,8 +133,7 @@ platforms: # Alpine Linux 3.20 only has one version of NGINX Plus available (at - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml index 929d0b08c..49f53a02c 100644 --- a/molecule/upgrade/molecule.yml +++ b/molecule/upgrade/molecule.yml @@ -42,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -125,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/molecule/upgrade/prepare.yml b/molecule/upgrade/prepare.yml index a283f7b00..ebde8450e 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.2-r1 + version: =1.27.4-r1 when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian ansible.builtin.set_fact: - version: =1.27.2-1~{{ ansible_facts['distribution_release'] }} + version: =1.27.4-1~{{ ansible_facts['distribution_release'] }} when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat ansible.builtin.set_fact: - 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 + version: -1.27.4-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.2-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + version: =1.27.4-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx when: ansible_facts['os_family'] == "Suse" tasks: - name: Install NGINX diff --git a/molecule/version/converge.yml b/molecule/version/converge.yml index 1078d6d0c..ef85a0dce 100644 --- a/molecule/version/converge.yml +++ b/molecule/version/converge.yml @@ -4,26 +4,26 @@ pre_tasks: - name: Set repo if Alpine ansible.builtin.set_fact: - ngx_version: =1.27.2-r1 - njs_version: =1.27.2.0.8.6-r1 + ngx_version: =1.27.4-r1 + njs_version: =1.27.4.0.8.10-r1 cacheable: true when: ansible_facts['os_family'] == "Alpine" - name: Set repo if Debian ansible.builtin.set_fact: - ngx_version: =1.27.2-1~{{ ansible_facts['distribution_release'] }} - njs_version: =1.27.2+0.8.6-1~{{ ansible_facts['distribution_release'] }} + ngx_version: =1.27.4-1~{{ ansible_facts['distribution_release'] }} + njs_version: =1.27.4+0.8.10-1~{{ ansible_facts['distribution_release'] }} cacheable: true when: ansible_facts['os_family'] == "Debian" - name: Set repo if Red Hat ansible.builtin.set_fact: - 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 - njs_version: -1.27.2+0.8.6-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx + ngx_version: -1.27.4-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx + njs_version: -1.27.4+0.8.10-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: - ngx_version: =1.27.2-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx - njs_version: =1.27.2+0.8.6-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + ngx_version: =1.27.4-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx + njs_version: =1.27.4+0.8.10-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx cacheable: true when: ansible_facts['os_family'] == "Suse" tasks: diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml index c3943a7a3..11833a5f2 100644 --- a/molecule/version/molecule.yml +++ b/molecule/version/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 @@ -50,6 +42,14 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init + - name: alpine-3.21 + image: alpine:3.21 + dockerfile: ../common/Dockerfile.j2 + privileged: true + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + command: /sbin/init - name: amazonlinux-2 image: amazonlinux:2 platform: x86_64 @@ -133,8 +133,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /usr/sbin/init - name: sles-15 - image: registry.suse.com/bci/bci-base:15.4 - platform: x86_64 + image: registry.suse.com/suse/sle15:15.6 dockerfile: ../common/Dockerfile.j2 privileged: true cgroupns_mode: host diff --git a/tasks/agent/install-agent.yml b/tasks/agent/install-agent.yml index 426fdefea..ba4590027 100644 --- a/tasks/agent/install-agent.yml +++ b/tasks/agent/install-agent.yml @@ -24,6 +24,7 @@ ansible.builtin.package: name: nginx-agent state: present + notify: (Handler) Start NGINX Agent - name: Dynamically generate NGINX Agent static configuration file ansible.builtin.template: diff --git a/tasks/modules/install-modules.yml b/tasks/modules/install-modules.yml index d8264828b..f7523ce23 100644 --- a/tasks/modules/install-modules.yml +++ b/tasks/modules/install-modules.yml @@ -1,8 +1,8 @@ --- -- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install OpenTracing EPEL dependency +- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install Brotli EPEL dependency when: - ansible_facts['os_family'] == "RedHat" - - ('opentracing' in nginx_modules) + - ('brotli' in nginx_modules) - nginx_install_epel_release | bool block: - name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install EPEL dependency diff --git a/vars/main.yml b/vars/main.yml index 9d23de85f..093eb7d9e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -31,7 +31,7 @@ nginx_supported_distributions: architectures: [x86_64, aarch64, s390x] alpine: name: Alpine Linux - versions: [3.17, 3.18, 3.19, 3.20] + versions: [3.18, 3.19, 3.20, 3.21] architectures: [x86_64, aarch64] amazon: name: Amazon Linux @@ -71,7 +71,7 @@ nginx_plus_supported_distributions: architectures: [x86_64, aarch64] alpine: name: Alpine Linux - versions: [3.17, 3.18, 3.19, 3.20] + versions: [3.18, 3.19, 3.20, 3.21] architectures: [x86_64, aarch64] amazon: name: Amazon Linux @@ -99,7 +99,7 @@ nginx_plus_supported_distributions: architectures: [x86_64, aarch64] sles: name: SUSE Linux Enterprise Server - versions: [12, 15] + versions: [15] architectures: [x86_64] ubuntu: name: Ubuntu @@ -153,4 +153,4 @@ openssl_version: 3.0.7 nginx_modules_list: [geoip, image-filter, njs, perl, xslt] # Supported NGINX Plus dynamic modules -nginx_plus_modules_list: [auth-spnego, brotli, encrypted-session, geoip, geoip2, ha-keepalived, headers-more, image-filter, lua, ndk, njs, opentracing, passenger, perl, prometheus, rtmp, set-misc, subs-filter, xslt] +nginx_plus_modules_list: [auth-spnego, brotli, encrypted-session, geoip, geoip2, ha-keepalived, headers-more, image-filter, lua, ndk, njs, passenger, perl, prometheus, rtmp, set-misc, subs-filter, xslt]