Skip to content

Commit 2fdd111

Browse files
committed
update tc-redirect-tap in Makefile
Signed-off-by: Plamen Petrov <[email protected]>
1 parent 775734f commit 2fdd111

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Diff for: Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,16 @@ FIREWALL_BIN?=$(BINPATH)/firewall
235235
$(FIREWALL_BIN):
236236
GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/meta/firewall
237237

238+
TC_REDIRECT_TAP_BIN?=$(BINPATH)/tc-redirect-tap
239+
$(TC_REDIRECT_TAP_BIN):
240+
GOBIN=$(dir $@) go install github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap
238241

239242
TEST_BRIDGED_TAP_BIN?=$(BINPATH)/test-bridged-tap
240243
$(TEST_BRIDGED_TAP_BIN): $(shell find internal/cmd/test-bridged-tap -name *.go) $(GOMOD) $(GOSUM)
241244
go build -o $@ $(CURDIR)/internal/cmd/test-bridged-tap
242245

243246
.PHONY: cni-bins
244-
cni-bins: $(BRIDGE_BIN) $(PTP_BIN) $(HOSTLOCAL_BIN) $(FIREWALL_BIN)
247+
cni-bins: $(BRIDGE_BIN) $(PTP_BIN) $(HOSTLOCAL_BIN) $(FIREWALL_BIN) $(TC_REDIRECT_TAP_BIN)
245248

246249
.PHONY: test-cni-bins
247250
test-cni-bins: $(TEST_BRIDGED_TAP_BIN)
@@ -252,6 +255,7 @@ install-cni-bins: cni-bins $(CNI_BIN_ROOT)
252255
install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(PTP_BIN)
253256
install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(HOSTLOCAL_BIN)
254257
install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(FIREWALL_BIN)
258+
install -D -o root -g root -m755 -t $(CNI_BIN_ROOT) $(TC_REDIRECT_TAP_BIN)
255259

256260
.PHONY: install-test-cni-bins
257261
install-test-cni-bins: test-cni-bins $(CNI_BIN_ROOT)

Diff for: runtime/cni_integ_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -422,4 +422,3 @@ func requiredEnv(t *testing.T, key string) string {
422422
require.NotEmpty(t, envVal, "%s env is not set", key)
423423
return envVal
424424
}
425-

0 commit comments

Comments
 (0)