update tc-redirect-tap in Makefile

Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
firecracker-microvm · Nov 20, 2020 · 2fdd111 · 2fdd111
1 parent 775734f
commit 2fdd111
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -235,13 +235,16 @@ FIREWALL_BIN?=$(BINPATH)/firewall
 $(FIREWALL_BIN):
 	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/meta/firewall
 
+TC_REDIRECT_TAP_BIN?=$(BINPATH)/tc-redirect-tap
+$(TC_REDIRECT_TAP_BIN):
+	GOBIN=$(dir $@) go install github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap
 
 TEST_BRIDGED_TAP_BIN?=$(BINPATH)/test-bridged-tap
 $(TEST_BRIDGED_TAP_BIN): $(shell find internal/cmd/test-bridged-tap -name *.go) $(GOMOD) $(GOSUM)
 	go build -o $@ $(CURDIR)/internal/cmd/test-bridged-tap
 
 .PHONY: cni-bins
-cni-bins: $(BRIDGE_BIN) $(PTP_BIN) $(HOSTLOCAL_BIN) $(FIREWALL_BIN)
+cni-bins: $(BRIDGE_BIN) $(PTP_BIN) $(HOSTLOCAL_BIN) $(FIREWALL_BIN) $(TC_REDIRECT_TAP_BIN)
 
 .PHONY: test-cni-bins
 test-cni-bins: $(TEST_BRIDGED_TAP_BIN)
@@ -252,6 +255,7 @@ install-cni-bins: cni-bins $(CNI_BIN_ROOT)
 	install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(PTP_BIN)
 	install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(HOSTLOCAL_BIN)
 	install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(FIREWALL_BIN)
+	install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(TC_REDIRECT_TAP_BIN)
 
 .PHONY: install-test-cni-bins
 install-test-cni-bins: test-cni-bins $(CNI_BIN_ROOT)

diff --git a/runtime/cni_integ_test.go b/runtime/cni_integ_test.go
@@ -422,4 +422,3 @@ func requiredEnv(t *testing.T, key string) string {
 	require.NotEmpty(t, envVal, "%s env is not set", key)
 	return envVal
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -422,4 +422,3 @@ func requiredEnv(t *testing.T, key string) string {
		require.NotEmpty(t, envVal, "%s env is not set", key)
		return envVal
		}