From 886fe24fb85a2a888fd087b30c52503cd944015d Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:25:46 +0200 Subject: [PATCH 1/2] Update cloud OS images --- .../requirements/aarch64/redhat/packages.yml | 2 +- cli/src/helpers/naming_helpers.py | 6 +++--- docs/changelogs/CHANGELOG-2.0.md | 9 +++++++++ docs/home/ARM.md | 8 ++++---- docs/home/howto/OS_PATCHING.md | 6 +++--- .../defaults/infrastructure/cloud-os-image-defaults.yml | 8 ++++---- schema/aws/defaults/infrastructure/virtual-machine.yml | 2 +- .../defaults/infrastructure/cloud-os-image-defaults.yml | 2 +- schema/azure/defaults/infrastructure/virtual-machine.yml | 2 +- schema/common/defaults/configuration/postgresql.yml | 2 +- 10 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml index a5a30878af..d3f9e2f6d3 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml +++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml @@ -75,7 +75,7 @@ packages: - 'perl-Pod-Perldoc' # for vim - 'perl-Pod-Simple' # for vim - 'perl-Pod-Usage' # for vim - - 'pgaudit15_13-1.5.0' + # - 'pgaudit15_13-1.5.0' # Removed from aarch64 installations. More info: https://github.com/hitachienergy/epiphany/issues/3302 - 'pkgconf' # for bash-completion - 'pkgconf-pkg-config' # for bash-completion - 'policycoreutils' diff --git a/cli/src/helpers/naming_helpers.py b/cli/src/helpers/naming_helpers.py index 7f923f8dae..7a35d6316d 100644 --- a/cli/src/helpers/naming_helpers.py +++ b/cli/src/helpers/naming_helpers.py @@ -70,9 +70,9 @@ def get_os_name_normalized(vm_doc): return expected_indicators[indicator] if vm_doc.provider == "aws": # Example public/official AMI names: - # - ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221010 - # - RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2 - # - AlmaLinux OS 8.4.20211015 x86_64 + # - ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231004 + # - RHEL-8.4.0_HVM-20230419-x86_64-41-Hourly2-GP2 + # - AlmaLinux OS 8.6.20220901 x86_64 for indicator in expected_indicators: if indicator in vm_doc.specification.os_full_name.lower(): return expected_indicators[indicator] diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md index 8f13d36403..6200d57ed4 100644 --- a/docs/changelogs/CHANGELOG-2.0.md +++ b/docs/changelogs/CHANGELOG-2.0.md @@ -1,8 +1,17 @@ # Changelog 2.0 +## [2.0.9] 2023-10-XX + +### Updated + +- [#3302](https://github.com/hitachienergy/epiphany/issues/3302) - AlmaLinux OS 8.4 AMIs no longer available +- [#3399](https://github.com/hitachienergy/epiphany/issues/3399) - Update cloud OS images to the latest + ## [2.0.8] 2023-08-24 +### Updated + - [#3177](https://github.com/hitachienergy/epiphany/issues/3177) - Upgrade AzureCLI to 2.37+ to support Microsoft Graph migration - [#3383](https://github.com/hitachienergy/epiphany/issues/3383) - Update Python dependencies to include the latest patch versions diff --git a/docs/home/ARM.md b/docs/home/ARM.md index 1bf3a20f6a..4d94ed6c28 100644 --- a/docs/home/ARM.md +++ b/docs/home/ARM.md @@ -186,7 +186,7 @@ provider: any specification: extensions: pgaudit: - enabled: yes + enabled: false title: Postgresql --- kind: configuration/rabbitmq @@ -238,7 +238,7 @@ specification: ### ```AWS``` provider - Important is to specify the correct ```arm64``` machine type for component which can be found [here](https://aws.amazon.com/ec2/instance-types/a1/). -- Important is to specify the correct ```arm64``` OS image which currently is only ```AlmaLinux OS 8.4.20211015 aarch64``` or newer. +- Important is to specify the correct ```arm64``` OS image which currently is only ```AlmaLinux OS 8.6.20220901 aarch64``` or newer. ```yaml --- @@ -315,7 +315,7 @@ title: "Virtual Machine Infra" provider: aws name: default specification: - os_full_name: AlmaLinux OS 8.4.20211015 aarch64 + os_full_name: AlmaLinux OS 8.6.20220901 aarch64 --- kind: infrastructure/virtual-machine name: kafka-machine-arm @@ -393,7 +393,7 @@ provider: aws specification: extensions: pgaudit: - enabled: yes + enabled: false pgbouncer: enabled: no replication: diff --git a/docs/home/howto/OS_PATCHING.md b/docs/home/howto/OS_PATCHING.md index cbfc788742..a8973791e3 100644 --- a/docs/home/howto/OS_PATCHING.md +++ b/docs/home/howto/OS_PATCHING.md @@ -28,8 +28,8 @@ This document will help you decide how you should patch your OS. This is not a s For Epiphany >= v2.0 we recommend the following image (AMI): -- RHEL: `RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2` (kernel 4.18.0-305.12.1.el8_4.x86_64), -- Ubuntu: `ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221010` (kernel 5.15.0-1021-aws). +- RHEL: `RHEL-8.4.0_HVM-20230419-x86_64-41-Hourly2-GP2` (kernel 4.18.0-305.12.1.el8_4.x86_64), +- Ubuntu: `ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231004` (kernel 5.15.0-1021-aws). Note: For different supported OS versions this guide may be useful as well. @@ -57,7 +57,7 @@ For more information, refer to [AWS Systems Manager User Guide](https://docs.aws For Epiphany >= v2.0 we recommend the following image (urn): - RHEL: `RedHat:rhel-raw:8-raw-gen2:8.4.2022031606` (kernel 4.18.0-305.el8.x86_64), -- Ubuntu: `Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202210100` (kernel 5.15.0-1021-azure). +- Ubuntu: `Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202308310` (kernel 5.15.0-1021-azure). Note: For different supported OS versions this guide may be useful as well. diff --git a/schema/aws/defaults/infrastructure/cloud-os-image-defaults.yml b/schema/aws/defaults/infrastructure/cloud-os-image-defaults.yml index 7eb61ce26b..055087a1bb 100644 --- a/schema/aws/defaults/infrastructure/cloud-os-image-defaults.yml +++ b/schema/aws/defaults/infrastructure/cloud-os-image-defaults.yml @@ -3,7 +3,7 @@ kind: infrastructure/cloud-os-image-defaults title: "Cloud OS Image Defaults" name: default specification: - almalinux-8-arm64: AlmaLinux OS 8.4.20211015 aarch64 - almalinux-8-x86_64: AlmaLinux OS 8.4.20211015 x86_64 - rhel-8-x86_64: RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2 - ubuntu-20.04-x86_64: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221010 + almalinux-8-arm64: AlmaLinux OS 8.6.20220901 aarch64 + almalinux-8-x86_64: AlmaLinux OS 8.6.20220901 x86_64 + rhel-8-x86_64: RHEL-8.4.0_HVM-20230419-x86_64-41-Hourly2-GP2 + ubuntu-20.04-x86_64: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231004 diff --git a/schema/aws/defaults/infrastructure/virtual-machine.yml b/schema/aws/defaults/infrastructure/virtual-machine.yml index 8f320fd1d3..4d1b14cad5 100644 --- a/schema/aws/defaults/infrastructure/virtual-machine.yml +++ b/schema/aws/defaults/infrastructure/virtual-machine.yml @@ -17,7 +17,7 @@ specification: authorized_to_efs: false mount_efs: false size: t2.micro - os_full_name: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20221010 + os_full_name: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231004 os_type: linux ebs_optimized: false disks: diff --git a/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml b/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml index 80be983ff6..941be3549a 100644 --- a/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml +++ b/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml @@ -21,4 +21,4 @@ specification: publisher: Canonical offer: 0001-com-ubuntu-server-focal sku: 20_04-lts-gen2 - version: "20.04.202210100" + version: "20.04.202308310" diff --git a/schema/azure/defaults/infrastructure/virtual-machine.yml b/schema/azure/defaults/infrastructure/virtual-machine.yml index eef7f95a94..2f21d40de9 100644 --- a/schema/azure/defaults/infrastructure/virtual-machine.yml +++ b/schema/azure/defaults/infrastructure/virtual-machine.yml @@ -21,7 +21,7 @@ specification: publisher: Canonical offer: 0001-com-ubuntu-server-focal sku: 20_04-lts-gen2 - version: "20.04.202210100" # Never put latest on anything! Need to always pin the version number but testing we can get away with it + version: "20.04.202308310" # Never put latest on anything! Need to always pin the version number but testing we can get away with it storage_os_disk: managed: true caching: ReadWrite diff --git a/schema/common/defaults/configuration/postgresql.yml b/schema/common/defaults/configuration/postgresql.yml index 9b1d6a4acf..0e90e8c020 100644 --- a/schema/common/defaults/configuration/postgresql.yml +++ b/schema/common/defaults/configuration/postgresql.yml @@ -72,7 +72,7 @@ specification: when: replication extensions: pgaudit: - enabled: false + enabled: false # DO NOT enable for aarch64 installations. More info: https://github.com/hitachienergy/epiphany/issues/3302 shared_preload_libraries: - pgaudit config_file_parameters: From 6ec114a0e47d4abbe5900f2c1dadce38cc4f55cf Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Thu, 19 Oct 2023 13:54:31 +0200 Subject: [PATCH 2/2] Update kernel info --- docs/home/howto/OS_PATCHING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/home/howto/OS_PATCHING.md b/docs/home/howto/OS_PATCHING.md index a8973791e3..9f5f5700f0 100644 --- a/docs/home/howto/OS_PATCHING.md +++ b/docs/home/howto/OS_PATCHING.md @@ -28,8 +28,8 @@ This document will help you decide how you should patch your OS. This is not a s For Epiphany >= v2.0 we recommend the following image (AMI): -- RHEL: `RHEL-8.4.0_HVM-20230419-x86_64-41-Hourly2-GP2` (kernel 4.18.0-305.12.1.el8_4.x86_64), -- Ubuntu: `ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231004` (kernel 5.15.0-1021-aws). +- RHEL: `RHEL-8.4.0_HVM-20230419-x86_64-41-Hourly2-GP2` (kernel 4.18.0-305.88.1.el8_4.x86_64), +- Ubuntu: `ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231004` (kernel 5.15.0-1047-aws). Note: For different supported OS versions this guide may be useful as well. @@ -57,7 +57,7 @@ For more information, refer to [AWS Systems Manager User Guide](https://docs.aws For Epiphany >= v2.0 we recommend the following image (urn): - RHEL: `RedHat:rhel-raw:8-raw-gen2:8.4.2022031606` (kernel 4.18.0-305.el8.x86_64), -- Ubuntu: `Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202308310` (kernel 5.15.0-1021-azure). +- Ubuntu: `Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202308310` (kernel 5.15.0-1045-azure). Note: For different supported OS versions this guide may be useful as well.