Merge pull request #4024 from chienhanlin/v1.79.1-stage

Release 1.79.1
aws · Nov 13, 2023 · ec583b6 · ec583b6
2 parents 3226e06 + 403b4ce
commit ec583b6
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.79.1
+* Enhancement - Update golang.org/x/net to v0.17.0 [#3964](https://github.com/aws/amazon-ecs-agent/pull/3964)
+* Enhancement - Update google.golang.org/grpc to 1.56.3 [#3991](https://github.com/aws/amazon-ecs-agent/pull/3991)
+* Enhancement - Implement regular ENI and branch ENI configuration for the containerd platform [#3972](https://github.com/aws/amazon-ecs-agent/pull/3972)
+* Enhancement - Decouple ENI in ecs-agent/ AttachmentStateChange [#4019](https://github.com/aws/amazon-ecs-agent/pull/4019)
+* Bugfix - Bugfix to log EBS CSI to a file [#4010](https://github.com/aws/amazon-ecs-agent/pull/4010)
+
 ## 1.79.0
 * Feature - Add support for finding EBS devices on Xen instances [#3971](https://github.com/aws/amazon-ecs-agent/pull/3971)
 * Feature - Add network builder and platform APIs [#3939](https://github.com/aws/amazon-ecs-agent/pull/3939)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.79.0
+1.79.1
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.79.0"
+const Version = "1.79.1"
 
 // 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 = "9bc4f08a"
+const GitShortHash = "3226e065"
diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION
@@ -1 +1 @@
-1.79.0
+1.79.1
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.79.0"
+	DefaultAgentVersion = "v1.79.1"
 
 	// 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.79.0
+Version:        1.79.1
 Release:        1%{?dist}
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -269,6 +269,9 @@ fi
 %endif
 
 %changelog
+* Mon Nov 13 2023 Chien-Han Lin <[email protected]> - 1.79.1-1
+- Cache Agent version 1.79.1
+
 * Tue Oct 31 2023 Saisree Valluri <[email protected]> - 1.79.0-1
 - Cache Agent version 1.79.0
 

diff --git a/packaging/generic-deb-integrated/debian/changelog b/packaging/generic-deb-integrated/debian/changelog
@@ -1,3 +1,9 @@
+amazon-ecs-init (1.79.1-1) stable; urgency=medium
+
+  * Cache Agent version 1.79.1
+
+ -- Chien-Han Lin <[email protected]>  Mon, 13 Nov 2023 18:00:00 +0000
+
 amazon-ecs-init (1.79.0-1) stable; urgency=medium
 
   * Cache Agent version 1.79.0

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.79.0
+Version:        1.79.1
 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
+* Mon Nov 13 2023 Chien-Han Lin <[email protected]> - 1.79.1-1
+- Cache Agent version 1.79.1
+
 * Tue Oct 31 2023 Saisree Valluri <[email protected]> - 1.79.0-1
 - Cache Agent version 1.79.0
 

diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes
@@ -1,4 +1,8 @@
 -------------------------------------------------------------------
+Mon Nov 13, 18:00:00 UTC 2023 - [email protected] - 1.79.1-1
+
+- Cache Agent version 1.79.1
+-------------------------------------------------------------------
 Tue Oct 31, 18:00:00 UTC 2023 - [email protected] - 1.79.0-1
 
 - Cache Agent version 1.79.0

diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER
@@ -1,3 +1,8 @@
+1.79.1-1
+Chien-Han Lin <[email protected]>
+2023-11-13T10:00:00-08:00
+Cache Agent version 1.79.1
+
 1.79.0-1
 Saisree Valluri <[email protected]>
 2023-10-31T10:00:00-08:00