Address required network name field for updated CNI spec

aws · Aug 29, 2022 · c088bac · c088bac
1 parent 4cdd048
commit c088bac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/agent/ecscni/netconfig.go b/agent/ecscni/netconfig.go
@@ -33,6 +33,7 @@ func newNetworkConfig(netcfg interface{}, plugin string, cniVersion string) (*li
 		Network: &cnitypes.NetConf{
 			Type:       plugin,
 			CNIVersion: cniVersion,
+			Name:       defaultNetworkName,
 		},
 		Bytes: configBytes,
 	}

diff --git a/agent/ecscni/types_linux.go b/agent/ecscni/types_linux.go
@@ -41,6 +41,10 @@ const (
 	ECSBranchENIPluginName = "vpc-branch-eni"
 	// NetnsFormat is used to construct the path to cotainer network namespace
 	NetnsFormat = "/host/proc/%s/ns/net"
+	// Starting with CNI plugin v0.8.0 (this PR https://github.com/containernetworking/cni/pull/698)
+	// NetworkName has to be non-empty field for network config.
+	// We do not actually make use of the field, hence passing in a placeholder string to fulfill the API spec
+	defaultNetworkName = "network-name"
 )
 
 //IPAMNetworkConfig is the config format accepted by the plugin

diff --git a/agent/ecscni/types_windows.go b/agent/ecscni/types_windows.go
@@ -31,6 +31,10 @@ const (
 	TaskHNSNetworkNamePrefix = "task"
 	// ECSBridgeNetworkName is the name of the HNS network used as ecs-bridge.
 	ECSBridgeNetworkName = "nat"
+	// Starting with CNI plugin v0.8.0 (this PR https://github.com/containernetworking/cni/pull/698)
+	// NetworkName has to be non-empty field for network config.
+	// We do not actually make use of the field, hence passing in a placeholder string to fulfill the API spec
+	defaultNetworkName = "network-name"
 )
 
 var (