Skip to content

Commit 52c3a0d

Browse files
committed
Remove tc-redirect-tap
While it doesn't reduce the SDK's dependencies, tc-redirect-tap is now hosted on https://github.com/awslabs/tc-redirect-tap. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
1 parent d93b040 commit 52c3a0d

File tree

6 files changed

+21
-872
lines changed

6 files changed

+21
-872
lines changed

.buildkite/pipeline.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,22 @@ steps:
6868
agents:
6969
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
7070

71+
- label: ':package: install'
72+
commands:
73+
# Install tc-redirect-tap.
74+
- 'mkdir -p testdata/bin'
75+
- 'GOBIN=$(pwd)/testdata/bin go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
76+
# Copy vmlinux and root-drive.img.
77+
- 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
78+
- 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
79+
agents:
80+
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
81+
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
82+
hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
83+
7184
- label: 'build'
7285
commands:
7386
- 'make'
74-
- 'make -C cni'
7587
agents:
7688
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
7789
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -95,7 +107,6 @@ steps:
95107
- 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
96108
- 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
97109
- 'mkdir -p $(pwd)/testdata/bin'
98-
- 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
99110
- "sudo PATH=$PATH FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
100111
agents:
101112
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
@@ -112,12 +123,13 @@ steps:
112123
commands:
113124
- 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
114125
- 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
115-
- 'mkdir -p $(pwd)/testdata/bin'
116-
- 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
117126
- 'buildkite-agent artifact download testdata/firecracker-master .'
118127
- 'chmod +x testdata/firecracker-master'
119128
- 'buildkite-agent artifact download testdata/jailer-master .'
120129
- 'chmod +x testdata/jailer-master'
130+
# Install tc-redirect-tap.
131+
- 'mkdir -p testdata/bin'
132+
- 'GOBIN=$(pwd)/testdata/bin go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
121133
- "sudo -E PATH=$PATH FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
122134
agents:
123135
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ files will be sought from `/etc/cni/conf.d` and CNI plugins will be sought under
5050
must be specified in a configuration file at this time.
5151

5252
It's currently highly recommended to use CNI configuration that includes
53-
[tc-redirect-tap](cni/Makefile) as a chained plugin. This will allow you to
54-
adapt pre-existing CNI plugins/configuration to a tap device usable by a
55-
Firecracker VM.
53+
[tc-redirect-tap](https://github.com/awslabs/tc-redirect-tap) as a chained plugin.
54+
This will allow you to adapt pre-existing CNI plugins/configuration to a tap device
55+
usable by a Firecracker VM.
5656

5757
#### Example
5858

@@ -85,9 +85,8 @@ and the
8585
[`ptp`](https://github.com/containernetworking/plugins/tree/master/plugins/main/ptp),
8686
[`host-local`](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local),
8787
[`firewall`](https://github.com/containernetworking/plugins/tree/master/plugins/meta/firewall),
88-
and [`tc-redirect-tap`](cni/Makefile)
89-
CNI plugin binaries installed under `/opt/cni/bin`, you can specify, in the Go SDK API,
90-
a `Machine` with the following `NetworkInterface`:
88+
and `tc-redirect-tap` CNI plugin binaries installed under `/opt/cni/bin`, you can specify,
89+
in the Go SDK API, a `Machine` with the following `NetworkInterface`:
9190
```go
9291
{
9392
NetworkInterfaces: []firecracker.NetworkInterface{{

cni/Makefile

Lines changed: 0 additions & 41 deletions
This file was deleted.

cni/cmd/tc-redirect-tap/args/args.go

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)