feat: Add support for Amazon Linux 2023 (#706)

alessfg · web-flow · commit 48fa0d9a6685 · 2024-04-17T05:21:32.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
 FEATURES:
 
 - Implement the ability to install the NGINX Agent.
-- Add Alpine Linux 3.19 to the list of NGINX Open Source and NGINX Plus tested and supported distributions.
+- Add Amazon Linux 2023 and Alpine Linux 3.19 to the list of NGINX Open Source and NGINX Plus tested and supported distributions.
 - Remove Alpine Linux 3.15 from the list of NGINX Open Source and NGINX Plus tested and supported distributions.
 
 ENHANCEMENTS:
diff --git a/README.md b/README.md
@@ -118,6 +118,7 @@ Alpine:
   - 3.19
 Amazon Linux:
   - 2
+  - 2023
 CentOS:
   - 7.4+
 Debian:
@@ -156,6 +157,7 @@ Alpine:
   - 3.19
 Amazon Linux:
   - 2
+  - 2023
 CentOS:
   - 7.4+
 Debian:
@@ -197,6 +199,7 @@ Alpine:
   - 3.19
 Amazon Linux:
   - 2
+  - 2023
 Debian:
   - bullseye (11)
   - bookwork (12)
diff --git a/molecule/agent/molecule.yml b/molecule/agent/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/common/Dockerfile.j2 b/molecule/common/Dockerfile.j2
@@ -21,7 +21,7 @@ RUN \
     && apt-get clean; \
   elif [ $(command -v dnf) ]; then \
     dnf makecache \
-    && dnf --assumeyes install bash iproute sudo /usr/bin/dnf-3 /usr/bin/python3 /usr/bin/python3-config vim \
+    && dnf --assumeyes install bash iproute sudo systemd /usr/bin/dnf-3 /usr/bin/python3 /usr/bin/python3-config vim \
     && dnf clean all; \
   elif [ $(command -v yum) ]; then \
     yum makecache fast \
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml
@@ -61,6 +61,14 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/downgrade-plus/converge.yml b/molecule/downgrade-plus/converge.yml
@@ -14,7 +14,7 @@
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
-        version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        version: -30-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
diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml
@@ -61,6 +61,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml
@@ -14,7 +14,7 @@
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
-        version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        version: -1.25.3-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
diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/source-version/molecule.yml b/molecule/source-version/molecule.yml
@@ -61,6 +61,14 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml
@@ -61,6 +61,14 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml
@@ -61,6 +61,14 @@ platforms: # Alpine 3.19 only has one version of NGINX Plus available (at the mo
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/upgrade-plus/prepare.yml b/molecule/upgrade-plus/prepare.yml
@@ -30,7 +30,7 @@
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
-        version: -30-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        version: -30-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:
diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/molecule/upgrade/prepare.yml b/molecule/upgrade/prepare.yml
@@ -12,7 +12,7 @@
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
-        version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        version: -1.25.3-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:
diff --git a/molecule/version/converge.yml b/molecule/version/converge.yml
@@ -16,8 +16,8 @@
       when: ansible_facts['os_family'] == "Debian"
     - name: Set repo if Red Hat
       ansible.builtin.set_fact:
-        ngx_version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
-        njs_version: -1.25.3+0.8.2-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        ngx_version: -1.25.3-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary(('amzn' + ansible_facts['distribution_major_version'] | string), ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
+        njs_version: -1.25.3+0.8.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
diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml
@@ -61,6 +61,14 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
+  - name: amazonlinux-2023
+    image: amazonlinux:2023
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
   - name: centos-7
     image: centos:7
     platform: x86_64
diff --git a/tasks/agent/setup-redhat.yml b/tasks/agent/setup-redhat.yml
@@ -3,7 +3,7 @@
   ansible.builtin.yum_repository:
     name: nginx-agent
     file: nginx-agent
-    baseurl: https://packages.nginx.org/nginx-agent/{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', 'centos') }}/{{ ansible_facts['distribution_major_version'] }}/$basearch
+    baseurl: https://packages.nginx.org/nginx-agent/{{ (ansible_facts['distribution'] == 'Amazon') | ternary((ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('amzn2', 'amzn'), 'centos') }}/{{ ansible_facts['distribution_major_version'] }}/$basearch
     description: NGINX Agent
     enabled: true
     gpgcheck: true
diff --git a/tasks/modules/install-modules.yml b/tasks/modules/install-modules.yml
@@ -26,6 +26,7 @@
 - name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install GeoIP2 and/or OpenTracing EPEL dependency
   when:
     - ansible_facts['os_family'] == "RedHat"
+    - not (ansible_facts['distribution'] == "Amazon" and ansible_facts['distribution_major_version'] is version('2023', '=='))
     - ('opentracing' in nginx_modules)
     - nginx_install_epel_release | bool
   block:
@@ -60,10 +61,11 @@
       or not (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', '>=')))
+      or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution'] != 'Amazon' and ansible_facts['distribution_major_version'] is version('8', '>='))
+      or (ansible_facts['distribution'] == 'Amazon' and ansible_facts['distribution_major_version'] is version('2023', '==')))
     - not (item['name'] | default(item) == 'geoip2')
       or not ((ansible_facts['os_family'] == 'Suse')
-      or (ansible_facts['distribution'] == 'Amazon'))
+      or (ansible_facts['distribution'] == 'Amazon' and ansible_facts['distribution_major_version'] is version('2', '==')))
     - not (item['name'] | default(item) == 'lua')
       or not (ansible_facts['architecture'] == 's390x')
     - not (item['name'] | default(item) == 'opentracing')
diff --git a/tasks/opensource/install-distribution.yml b/tasks/opensource/install-distribution.yml
@@ -35,7 +35,9 @@
   ansible.builtin.command:
     cmd: amazon-linux-extras enable nginx1
     creates: /usr/sbin/nginx
-  when: ansible_facts['distribution'] == 'Amazon'
+  when:
+    - ansible_facts['distribution'] == 'Amazon'
+    - ansible_facts['distribution_major_version'] is version('2', '==')
 
 - name: "{{ nginx_setup | capitalize }} NGINX from the distribution's package repository"
   ansible.builtin.package:
diff --git a/tasks/opensource/install-redhat.yml b/tasks/opensource/install-redhat.yml
@@ -8,6 +8,7 @@
     gpgcheck: true
     mode: "0644"
     module_hotfixes: true
+    priority: 9
     state: "{{ (nginx_state == 'uninstall') | ternary('absent', 'present') }}"
   when: nginx_manage_repo | bool
 
diff --git a/vars/main.yml b/vars/main.yml
@@ -31,7 +31,7 @@ nginx_supported_distributions:
     architectures: [x86_64, aarch64]
   amazon:
     name: Amazon Linux
-    versions: [2]
+    versions: [2, 2023]
     architectures: [x86_64, aarch64]
   centos:
     name: CentOS
@@ -75,7 +75,7 @@ nginx_plus_supported_distributions:
     architectures: [x86_64, aarch64]
   amazon:
     name: Amazon Linux
-    versions: [2]
+    versions: [2, 2023]
     architectures: [x86_64, aarch64]
   centos:
     name: CentOS
@@ -116,7 +116,7 @@ nginx_default_signing_key_rsa_pub: https://nginx.org/keys/nginx_signing.rsa.pub
 
 # Default NGINX Open Source repositories
 nginx_default_repository_alpine: "@nginx https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') }}/main"
-nginx_default_repository_amazon: https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}/amzn2/$releasever/$basearch
+nginx_default_repository_amazon: https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}/amzn{{ (ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('2/$releasever', '/2023') }}/$basearch
 nginx_default_repository_debian:
   - deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx
   - deb-src [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx
@@ -125,7 +125,7 @@ nginx_default_repository_suse: https://nginx.org/packages/{{ (nginx_branch == 'm
 
 # Default NGINX Plus repositories
 nginx_plus_default_repository_alpine: https://pkgs.nginx.com/plus/alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\.[0-9]+') }}/main
-nginx_plus_default_repository_amazon: https://pkgs.nginx.com/plus/amzn{{ (ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('2', '') }}/$releasever/$basearch
+nginx_plus_default_repository_amazon: https://pkgs.nginx.com/plus/amzn{{ (ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('2/$releasever', '/2023') }}/$basearch
 nginx_plus_default_repository_debian: deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} nginx-plus
 nginx_plus_default_repository_freebsd: https://pkgs.nginx.com/plus/freebsd/${ABI}/latest
 nginx_plus_default_repository_redhat: https://pkgs.nginx.com/plus/{{ (ansible_facts['distribution'] == 'CentOS') | ternary('centos', 'rhel') }}/{{ (ansible_facts['distribution_version'] is version('7.4', '>=') and ansible_facts['distribution_version'] is version('8', '<')) | ternary('7.4', ansible_facts['distribution_major_version']) }}/$basearch
