Bump molecule[docker] from 3.6.0 to 3.6.1 in /.github/workflows/requirements (#488)

2022-02-15 18:49:40 +01:00 · 2022-02-15 18:49:40 +01:00 · a63b8274c1
commit a63b8274c1
parent 121433df24
7 changed files with 41 additions and 33 deletions
--- a/.github/workflows/requirements/requirements_molecule.txt
+++ b/.github/workflows/requirements/requirements_molecule.txt
@ -2,5 +2,5 @@ ansible-core==2.12.2
 jinja2==3.0.3
 ansible-lint==5.3.2
 yamllint==1.26.3
-molecule[docker]==3.6.0
+molecule[docker]==3.6.1
 docker==5.0.3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,11 +4,17 @@

 BREAKING CHANGES:

-CentOS 8 has reached EoL and has thus been removed from the list of supported platforms.
+* CentOS 8 has reached EoL and has thus been removed from the list of supported platforms.
+* The NGINX Plus `cookie-flag` module is no longer supported as of R26 and has been removed.

 FEATURES:

-Support for ansible-base (ansible-core `<2.12`).
+Backwards support for older versions of Ansible (e.g. Ansible `<2.12`).
+
+ENHANCEMENTS:
+
+* Add Alpine Linux 3.15 to the NGINX Plus list of tested and supported platforms (and remove Alpine Linux 3.11).
+* Use `pcre2` by default when possible.

 BUG FIXES:

@ -30,8 +36,8 @@ FEATURES:

 ENHANCEMENTS:

-* Add Alpine Linux 3.15 to list of tested and supported platforms.
-* Bump the Ansible `community.general` collection to `4.2.0` and `community.docker` collection to `2.0.2`.
+* Add Alpine Linux 3.15 to the NGINX OSS list of tested and supported platforms (and remove Alpine Linux 3.11).
+* Bump the Ansible `community.general` collection to `4.1.0` and `community.docker` collection to `2.0.2`.

 BUG FIXES:

--- a/molecule/plus/converge.yml
+++ b/molecule/plus/converge.yml
@ -14,15 +14,14 @@
        nginx_modules:
          - auth-spnego
          - brotli
-          - cookie-flag
          - encrypted-session
          - geoip
-          - "{{ ansible_facts['distribution'] == 'Amazon' | ternary('', 'geoip2') }}"
+          - geoip2
          - headers-more
          - image-filter
          - lua
          - njs
-          - "{{ ansible_facts['distribution'] == 'Amazon' | ternary('', 'opentracing') }}"
+          - opentracing
          - passenger
          - perl
          - prometheus
--- a/molecule/plus/molecule.yml
+++ b/molecule/plus/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.11
-    image: alpine:3.11
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.12
    image: alpine:3.12
    dockerfile: ../common/Dockerfile.j2
@ -34,6 +27,13 @@ platforms:
    volumes:
      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
    command: "/sbin/init"
+  - name: alpine-3.15
+    image: alpine:3.15
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
  - name: amazonlinux-2
    image: amazonlinux:2
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/uninstall_plus/molecule.yml
+++ b/molecule/uninstall_plus/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.11
-    image: alpine:3.11
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.12
    image: alpine:3.12
    dockerfile: ../common/Dockerfile.j2
@ -34,6 +27,13 @@ platforms:
    volumes:
      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
    command: "/sbin/init"
+  - name: alpine-3.15
+    image: alpine:3.15
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
  - name: amazonlinux-2
    image: amazonlinux:2
    dockerfile: ../common/Dockerfile.j2
--- a/tasks/modules/install-modules.yml
+++ b/tasks/modules/install-modules.yml
@ -18,16 +18,19 @@
      or (item.name | default(item) in nginx_plus_modules_list and nginx_type == 'plus')
    - not (item.name | default(item) == "auth-spnego")
      or not (ansible_facts['os_family'] == "Alpine" and (ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') is version('3.8', '==')))
-    - not (item.name | default(item) == "geoip")
-      or not ((ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '=='))
-      or (ansible_facts['os_family'] == "FreeBSD"))
    - not (item.name | default(item) == "brotli")
      or not ((ansible_facts['os_family'] == "Alpine")
-      or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '<'))
-      or (ansible_facts['os_family'] == "Debian" and ansible_facts['distribution_major_version'] is version('9', '=='))
-      or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '<'))
      or (ansible_facts['distribution'] == "Amazon")
-      or (ansible_facts['distribution'] == "OracleLinux"))
-    - not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse")
+      or (ansible_facts['os_family'] == "Debian" and ansible_facts['distribution_major_version'] is version('9', '=='))
+      or (ansible_facts['distribution'] == "OracleLinux")
+      or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '<'))
+      or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '<')))
+    - not (item.name | default(item) == "geoip")
+      or not ((ansible_facts['os_family'] == "FreeBSD")
+      or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '==')))
+    - not (item.name | default(item) == "geoip2")
+      or not ((ansible_facts['distribution'] == 'Amazon')
+      or (ansible_facts['os_family'] == "Suse"))
    - not (item.name | default(item) == "opentracing")
-      or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
+      or not ((ansible_facts['distribution'] == 'Amazon')
+      or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '==')))
--- a/vars/main.yml
+++ b/vars/main.yml
@ -57,7 +57,7 @@ nginx_plus_default_repository_suse: "https://pkgs.nginx.com/plus/sles/{{ ansible

 # Alpine dependencies
 nginx_alpine_dependencies: [
-  'ca-certificates', 'coreutils', 'openssl', 'pcre',
+  'ca-certificates', 'coreutils', 'openssl', 'pcre2',
 ]

 # Debian dependencies
@ -92,6 +92,6 @@ nginx_modules_list: [

 # Supported NGINX Plus dynamic modules
 nginx_plus_modules_list: [
-  'auth-spnego', 'brotli', 'cookie-flag', 'encrypted-session', 'geoip', 'geoip2', 'headers-more', 'image-filter',
+  'auth-spnego', 'brotli', 'encrypted-session', 'geoip', 'geoip2', 'headers-more', 'image-filter',
  'lua', 'njs', 'opentracing', 'passenger', 'perl', 'prometheus', 'rtmp', 'subs-filter', 'xslt',
 ]