Merge branch 'dev' into dependabot/go_modules/ecs-agent/daemonimages/…

…csidriver/google.golang.org/grpc-1.58.3
aws · Mar 7, 2024 · 8118d85 · 8118d85
2 parents 1118c27 + 0fc4496
commit 8118d85
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 8 deletions.
diff --git a/CHANGELOG.md b/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)

diff --git a/README.md b/README.md
@@ -258,7 +258,7 @@ additional details on each available environment variable.
 | `CREDENTIALS_FETCHER_SECRET_NAME_FOR_DOMAINLESS_GMSA`   | `secretmanager-secretname` | Used to support scaling option for gMSA on Linux [credentials-fetcher daemon](https://github.com/aws/credentials-fetcher). If user is configuring gMSA on a non-domain joined instance, they need to create an Active Directory user with access to retrieve principals for the gMSA account and store it in secrets manager | `secretmanager-secretname` | Not Applicable |
 | `ECS_DYNAMIC_HOST_PORT_RANGE` | `100-200` | This specifies the dynamic host port range that the agent uses to assign host ports from, for container ports mapping. If there are no available ports in the range for containers, including customer containers and Service Connect Agent containers (if Service Connect is enabled), service deployments would fail. | Defined by `/proc/sys/net/ipv4/ip_local_port_range` | `49152-65535` |
 | `ECS_TASK_PIDS_LIMIT` | `100` | Specifies the per-task pids limit cgroup setting for each task launched on the container instance. This setting maps to the pids.max cgroup setting at the ECS task level. See https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html#pid. If unset, pids will be unlimited. Min value is 1 and max value is 4194304 (4*1024*1024) | `unset` | Not Supported on Windows |
-| `ECS_EBSTA_SUPPORTED` | `true` | Whether to use the container instance with EBS Task Attach support. ecs-init sets this variable for the ECS Agent if the instance can support mounting EBS volumes or not. ECS only schedules EBSTA tasks if this feature is supported by the platform type | `true` | `true` |
+| `ECS_EBSTA_SUPPORTED` | `true` | Whether to use the container instance with EBS Task Attach support. This variable is set properly by ecs-init. Its value indicates if correct environment to support EBS volumes by instance has been set up or not. ECS only schedules EBSTA tasks if this feature is supported by the platform type. Check [EBS Volume considerations](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ebs-volumes.html#ebs-volume-considerations) for other EBS support details | `true` | Not Supported on Windows |
 
 Additionally, the following environment variable(s) can be used to configure the behavior of the ecs-init service. When using ECS-Init, all env variables, including the ECS Agent variables above, are read from path `/etc/ecs/ecs.config`:
 | Environment Variable Name | Example Value(s)            | Description | Default value |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.81.1
+1.82.0
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.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"
diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION
@@ -1 +1 @@
-1.81.1
+1.82.0
diff --git 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.81.1"
+	DefaultAgentVersion = "v1.82.0"
 
 	// 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.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 <amoghr@amazon.com> - 1.82.0-1
+- Cache Agent version 1.82.0
+
 * Tue Feb 20 2024 Yinyi Chen <yinyic@amazon.com> - 1.81.1-1
 - Cache Agent version 1.81.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.82.0-1) stable; urgency=medium
+
+  * Cache Agent version 1.82.0
+
+ -- Amogh Rathore <amoghr@amazon.com>  Wed, 28 Feb 2024 18:00:00 +0000
+
 amazon-ecs-init (1.81.1-1) stable; urgency=medium
 
   * Cache Agent version 1.81.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.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 <amoghr@amazon.com> - 1.82.0-1
+- Cache Agent version 1.82.0
+
 * Tue Feb 20 2024 Yinyi Chen <yinyic@amazon.com> - 1.81.1-1
 - Cache Agent version 1.81.1
 

diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes
@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Wed Feb 28, 18:00:00 UTC 2024 - amoghr@amazon.com - 1.82.0-1
+
+- Cache Agent version 1.82.0
+-------------------------------------------------------------------
 Tue Feb 20, 18:00:00 UTC 2024 - yinyic@amazon.com - 1.81.1-1
 
 - Cache Agent version 1.81.1

diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER
@@ -1,3 +1,8 @@
+1.82.0-1
+Amogh Rathore <amoghr@amazon.com>
+2024-02-28T10:00:00-08:00
+Cache Agent version 1.82.0
+
 1.81.1-1
 Yinyi Chen <yinyic@amazon.com>
 2024-02-20T10:00:00-08:00