Merge branch 'dev' into golang-x-net-bump

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## 1.82.0
+* Enhancement - Make ecs-init log level configurable [#4097](https://github.com/aws/amazon-ecs-agent/pull/4097).
+* Enhancement - Add ECS_EBSTA_SUPPORTED environment variable to enable/disable EBS Task Attach capabilities. The environment variable is set automatically by ecs-init [#4091](https://github.com/aws/amazon-ecs-agent/pull/4091).
+
 ## 1.81.1
 * Enhancement - Update go version to 1.20.12 [#4092](https://github.com/aws/amazon-ecs-agent/pull/4092)
 * Enhancement - Add extra logs in netlib package [#4095](https://github.com/aws/amazon-ecs-agent/pull/4095)

VERSION

@@ -1 +1 @@
-1.81.1
+1.82.0

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.81.1"
+const Version = "1.82.0"
 
 // 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 = "5a051426"
+const GitShortHash = "209d065e"

ecs-init/ECSVERSION

@@ -1 +1 @@
-1.81.1
+1.82.0

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.81.1"
+	DefaultAgentVersion = "v1.82.0"
 
 	// AgentPartitionBucketName is the name of the paritional s3 bucket that stores the agent
 	AgentPartitionBucketName = "amazon-ecs-agent"

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.81.1
+Version:        1.82.0
 Release:        1%{?dist}
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -269,6 +269,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 28 2024 Amogh Rathore <[email protected]> - 1.82.0-1
+- Cache Agent version 1.82.0
+
 * Tue Feb 20 2024 Yinyi Chen <[email protected]> - 1.81.1-1
 - Cache Agent version 1.81.1
 

packaging/generic-deb-integrated/debian/changelog

@@ -1,3 +1,9 @@
+amazon-ecs-init (1.82.0-1) stable; urgency=medium
+
+  * Cache Agent version 1.82.0
+
+ -- Amogh Rathore <[email protected]>  Wed, 28 Feb 2024 18:00:00 +0000
+
 amazon-ecs-init (1.81.1-1) stable; urgency=medium
 
   * Cache Agent version 1.81.1

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.81.1
+Version:        1.82.0
 Release:        1
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -92,6 +92,9 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar
 %systemd_postun_with_restart amazon-ecs-volume-plugin
 
 %changelog
+* Wed Feb 28 2024 Amogh Rathore <[email protected]> - 1.82.0-1
+- Cache Agent version 1.82.0
+
 * Tue Feb 20 2024 Yinyi Chen <[email protected]> - 1.81.1-1
 - Cache Agent version 1.81.1
 

packaging/suse/amazon-ecs-init.changes

@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Wed Feb 28, 18:00:00 UTC 2024 - [email protected] - 1.82.0-1
+
+- Cache Agent version 1.82.0
+-------------------------------------------------------------------
 Tue Feb 20, 18:00:00 UTC 2024 - [email protected] - 1.81.1-1
 
 - Cache Agent version 1.81.1

scripts/changelog/CHANGELOG_MASTER

@@ -1,3 +1,8 @@
+1.82.0-1
+Amogh Rathore <[email protected]>
+2024-02-28T10:00:00-08:00
+Cache Agent version 1.82.0
+
 1.81.1-1
 Yinyi Chen <[email protected]>
 2024-02-20T10:00:00-08:00