From c35f0b44495321507d18881dd4b1ec1556a3c9fc Mon Sep 17 00:00:00 2001 From: fenxiong <fenxiong@amazon.com> Date: Tue, 22 Sep 2020 12:27:48 -0700 Subject: [PATCH] Update ecs cni plugin submodule to use master branch. --- .gitmodules | 1 - agent/ecscni/plugin.go | 4 ++-- amazon-ecs-cni-plugins | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1f0e2e2894c..f618d7e6c2e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ [submodule "amazon-ecs-cni-plugins"] path = amazon-ecs-cni-plugins url = https://github.com/aws/amazon-ecs-cni-plugins.git - branch = dev [submodule "amazon-vpc-cni-plugins"] path = amazon-vpc-cni-plugins url = https://github.com/aws/amazon-vpc-cni-plugins.git diff --git a/agent/ecscni/plugin.go b/agent/ecscni/plugin.go index 4b462912f62..192cfccaac8 100644 --- a/agent/ecscni/plugin.go +++ b/agent/ecscni/plugin.go @@ -33,8 +33,8 @@ import ( const ( currentCNISpec = "0.3.1" // ECSCNIVersion, ECSCNIGitHash, VPCCNIGitHash needs to be updated every time CNI plugin is updated - currentECSCNIVersion = "2019.10.0" - currentECSCNIGitHash = "6f8520fc1abb596460a8945c806f0dd781f44fad" + currentECSCNIVersion = "2020.09.0" + currentECSCNIGitHash = "55b2ae77ee0bf22321b14f2d4ebbcc04f77322e1" currentVPCCNIGitHash = "a21d3a41f922e14c19387713df66be3e4ee1e1f6" vpcCNIPluginPath = "/log/vpc-branch-eni.log" vpcCNIPluginInterfaceType = "vlan" diff --git a/amazon-ecs-cni-plugins b/amazon-ecs-cni-plugins index 6f8520fc1ab..55b2ae77ee0 160000 --- a/amazon-ecs-cni-plugins +++ b/amazon-ecs-cni-plugins @@ -1 +1 @@ -Subproject commit 6f8520fc1abb596460a8945c806f0dd781f44fad +Subproject commit 55b2ae77ee0bf22321b14f2d4ebbcc04f77322e1