Skip to content

Commit

Permalink
cilium-map-migrate: remove program and all of its references
Browse files Browse the repository at this point in the history
This has been replaced with a Go-based implementation, so no longer needs to
be part of the build/packaging process.

The CILIUM_BPF_MNT env has been removed from shell invocations pertaining to
bpffs since it was only referenced in cilium-map-migrate.

Signed-off-by: Timo Beckers <timo@isovalent.com>
  • Loading branch information
ti-mo committed Oct 13, 2021
1 parent 702f86f commit 66cd0e0
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 589 deletions.
1 change: 0 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
/bpf/ @cilium/bpf
Makefile* @cilium/build
/bpf/Makefile* @cilium/build @cilium/loader
/bpf/cilium-map-migrate.c @cilium/loader
/bpf/init.sh @cilium/loader
/bpf/custom/Makefile* @cilium/build @cilium/loader
/bpf/sockops/Makefile* @cilium/build @cilium/loader
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ PRIV_TEST_PKGS_EVAL := $(shell for pkg in $(TESTPKGS); do echo $$pkg; done | xar
PRIV_TEST_PKGS ?= $(PRIV_TEST_PKGS_EVAL)
tests-privileged: GO_TAGS_FLAGS+=privileged_tests ## Run integration-tests for Cilium that requires elevated privileges.
tests-privileged:
# cilium-map-migrate is a dependency of some integration tests.
$(QUIET) $(MAKE) $(SUBMAKEOPTS) -C bpf cilium-map-migrate
$(MAKE) init-coverage
for pkg in $(patsubst %,github.com/cilium/cilium/%,$(PRIV_TEST_PKGS)); do \
PATH=$(PATH):$(ROOT_DIR)/bpf $(GO_TEST) $(TEST_LDFLAGS) $$pkg $(GOTEST_UNIT_BASE) $(GOTEST_COVER_OPTS) \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.defs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ifneq ($(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/.git),)
BPF_SRCFILES := $(shell git ls-files $(ROOT_DIR)/bpf/ | LC_ALL=C sort | tr "\n" ' ')
else
# this line has to be in-sync with bpf/.gitignore, please note usage of make patterns like `%.i`
BPF_SRCFILES_IGNORE += bpf/cilium-map-migrate bpf/cilium-probe-kernel-hz bpf/%.i bpf/%.s bpf/.rebuild_all
BPF_SRCFILES_IGNORE += bpf/cilium-probe-kernel-hz bpf/%.i bpf/%.s bpf/.rebuild_all
BPF_SRCFILES := $(shell find $(ROOT_DIR)/bpf/ -type f | LC_ALL=C sort | tr "\n" ' ')
endif

Expand Down
1 change: 0 additions & 1 deletion bpf/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# when updating this file, make sure to update `BPF_SRCFILES_IGNORE` in `Makefile.defs`
cilium-map-migrate
cilium-probe-kernel-hz
compile_commands.json
*.i
Expand Down
2 changes: 1 addition & 1 deletion bpf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BPF_SIMPLE_LL = $(patsubst %.o,%.ll,${BPF_SIMPLE})
BPF_TEST=tests/bpf_ct_tests.o
BPF = bpf_lxc.o bpf_overlay.o bpf_sock.o bpf_host.o bpf_xdp.o $(BPF_SIMPLE)

TARGET=cilium-map-migrate cilium-probe-kernel-hz
TARGET=cilium-probe-kernel-hz
KERNEL ?= "49"

include ./Makefile.bpf
Expand Down

0 comments on commit 66cd0e0

Please sign in to comment.