From 5ec2bf4f3627303803ff39e6ef4b0204e9e18731 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Wed, 25 Oct 2023 15:20:06 -0800 Subject: [PATCH] use Amazon Linux 2023 AMI in non-EDC environments --- .github/workflows/deploy-enterprise-test.yml | 2 +- .github/workflows/deploy-enterprise.yml | 24 ++++++++++---------- CHANGELOG.md | 4 ++++ apps/main-cf.yml.j2 | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml index 55f4974ee..8a9769b0c 100644 --- a/.github/workflows/deploy-enterprise-test.yml +++ b/.github/workflows/deploy-enterprise-test.yml @@ -36,7 +36,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' environment: diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index a4d55772b..1c15fb68d 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -29,7 +29,7 @@ jobs: expanded_max_vcpus: 10000 required_surplus: 0 security_environment: JPL-public - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-a19-jpl @@ -44,7 +44,7 @@ jobs: expanded_max_vcpus: 10000 required_surplus: 0 security_environment: JPL-public - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-tibet-jpl @@ -59,7 +59,7 @@ jobs: expanded_max_vcpus: 0 required_surplus: 0 security_environment: JPL-public - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-nisar-jpl @@ -74,7 +74,7 @@ jobs: expanded_max_vcpus: 1600 required_surplus: 0 security_environment: JPL-public - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-avo @@ -89,7 +89,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-watermap @@ -104,7 +104,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-streamflow @@ -119,7 +119,7 @@ jobs: expanded_max_vcpus: 1600 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: azdwr-hyp3 @@ -134,7 +134,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-cargill @@ -149,7 +149,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-bgc-engineering @@ -164,7 +164,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-carter @@ -179,7 +179,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' - environment: hyp3-pdc @@ -196,7 +196,7 @@ jobs: expanded_max_vcpus: 640 required_surplus: 0 security_environment: ASF - ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id distribution_url: '' environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5be11bea5..0c5b74b3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.2.2] +### Changed +- Use Amazon Linux 2023 AMI in non-Earthdata Cloud environments + ## [4.2.1] ### Changed - The `ami_id` for EDC platforms now uses the original AMI. diff --git a/apps/main-cf.yml.j2 b/apps/main-cf.yml.j2 index e23f47cf9..260c5390e 100644 --- a/apps/main-cf.yml.j2 +++ b/apps/main-cf.yml.j2 @@ -46,7 +46,7 @@ Parameters: AmiId: Type: AWS::SSM::Parameter::Value - Default: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id + Default: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id DefaultMaxvCpus: Description: Default maximum size for the AWS Batch compute environment