Add bandwidth plugin

.dockerignore

@@ -4,4 +4,5 @@ cni-metrics-helper
 grpc-health-probe
 portmap
 loopback
+bandwidth
 routed-eni-cni-plugin

Makefile

@@ -74,9 +74,9 @@ ALLPKGS = $(shell go list ./...)
 # BINS is the set of built command executables.
 BINS = aws-k8s-agent aws-cni grpc-health-probe cni-metrics-helper
 # Plugin binaries
-# Not copied: bandwidth bridge dhcp firewall flannel host-device host-local ipvlan macvlan ptp sbr static tuning vlan
+# Not copied: bridge dhcp firewall flannel host-device host-local ipvlan macvlan ptp sbr static tuning vlan
 # For gnu tar, the full path in the tar file is required
-PLUGIN_BINS = ./loopback ./portmap
+PLUGIN_BINS = ./loopback ./portmap ./bandwidth
 
 # DOCKER_ARGS is extra arguments passed during container image build.
 DOCKER_ARGS =

cmd/routed-eni-cni-plugin/cni.go

@@ -225,10 +225,8 @@ func add(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap
 	}
 
 	result := &current.Result{
-		IPs: ips,
-		Interfaces: []*current.Interface{
-			&current.Interface{Name: hostVethName},
-		},
+		IPs:        ips,
+		Interfaces: []*current.Interface{{Name: hostVethName}},
 	}
 
 	return cniTypes.PrintResult(result, conf.CNIVersion)

scripts/dockerfiles/Dockerfile.init

@@ -24,6 +24,7 @@ WORKDIR /init
 COPY --from=builder \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/loopback \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/portmap \
+    /go/src/github.com/aws/amazon-vpc-cni-k8s/bandwidth \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni-support.sh \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/scripts/init.sh /init/
 

scripts/dockerfiles/Dockerfile.release

@@ -28,7 +28,9 @@ WORKDIR /app
 
 COPY --from=builder /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/misc/10-aws.conflist \
+    /go/src/github.com/aws/amazon-vpc-cni-k8s/loopback \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/portmap \
+    /go/src/github.com/aws/amazon-vpc-cni-k8s/bandwidth \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni-support.sh \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-k8s-agent  \
     /go/src/github.com/aws/amazon-vpc-cni-k8s/grpc-health-probe \

scripts/entrypoint.sh

@@ -62,7 +62,7 @@ wait_for_ipam() {
 if [[ "$AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER" != "false" ]]; then
     # Copy files
     echo "Copying CNI plugin binaries ... "
-    PLUGIN_BINS="portmap aws-cni-support.sh"
+    PLUGIN_BINS="loopback portmap bandwidth aws-cni-support.sh"
     for b in $PLUGIN_BINS; do
         # If the file exist, delete it first
         if [[ -f "$HOST_CNI_BIN_PATH/$b" ]]; then

scripts/init.sh

@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-PLUGIN_BINS="loopback portmap aws-cni-support.sh"
+PLUGIN_BINS="loopback portmap bandwidth aws-cni-support.sh"
 
 for b in $PLUGIN_BINS; do
     if [ ! -f "$b" ]; then