From 58298c7aa2a3bc571bd4972d71cdd0544964ab11 Mon Sep 17 00:00:00 2001 From: Anuj Singh Date: Wed, 24 Jul 2024 17:38:35 +0000 Subject: [PATCH] Release 1.85.2 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- agent/version/version.go | 4 ++-- ecs-init/ECSVERSION | 2 +- ecs-init/config/common.go | 2 +- packaging/amazon-linux-ami-integrated/ecs-agent.spec | 5 ++++- packaging/generic-deb-integrated/debian/changelog | 6 ++++++ packaging/generic-rpm-integrated/amazon-ecs-init.spec | 5 ++++- packaging/suse/amazon-ecs-init.changes | 4 ++++ scripts/changelog/CHANGELOG_MASTER | 5 +++++ 10 files changed, 34 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9bbbe4f334..ec4d7d7772c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ # Changelog +# 1.85.2 +Bugfix - Disable Digest Resolution for Manifest V2 Schema 1 [#4249](https://github.com/aws/amazon-ecs-agent/pull/4249) +Bugfix - Fix digest resolution for locally cached images when image reference in the task payload contains docker.io or docker.io/library prefix [#4251](https://github.com/aws/amazon-ecs-agent/pull/4251) +Bugfix - Use FIPS S3 endpoints only when available in region [#4246](https://github.com/aws/amazon-ecs-agent/pull/4246) +Bugfix - Resolving Cloudwatch endpoint in all regions [#4191](https://github.com/aws/amazon-ecs-agent/pull/4191) + # 1.85.1 * Bugfix - UpdateDesiredStatus for task stop verification ACK. [#4240](https://github.com/aws/amazon-ecs-agent/pull/4240) diff --git a/VERSION b/VERSION index 8510ffad036..b5a9d6b2757 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.85.1 +1.85.2 diff --git a/agent/version/version.go b/agent/version/version.go index 5b9caed722f..ec96b163dbf 100644 --- a/agent/version/version.go +++ b/agent/version/version.go @@ -22,10 +22,10 @@ package version // repository. Only the 'Version' const should change in checked-in source code // Version is the version of the Agent -const Version = "1.85.1" +const Version = "1.85.2" // GitDirty indicates the cleanliness of the git repo when this agent was built const GitDirty = true // GitShortHash is the short hash of this agent build -const GitShortHash = "fb239e3e" +const GitShortHash = "f0bbe101" diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION index 8510ffad036..b5a9d6b2757 100644 --- a/ecs-init/ECSVERSION +++ b/ecs-init/ECSVERSION @@ -1 +1 @@ -1.85.1 +1.85.2 diff --git a/ecs-init/config/common.go b/ecs-init/config/common.go index 017348a001a..78b2d96e1f6 100644 --- a/ecs-init/config/common.go +++ b/ecs-init/config/common.go @@ -46,7 +46,7 @@ const ( // DefaultAgentVersion is the version of the agent that will be // fetched if required. This should look like v1.2.3 or an // 8-character sha, as is downloadable from S3. - DefaultAgentVersion = "v1.85.1" + DefaultAgentVersion = "v1.85.2" // AgentPartitionBucketName is the name of the paritional s3 bucket that stores the agent AgentPartitionBucketName = "amazon-ecs-agent" diff --git a/packaging/amazon-linux-ami-integrated/ecs-agent.spec b/packaging/amazon-linux-ami-integrated/ecs-agent.spec index e11d7bd2355..766e6f99102 100644 --- a/packaging/amazon-linux-ami-integrated/ecs-agent.spec +++ b/packaging/amazon-linux-ami-integrated/ecs-agent.spec @@ -26,7 +26,7 @@ %global agent_image ecs-agent-v%{version}.tar Name: ecs-init -Version: 1.85.1 +Version: 1.85.2 Release: 1%{?dist} License: Apache 2.0 Summary: Amazon Elastic Container Service initialization application @@ -270,6 +270,9 @@ fi %endif %changelog +* Wed Jul 24 2024 Anuj Singh - 1.85.2-1 +- Cache Agent version 1.85.2 + * Thu Jul 11 2024 Harish Senthilkumar - 1.85.1-1 - Cache Agent version 1.85.1 diff --git a/packaging/generic-deb-integrated/debian/changelog b/packaging/generic-deb-integrated/debian/changelog index 325b899c2b0..810f0e0747d 100644 --- a/packaging/generic-deb-integrated/debian/changelog +++ b/packaging/generic-deb-integrated/debian/changelog @@ -1,3 +1,9 @@ +amazon-ecs-init (1.85.2-1) stable; urgency=medium + + * Cache Agent version 1.85.2 + + -- Anuj Singh Wed, 24 Jul 2024 18:00:00 +0000 + amazon-ecs-init (1.85.1-1) stable; urgency=medium * Cache Agent version 1.85.1 diff --git a/packaging/generic-rpm-integrated/amazon-ecs-init.spec b/packaging/generic-rpm-integrated/amazon-ecs-init.spec index 1401187a2a9..445b0af81a9 100644 --- a/packaging/generic-rpm-integrated/amazon-ecs-init.spec +++ b/packaging/generic-rpm-integrated/amazon-ecs-init.spec @@ -19,7 +19,7 @@ %global agent_image ecs-agent-v%{version}.tar Name: amazon-ecs-init -Version: 1.85.1 +Version: 1.85.2 Release: 1 License: Apache 2.0 Summary: Amazon Elastic Container Service initialization application @@ -93,6 +93,9 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar %systemd_postun_with_restart amazon-ecs-volume-plugin %changelog +* Wed Jul 24 2024 Anuj Singh - 1.85.2-1 +- Cache Agent version 1.85.2 + * Thu Jul 11 2024 Harish Senthilkumar - 1.85.1-1 - Cache Agent version 1.85.1 diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes index c13b909c24d..cd9520995dc 100644 --- a/packaging/suse/amazon-ecs-init.changes +++ b/packaging/suse/amazon-ecs-init.changes @@ -1,4 +1,8 @@ ------------------------------------------------------------------- +Wed Jul 24, 18:00:00 UTC 2024 - singholt@amazon.com - 1.85.2-1 + +- Cache Agent version 1.85.2 +------------------------------------------------------------------- Thu Jul 11, 18:00:00 UTC 2024 - harishxr@amazon.com - 1.85.1-1 - Cache Agent version 1.85.1 diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER index bc571ffe43b..880d9073e08 100644 --- a/scripts/changelog/CHANGELOG_MASTER +++ b/scripts/changelog/CHANGELOG_MASTER @@ -1,3 +1,8 @@ +1.85.2-1 +Anuj Singh +2024-07-24T10:00:00-08:00 +Cache Agent version 1.85.2 + 1.85.1-1 Harish Senthilkumar 2024-07-11T10:00:00-08:00