Merge pull request #247 from kzys/remove-cni-plugin

Remove tc-redirect-tap

Author: Kazuyoshi Kato

.buildkite/pipeline.yml

@@ -68,10 +68,22 @@ steps:
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
 
+  - label: ':package: install'
+    commands:
+      # Install tc-redirect-tap.
+      - 'mkdir -p testdata/bin'
+      - 'GOBIN=$(pwd)/testdata/bin go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
+      # Copy vmlinux and root-drive.img.
+      - 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
+      - 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
+    agents:
+      queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
+      distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
+      hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
+
   - label: 'build'
     commands:
       - 'make'
-      - 'make -C cni'
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
       distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -93,7 +105,6 @@ steps:
       - 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
       - 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
       - 'mkdir -p $(pwd)/testdata/bin'
-      - 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
       - "sudo PATH=$PATH FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
@@ -108,12 +119,13 @@ steps:
     commands:
       - 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
       - 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
-      - 'mkdir -p $(pwd)/testdata/bin'
-      - 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
       - 'buildkite-agent artifact download testdata/firecracker-master .'
       - 'chmod +x testdata/firecracker-master'
       - 'buildkite-agent artifact download testdata/jailer-master .'
       - 'chmod +x testdata/jailer-master'
+      # Install tc-redirect-tap.
+      - 'mkdir -p testdata/bin'
+      - 'GOBIN=$(pwd)/testdata/bin go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
       - "sudo -E PATH=$PATH FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"

README.md

@@ -50,9 +50,9 @@ files will be sought from `/etc/cni/conf.d` and CNI plugins will be sought under
 must be specified in a configuration file at this time.
 
 It's currently highly recommended to use CNI configuration that includes
-[tc-redirect-tap](cni/Makefile) as a chained plugin. This will allow you to
-adapt pre-existing CNI plugins/configuration to a tap device usable by a
-Firecracker VM.
+[tc-redirect-tap](https://github.com/awslabs/tc-redirect-tap) as a chained plugin.
+This will allow you to adapt pre-existing CNI plugins/configuration to a tap device
+usable by a Firecracker VM.
 
 #### Example
 
@@ -85,9 +85,8 @@ and the
 [`ptp`](https://github.com/containernetworking/plugins/tree/master/plugins/main/ptp), 
 [`host-local`](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local),
 [`firewall`](https://github.com/containernetworking/plugins/tree/master/plugins/meta/firewall),
-and [`tc-redirect-tap`](cni/Makefile)
-CNI plugin binaries installed under `/opt/cni/bin`, you can specify, in the Go SDK API, 
-a `Machine` with the following `NetworkInterface`:
+and `tc-redirect-tap` CNI plugin binaries installed under `/opt/cni/bin`, you can specify,
+in the Go SDK API, a `Machine` with the following `NetworkInterface`:
 ```go
 {
   NetworkInterfaces: []firecracker.NetworkInterface{{