Merge pull request #4451 from Yiyuanzzz/v1.89.2-stage

Release 1.89.2
aws · Dec 9, 2024 · 828d235 · 828d235
2 parents e81257d + 41d593c
commit 828d235
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+# 1.89.2
+* Enhancement - Refactors Branch ENI configuration to support all platform types [#4436](https://github.com/aws/amazon-ecs-agent/pull/4436)
+* Enhancement - Update agent version of https://github.com/containerd/cgroups from v3.0.2 to v3.0.4 [#4350](https://github.com/aws/amazon-ecs-agent/pull/4350)
+* Enhancement - Implement credentials chain for aws-sdk-go-v2 [#4424](https://github.com/aws/amazon-ecs-agent/pull/4424)
+* Enhancement - Update amazon-ecs-cni-plugins to 2024.09.0 [#4442](https://github.com/aws/amazon-ecs-agent/pull/4442)
+* Enhancement - Remove typos from annotations in ecs-init/docker/docker.go [#4426](https://github.com/aws/amazon-ecs-agent/pull/4426)
+* Enhancement - Add check if tc is compatible before advertising fault injection capability [#4434](https://github.com/aws/amazon-ecs-agent/pull/4434)
+* Enhancement - Add /etc/pki directory to appnet agent's bind mounts for service connect [#4437](https://github.com/aws/amazon-ecs-agent/pull/4437)
+
 # 1.89.1
 * Changes included from discarded v1.89.0 release
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.89.1
+1.89.2
diff --git 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.89.1"
+const Version = "1.89.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 = "2aa7018c"
+const GitShortHash = "e81257d8"
diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION
@@ -1 +1 @@
-1.89.1
+1.89.2
diff --git a/ecs-init/config/common.go b/ecs-init/config/common.go
@@ -45,7 +45,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.89.1"
+	DefaultAgentVersion = "v1.89.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
@@ -26,7 +26,7 @@
 %global agent_image ecs-agent-v%{version}.tar
 
 Name:           ecs-init
-Version:        1.89.1
+Version:        1.89.2
 Release:        1%{?dist}
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -270,6 +270,9 @@ fi
 %endif
 
 %changelog
+* Mon Dec 09 2024 Yiyuan Zhong <yiyzhong@amazon.com> - 1.89.2-1
+- Cache Agent version 1.89.2
+
 * Tue Nov 19 2024 Harish Senthilkumar <harishxr@amazon.com> - 1.89.1-1
 - Cache Agent version 1.89.1
 

diff --git a/packaging/generic-deb-integrated/debian/changelog b/packaging/generic-deb-integrated/debian/changelog
@@ -1,3 +1,9 @@
+amazon-ecs-init (1.89.2-1) stable; urgency=medium
+
+  * Cache Agent version 1.89.2
+
+ -- Yiyuan Zhong <yiyzhong@amazon.com>  Mon, 09 Dec 2024 18:00:00 +0000
+
 amazon-ecs-init (1.89.1-1) stable; urgency=medium
 
   * Cache Agent version 1.89.1

diff --git 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.89.1
+Version:        1.89.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
+* Mon Dec 09 2024 Yiyuan Zhong <yiyzhong@amazon.com> - 1.89.2-1
+- Cache Agent version 1.89.2
+
 * Tue Nov 19 2024 Harish Senthilkumar <harishxr@amazon.com> - 1.89.1-1
 - Cache Agent version 1.89.1
 

diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes
@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Mon Dec 09, 18:00:00 UTC 2024 - yiyzhong@amazon.com - 1.89.2-1
+
+- Cache Agent version 1.89.2
+-------------------------------------------------------------------
 Tue Nov 19, 18:00:00 UTC 2024 - harishxr@amazon.com - 1.89.1-1
 
 - Cache Agent version 1.89.1

diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER
@@ -1,3 +1,8 @@
+1.89.2-1
+Yiyuan Zhong <yiyzhong@amazon.com>
+2024-12-09T10:00:00-08:00
+Cache Agent version 1.89.2
+
 1.89.1-1
 Harish Senthilkumar <harishxr@amazon.com>
 2024-11-19T10:00:00-08:00