From 217e002127afcbb5ebed9f295ca3d81ded8866b7 Mon Sep 17 00:00:00 2001 From: przemyslavic <43173646+przemyslavic@users.noreply.github.com> Date: Wed, 16 Nov 2022 10:13:21 +0100 Subject: [PATCH] Update cloud OS images (#3300) --- CHANGELOG-1.0.md | 6 ++++++ core/src/epicli/cli/helpers/os_images.py | 2 +- .../infrastructure/cloud-os-image-defaults.yml | 8 ++++---- .../aws/defaults/infrastructure/virtual-machine.yml | 2 +- .../infrastructure/cloud-os-image-defaults.yml | 8 ++++---- .../defaults/infrastructure/virtual-machine.yml | 2 +- docs/home/howto/CLUSTER.md | 12 ++++++------ docs/home/howto/OS_PATCHING.md | 12 ++++++------ 8 files changed, 29 insertions(+), 23 deletions(-) diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md index 37bf71309f..d0ed26a42e 100644 --- a/CHANGELOG-1.0.md +++ b/CHANGELOG-1.0.md @@ -1,5 +1,11 @@ # Changelog 1.0 +## [1.0.8] YYYY-MM-DD + +### Fixed + +- [#3296](https://github.com/epiphany-platform/epiphany/issues/3299) - CentOS 7.9.2009 AMI no longer available + ## [1.0.7] 2022-11-07 ### Fixed diff --git a/core/src/epicli/cli/helpers/os_images.py b/core/src/epicli/cli/helpers/os_images.py index ca4e7319e8..15a9ac61ed 100644 --- a/core/src/epicli/cli/helpers/os_images.py +++ b/core/src/epicli/cli/helpers/os_images.py @@ -15,7 +15,7 @@ def get_os_distro_normalized(vm_doc): return expected_indicators[indicator] if vm_doc.provider == "aws": # Example public/official AMI names: - # - ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20210323 + # - ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20221018 # - RHEL-7.8_HVM_GA-20200225-x86_64-1-Hourly2-GP2 # - CentOS 7.8.2003 x86_64 for indicator in expected_indicators: diff --git a/core/src/epicli/data/aws/defaults/infrastructure/cloud-os-image-defaults.yml b/core/src/epicli/data/aws/defaults/infrastructure/cloud-os-image-defaults.yml index 213b2111b0..b5454c2cc5 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/cloud-os-image-defaults.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/cloud-os-image-defaults.yml @@ -2,7 +2,7 @@ kind: infrastructure/cloud-os-image-defaults title: "Cloud OS Image Defaults" name: default specification: - ubuntu-18.04-x86_64: ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20210323 - redhat-7-x86_64: RHEL-7.9_HVM-20210208-x86_64-0-Hourly2-GP2 - centos-7-x86_64: CentOS 7.9.2009 x86_64 - centos-7-arm64: CentOS 7.9.2009 aarch64 + ubuntu-18.04-x86_64: ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20221018 + redhat-7-x86_64: RHEL-7.9_HVM-20221027-x86_64-0-Hourly2-GP2 + centos-7-x86_64: CentOS Linux 7 x86_64 - 2211 + centos-7-arm64: CentOS Linux 7 aarch64 - 2211 diff --git a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml index 0bd7d9797f..41392ccb98 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml @@ -14,7 +14,7 @@ specification: tags: - version: 0.4.2 size: t2.micro - os_full_name: "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20210323" + os_full_name: "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20221018" os_type: linux ebs_optimized: false disks: diff --git a/core/src/epicli/data/azure/defaults/infrastructure/cloud-os-image-defaults.yml b/core/src/epicli/data/azure/defaults/infrastructure/cloud-os-image-defaults.yml index 432f1affca..e5bf24ab61 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/cloud-os-image-defaults.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/cloud-os-image-defaults.yml @@ -6,14 +6,14 @@ specification: publisher: Canonical offer: UbuntuServer sku: 18.04-LTS - version: "18.04.202103151" + version: "18.04.202210180" redhat-7-x86_64: - publisher: RedHat + publisher: RedHat offer: RHEL sku: 7-LVM - version: "7.9.2020111202" + version: "7.9.2022032203" centos-7-x86_64: publisher: OpenLogic offer: CentOS sku: "7_9" - version: "7.9.2021020400" + version: "7.9.2022101800" diff --git a/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml index d3081dc671..fd8181cc0e 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml @@ -18,7 +18,7 @@ specification: publisher: Canonical offer: UbuntuServer sku: 18.04-LTS - version: "18.04.202103151" # Never put latest on anything! Need to always pin the version number but testing we can get away with it + version: "18.04.202210180" # Never put latest on anything! Need to always pin the version number but testing we can get away with it storage_os_disk: managed: false caching: ReadWrite diff --git a/docs/home/howto/CLUSTER.md b/docs/home/howto/CLUSTER.md index 5b5af08909..26e0393361 100644 --- a/docs/home/howto/CLUSTER.md +++ b/docs/home/howto/CLUSTER.md @@ -27,7 +27,7 @@ Enable for RHEL on Azure: publisher: RedHat offer: RHEL sku: 7-LVM - version: "7.9.2020111202" + version: "7.9.2022032203" ``` Enable for RHEL on AWS: @@ -46,7 +46,7 @@ Enable for RHEL on AWS: provider: aws based_on: repository-machine specification: - os_full_name: RHEL-7.9_HVM-20210208-x86_64-0-Hourly2-GP2 + os_full_name: RHEL-7.9_HVM-20221027-x86_64-0-Hourly2-GP2 ``` Enable for CentOS on Azure: @@ -68,7 +68,7 @@ Enable for CentOS on Azure: publisher: OpenLogic offer: CentOS sku: "7_9" - version: "7.9.2021020400" + version: "7.9.2022101800" ``` Enable for CentOS on AWS: @@ -87,7 +87,7 @@ Enable for CentOS on AWS: provider: aws based_on: repository-machine specification: - os_full_name: "CentOS 7.9.2009 x86_64" + os_full_name: "CentOS Linux 7 x86_64 - 2211" ``` Disable: @@ -525,7 +525,7 @@ specification: publisher: RedHat offer: RHEL sku: "7-LVM" - version: "7.9.2020111202" + version: "7.9.2022032203" storage_os_disk: disk_size_gb: 64 ``` @@ -543,7 +543,7 @@ specification: publisher: OpenLogic offer: CentOS sku: "7_9" - version: "7.9.2021020400" + version: "7.9.2022101800" ``` ### How to disable merging LVM logical volumes diff --git a/docs/home/howto/OS_PATCHING.md b/docs/home/howto/OS_PATCHING.md index cea89d456d..4b9563ae73 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 v1.0 we recommend the following image (AMI): -- RHEL: `RHEL-7.9_HVM-20210208-x86_64-0-Hourly2-GP2` (kernel 3.10.0-1160.15.2.el7.x86_64), -- Ubuntu: `ubuntu-bionic-18.04-amd64-server-20210323` (kernel 5.4.0-1041-aws). +- RHEL: `RHEL-7.9_HVM-20221027-x86_64-0-Hourly2-GP2` (kernel 3.10.0-1160.80.1.el7.x86_64), +- Ubuntu: `ubuntu-bionic-18.04-amd64-server-20221018` (kernel 5.4.0-1088-aws). Note: For different supported OS versions this guide may be useful as well. @@ -54,16 +54,16 @@ For more information, refer to [AWS Systems Manager User Guide](https://docs.aws ### Suggested OS images -For Epiphany v1.0 we recommend the following image (urn): +For Epiphany v1.0 we recommend the following image (urn): -- RHEL: `RHEL:7-LVM:7.9.2020111202` (kernel 3.10.0-1160.el7.x86_64), -- Ubuntu: `UbuntuServer:18.04-LTS:18.04.202103151` (kernel 5.4.0-1041-azure). +- RHEL: `RHEL:7-LVM:7.9.2022032203` (kernel 3.10.0-1160.59.1.el7.x86_64), +- Ubuntu: `UbuntuServer:18.04-LTS:18.04.202210180` (kernel 5.4.0-1094-azure). Note: For different supported OS versions this guide may be useful as well. ### Patching methods -Azure has `Update Management` solution in `Azure Automation`. It gives you visibility into update compliance across Azure and other clouds, and on-premises. The feature allows you to create scheduled deployments that orchestrate the installation of updates within a defined maintenance window. +Azure has `Update Management` solution in `Azure Automation`. It gives you visibility into update compliance across Azure and other clouds, and on-premises. The feature allows you to create scheduled deployments that orchestrate the installation of updates within a defined maintenance window. To manage updates that way please refer to [official documentation](https://docs.microsoft.com/en-us/azure/automation/update-management/update-mgmt-manage-updates-for-vm). ## Patching with OS specific package manager