diff --git a/.gitignore b/.gitignore index 89301ff84..0791104f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,14 @@ # Binaries -calico-vpp-agent/bin -vpp-manager/images/*/vpp-manager -vpp-manager/images/*/bin -vpp-manager/images/*/artifacts -vpp-manager/images/*/vppdev.sh -vpp-manager/vpp_build/ +pkg/calico-vpp-agent/bin +cmd/calicovppctl/bin +images/*/vpp-manager +images/*/bin +images/*/artifacts +images/*/vppdev.sh +vpp_build/ *.deb *.so* -multinet-monitor/watcher +pkg/multinet-monitor/watcher *.tgz *.tar @@ -28,10 +29,10 @@ test/vagrant/.vagrant *.bkp # build artefacts -calico-vpp-agent/version -vpp-manager/images/ubuntu/version +pkg/calico-vpp-agent/version +images/ubuntu/version test/scripts/.buildlogs -multinet-monitor/version +pkg/multinet-monitor/version .coverage/ bin/ vendor/ diff --git a/Makefile b/Makefile index 5993be4ba..1d1610983 100644 --- a/Makefile +++ b/Makefile @@ -5,26 +5,70 @@ check-%: .PHONY: build build: - $(MAKE) -C calico-vpp-agent $@ - $(MAKE) -C vpp-manager $@ - $(MAKE) -C multinet-monitor $@ + $(MAKE) -C pkg/vpp-manager $@ $(MAKE) -C cmd/calicovppctl $@ .PHONY: image images images: image image: - $(MAKE) -C calico-vpp-agent $@ - $(MAKE) -C vpp-manager $@ - $(MAKE) -C multinet-monitor $@ + $(MAKE) -C pkg/vpp-manager $@ $(MAKE) -C cmd/calicovppctl $@ .PHONY: image-kind image-kind: image - @for image in vpp:$(TAG) vpp:dbg-$(TAG) vclsidecar:$(TAG) vclsidecar:dbg-$(TAG) agent:$(TAG) multinet-monitor:$(TAG); do \ + @for image in vpp:$(TAG) vpp:dbg-$(TAG) vclsidecar:$(TAG) vclsidecar:dbg-$(TAG); do \ docker image tag calicovpp/$$image localhost:5000/calicovpp/$$image ; \ docker push localhost:5000/calicovpp/$$image ; \ done +# vpp: build VPP from source. VPP_DIR overrides the default build location +# (default: vpp_build/ at the repo root). BASE overrides the VPP commit. +.PHONY: vpp +vpp: + $(MAKE) -C pkg/vpp-manager $@ VPP_DIR=$(VPP_DIR) BASE=$(BASE) + +# kube-test-template: emit a self-contained kube-test manifest for the +# the requested cluster flavor. All CalicoVPP-internal layout details +# (image names, in-repo paths to the VPP build output, etc.) are +# resolved here from the kustomize sources under +# yaml/overlays/kube-test-* and baked into the emitted manifest. +# +# Only consumer-owned runtime placeholders survive in the output: +# ${CALICOVPP_VERSION}, ${HOME}, ${ADDITIONAL_VPP_CONFIG}, +# ${CALICOVPP_ENABLE_MEMIF}, ${CALICO_NETWORK_CONFIG} and +# ${CALICOVPP_INTERFACE} (baremetal only) +# +# The consumer (e.g. VPP `extras/kube-test`) does NOT need to know +# which image to use or where the VPP build lives in this repo. +# +# Usage: +# make kube-test-template FLAVOR=kind # default +# make kube-test-template FLAVOR=baremetal +FLAVOR ?= kind +.PHONY: kube-test-template +kube-test-template: + @if [ "$(FLAVOR)" != "kind" ] && [ "$(FLAVOR)" != "baremetal" ]; then \ + echo "kube-test-template: unsupported FLAVOR=$(FLAVOR) (expected kind or baremetal)" >&2; \ + exit 2; \ + fi + @kubectl kustomize yaml/overlays/kube-test-$(FLAVOR) 2>/dev/null + @echo "---" + @cat yaml/components/kube-test/tigera-installation.snippet.yaml + +# kube-test-push-images: pull the unified calicovpp/vpp image from docker.io +# and push to localhost:5000 for kube-test consumption. Called by the VPP +# kube-test `release-cluster` flow. From v3.33 onwards all binaries ship in +# the single calicovpp/vpp image; split-image release branches (v3.29-v3.32) +# override KUBE_TEST_IMAGES to include calicovpp/agent and multinet-monitor. +KUBE_TEST_IMAGES ?= calicovpp/vpp +.PHONY: kube-test-push-images +kube-test-push-images: + @for img in $(KUBE_TEST_IMAGES); do \ + docker pull docker.io/$$img:$(CALICOVPP_VERSION); \ + docker image tag docker.io/$$img:$(CALICOVPP_VERSION) localhost:5000/$$img:$(CALICOVPP_VERSION); \ + docker push localhost:5000/$$img:$(CALICOVPP_VERSION); \ + done + .PHONY: kind-cluster-name kind-cluster-name: @echo $(CLUSTER_NAME) @@ -46,32 +90,26 @@ kind: kind-new-cluster image-kind kind-install-cni .PHONY: push push: - $(MAKE) -C calico-vpp-agent $@ - $(MAKE) -C vpp-manager $@ - $(MAKE) -C multinet-monitor $@ + $(MAKE) -C pkg/vpp-manager $@ $(MAKE) -C cmd/calicovppctl $@ .PHONY: dev dev: - $(MAKE) -C calico-vpp-agent ALSO_LATEST=y $@ - $(MAKE) -C vpp-manager ALSO_LATEST=y $@ - $(MAKE) -C multinet-monitor ALSO_LATEST=y $@ + $(MAKE) -C pkg/vpp-manager ALSO_LATEST=y $@ .PHONY: clean-vpp clean-vpp: - $(MAKE) -C vpp-manager clean-vpp + $(MAKE) -C pkg/vpp-manager clean-vpp .PHONY: proto proto: - $(MAKE) -C calico-vpp-agent $@ + $(MAKE) -C pkg/calico-vpp-agent $@ .PHONY: dev.k3s dev.k3s: dev - @for x in agent vpp ; do \ - docker save -o /tmp/$$x.tar calicovpp/$$x:latest ; \ - sudo k3s ctr images import /tmp/$$x.tar ; \ - rm -f /tmp/$$x.tar ; \ - done + docker save -o /tmp/vpp.tar calicovpp/vpp:latest + sudo k3s ctr images import /tmp/vpp.tar + rm -f /tmp/vpp.tar .PHONY: dev-kind dev-kind: dev @@ -111,9 +149,7 @@ start-test-cluster: .PHONY: load-images load-images: - $(MAKE) -C test/vagrant load-image -j99 IMG=calicovpp/agent:latest $(MAKE) -C test/vagrant load-image -j99 IMG=calicovpp/vpp:latest - $(MAKE) -C test/vagrant load-image -j99 IMG=calicovpp/multinet-monitor:latest CALICO_INSTALLATION ?= installation-default .PHONY: test-install-calico @@ -216,9 +252,9 @@ restart-calicovpp: kubectl -n calico-vpp-dataplane rollout status ds/calico-vpp-node .PHONY: goapi -export VPP_DIR ?= $(shell pwd)/vpp-manager/vpp_build +export VPP_DIR ?= $(shell pwd)/vpp_build goapi: - @go generate -v ./vpplink/generated/ + @go generate -v ./pkg/vpplink/generated/ .PHONY: cherry-vpp cherry-vpp: @@ -231,13 +267,13 @@ cherry-vpp: echo "branch : $(shell cd ${VPP_DIR} && git branch --show-current)"; \ echo "Are you sure? [y/N] " && read ans && [ $${ans:-N} = y ]; \ fi - @BASE=$(BASE) bash ./vpplink/generated/vpp_clone_current.sh ${VPP_DIR} + @BASE=$(BASE) bash ./pkg/vpplink/generated/vpp_clone_current.sh ${VPP_DIR} @make goapi .PHONY: cherry-wipe cherry-wipe: - rm -rf ./vpplink/binapi/.cherries-cache - rm -rf ./vpplink/generated/.cherries-cache + rm -rf ./pkg/vpplink/binapi/.cherries-cache + rm -rf ./pkg/vpplink/generated/.cherries-cache .PHONY: yaml yaml: @@ -316,14 +352,14 @@ delete-multinet: .PHONY: lint lint: - test -d ${VPP_DATAPLANE_DIR}/vpp-manager/vpp_build && touch ${VPP_DATAPLANE_DIR}/vpp-manager/vpp_build/go.mod || true + test -d ${VPP_DATAPLANE_DIR}/vpp_build && touch ${VPP_DATAPLANE_DIR}/vpp_build/go.mod || true go mod tidy --diff || (echo -e "Please run\ngo mod tidy" && exit 1) gofmt -s -l . | grep -vE '(binapi|vpp_build|vendor)' \ | diff -u /dev/null - \ || (echo -e "Please run\ngofmt -w ." && exit 1) golangci-lint run --color=never markdownlint --dot \ - --ignore vpp-manager/vpp_build \ + --ignore vpp_build \ --ignore vendor . .PHONY: cov-html @@ -374,8 +410,8 @@ builder-image: ## Make dependencies image. (Not required normally; is implied in test: builder-image @rm -rf $(shell pwd)/.coverage/unit @mkdir -p $(shell pwd)/.coverage/unit - $(MAKE) -C vpp-manager image - $(MAKE) -C vpp-manager mock-pod-image + $(MAKE) -C pkg/vpp-manager image + $(MAKE) -C pkg/vpp-manager mock-pod-image # we prevent parallel test execution as test infra does not currently support parallel VPPs sudo -E env "PATH=$$PATH" VPP_BINARY=/usr/bin/vpp \ VPP_IMAGE=calicovpp/vpp:$(TAG) \ @@ -393,8 +429,8 @@ test: builder-image ci-test: builder-image @rm -rf $(shell pwd)/.coverage/unit @mkdir -p $(shell pwd)/.coverage/unit - $(MAKE) -C vpp-manager image - $(MAKE) -C vpp-manager mock-pod-image + $(MAKE) -C pkg/vpp-manager image + $(MAKE) -C pkg/vpp-manager mock-pod-image # we prevent parallel test execution as test infra does not currently support parallel VPPs docker run -t --rm \ --privileged \ @@ -428,4 +464,3 @@ ci-%: builder-image .PHONY: depend-image-hash depend-image-hash: @echo $(CI_BUILDER_IMAGE) - diff --git a/calico-vpp-agent/Dockerfile b/calico-vpp-agent/Dockerfile deleted file mode 100644 index 307d014db..000000000 --- a/calico-vpp-agent/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:22.04 - -LABEL maintainer="aloaugus@cisco.com" - -ARG GIT_COMMIT=unknown -LABEL git-commit=$GIT_COMMIT - -ADD bin/gobgp /bin/gobgp -ADD version /etc/calicovppversion -ADD bin/felix-api-proxy /bin/felix-api-proxy -ADD bin/calico-vpp-agent /bin/calico-vpp-agent - -ENTRYPOINT ["/bin/calico-vpp-agent"] diff --git a/calico-vpp-agent/Makefile b/calico-vpp-agent/Makefile deleted file mode 100644 index a81c5cd21..000000000 --- a/calico-vpp-agent/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -include ../common.mk - -ALSO_LATEST ?= n # If 'y' also tag images with :latest -GENERATE_LOG_FILE=../vpplink/generated/generate.log -VERSION_FILE=version - -.PHONY: all -all: image - -bin: - mkdir -p bin - -.PHONY: build -build: bin - ${DOCKER_RUN} go build $(COVER_OPTS) -o ./bin/felix-api-proxy ./cmd/api-proxy - ${DOCKER_RUN} go build $(COVER_OPTS) -o ./bin/calico-vpp-agent ./cmd - ${DOCKER_RUN} go build -o ./bin/gobgp github.com/osrg/gobgp/v3/cmd/gobgp/ - -.PHONY: image -image: build - @cat $(GENERATE_LOG_FILE) > $(VERSION_FILE) - docker build $(DOCKER_BUILD_ARGS) --pull -t calicovpp/agent:$(TAG) . - @if [ "${ALSO_LATEST}" = "y" ]; then \ - docker tag calicovpp/agent:$(TAG) calicovpp/agent:latest; \ - docker tag calicovpp/agent:$(TAG) calicovpp/agent:prerelease; \ - fi - -.PHONY: image-cov -image-cov: build-cov - @cat $(GENERATE_LOG_FILE) > $(VERSION_FILE) - docker build $(DOCKER_BUILD_ARGS) --pull -t calicovpp/agent:$(TAG) . - -.PHONY: push -push: ${PUSH_DEP} - set -e; for registry in ${REGISTRIES}; do \ - docker tag calicovpp/agent:$(TAG) $${registry}calicovpp/agent:$(TAG); \ - if [ "${ALSO_LATEST}" = "y" ]; then \ - docker tag calicovpp/agent:$(TAG) $${registry}calicovpp/agent:latest; \ - docker tag calicovpp/agent:$(TAG) $${registry}calicovpp/agent:prerelease; \ - fi; \ - docker push --all-tags $${registry}calicovpp/agent; \ - done - -.PHONY: dev -dev: image - -.PHONY: proto -proto: - $(MAKE) -C proto $@ diff --git a/calico-vpp-agent/cmd/api-proxy/felix-api-proxy.go b/cmd/api-proxy/main.go similarity index 96% rename from calico-vpp-agent/cmd/api-proxy/felix-api-proxy.go rename to cmd/api-proxy/main.go index 09a61d8d2..d4b9a63a6 100644 --- a/calico-vpp-agent/cmd/api-proxy/felix-api-proxy.go +++ b/cmd/api-proxy/main.go @@ -25,7 +25,7 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) const ( diff --git a/calico-vpp-agent/cmd/calico_vpp_dataplane.go b/cmd/calico-vpp-agent/main.go similarity index 94% rename from calico-vpp-agent/cmd/calico_vpp_dataplane.go rename to cmd/calico-vpp-agent/main.go index cedf2326e..444e6e6a3 100644 --- a/calico-vpp-agent/cmd/calico_vpp_dataplane.go +++ b/cmd/calico-vpp-agent/main.go @@ -36,15 +36,15 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/connectivity" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/felix" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/health" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/routing" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/services" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/connectivity" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/felix" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/health" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/routing" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/services" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) /* diff --git a/cmd/calicovppctl/Makefile b/cmd/calicovppctl/Makefile index 8050e96ce..5ab99965f 100644 --- a/cmd/calicovppctl/Makefile +++ b/cmd/calicovppctl/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -BIN_DIR = $(VPP_DATAPLANE_DIR)/bin +BIN_DIR = ./bin SNAPSHOTTER_ENABLED := $(shell docker info -f '{{json .DriverStatus }}' | grep snapshotter) .PHONY: bin diff --git a/cmd/multinet-monitor/main.go b/cmd/multinet-monitor/main.go new file mode 100644 index 000000000..bd685e745 --- /dev/null +++ b/cmd/multinet-monitor/main.go @@ -0,0 +1,24 @@ +// Copyright (C) 2019 Cisco Systems Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +// implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + multinetmonitor "github.com/projectcalico/vpp-dataplane/v3/pkg/multinet-monitor" +) + +func main() { + multinetmonitor.Run() +} diff --git a/scripts/replay-trace/README.md b/cmd/replay-trace/README.md similarity index 100% rename from scripts/replay-trace/README.md rename to cmd/replay-trace/README.md diff --git a/scripts/replay-trace/replay_trace.go b/cmd/replay-trace/replay_trace.go similarity index 97% rename from scripts/replay-trace/replay_trace.go rename to cmd/replay-trace/replay_trace.go index dbba9cae6..8033d0cfd 100644 --- a/scripts/replay-trace/replay_trace.go +++ b/cmd/replay-trace/replay_trace.go @@ -35,9 +35,9 @@ import ( "go.fd.io/govpp/codec" "go.fd.io/govpp/core" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/af_packet" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/tapv2" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/af_packet" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/tapv2" ) var ( diff --git a/cmd/vpp-manager/main.go b/cmd/vpp-manager/main.go new file mode 100644 index 000000000..6cdb63aa8 --- /dev/null +++ b/cmd/vpp-manager/main.go @@ -0,0 +1,24 @@ +// Copyright (C) 2019 Cisco Systems Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +// implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + vppmanager "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager" +) + +func main() { + vppmanager.Run() +} diff --git a/docs/dev/developper_guide.md b/docs/dev/developper_guide.md index a7fb2b7c5..90e588dc9 100644 --- a/docs/dev/developper_guide.md +++ b/docs/dev/developper_guide.md @@ -33,13 +33,13 @@ First you will need to build vpp locally with the required patches. This takes a while but it's usually not run often. ````bash -make -C vpp-manager/ vpp +make -C pkg/vpp-manager/ vpp ```` or ````bash -make -C vpp-manager/ vpp BASE=origin/master +make -C pkg/vpp-manager/ vpp BASE=origin/master ```` Then build the agents, containers & push them to the local docker repository @@ -63,9 +63,7 @@ Calico/VPP. ````bash # ---------------- images ---------------- -export CALICO_AGENT_IMAGE=localhost:5000/calicovpp/agent:latest export CALICO_VPP_IMAGE=localhost:5000/calicovpp/vpp:latest -export MULTINET_MONITOR_IMAGE=localhost:5000/calicovpp/multinet-monitor:latest export IMAGE_PULL_POLICY=Always # ---------------- interfaces ---------------- @@ -224,7 +222,7 @@ without recreating images), run: ````console # Build VPP in debug mode make cherry-vpp -make -C vpp-manager/vpp_build install-dep build +make -C vpp_build install-dep build make dev make load-images make test-install-calicovpp-dev diff --git a/docs/pods/vcl.md b/docs/pods/vcl.md index 14464e85a..26c49e7d6 100644 --- a/docs/pods/vcl.md +++ b/docs/pods/vcl.md @@ -92,7 +92,7 @@ Build your vpp libraries and rebuild your sidecar if needed using ````bash cd test/yaml -VPP_DIR=/path-to-your-repo/vpp-manager/vpp_build/ make sidecar-vcl +VPP_DIR=/path-to-your-repo/vpp_build/ make sidecar-vcl ```` To use VCL in your pod, you don't need to rebuild your pod image. You can use diff --git a/vpp-manager/images/dev/Dockerfile b/images/dev/Dockerfile similarity index 100% rename from vpp-manager/images/dev/Dockerfile rename to images/dev/Dockerfile diff --git a/vpp-manager/images/dev/entrypoint.sh b/images/dev/entrypoint.sh similarity index 84% rename from vpp-manager/images/dev/entrypoint.sh rename to images/dev/entrypoint.sh index de4c9f744..8223c97fd 100755 --- a/vpp-manager/images/dev/entrypoint.sh +++ b/images/dev/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -VPP_MANAGER=/repo/vpp-manager/images/ubuntu/vpp-manager +VPP_MANAGER=/repo/images/ubuntu/bin/vpp-manager _trap() { echo "Caught $1 signal!" @@ -19,7 +19,7 @@ trap "_trap ABRT" SIGABRT # from the host home by yaml/overlays/dev # Assumes that -# vpp was built by make -C vpp-manager/ vpp +# vpp was built by make -C pkg/vpp-manager/ vpp if [[ "x$DEBUG" == xsleep ]]; then tail -f /dev/null @@ -30,4 +30,4 @@ else do wait $child done -fi \ No newline at end of file +fi diff --git a/vpp-manager/images/dev/vpp.sh b/images/dev/vpp.sh similarity index 89% rename from vpp-manager/images/dev/vpp.sh rename to images/dev/vpp.sh index baaee7433..a3d07a69c 100755 --- a/vpp-manager/images/dev/vpp.sh +++ b/images/dev/vpp.sh @@ -1,6 +1,6 @@ #!/bin/bash -VPP_DIR=/repo/vpp-manager/vpp_build +VPP_DIR=/repo/vpp_build _trap() { echo "Caught $1 signal!" @@ -19,7 +19,7 @@ trap "_trap ABRT" SIGABRT # from the host home by yaml/overlays/dev # Assumes that -# vpp was built by make -C vpp-manager/ vpp +# vpp was built by make -C pkg/vpp-manager/ vpp if [[ "x$DEBUG" != x ]]; then VPP="$VPP_DIR/build-root/install-vpp_debug-native/vpp" diff --git a/vpp-manager/images/dev/vppctl.sh b/images/dev/vppctl.sh similarity index 82% rename from vpp-manager/images/dev/vppctl.sh rename to images/dev/vppctl.sh index 4ce73e133..de3babf9d 100755 --- a/vpp-manager/images/dev/vppctl.sh +++ b/images/dev/vppctl.sh @@ -1,13 +1,13 @@ #!/bin/bash -VPP_DIR=/repo/vpp-manager/vpp_build +VPP_DIR=/repo/vpp_build # This targets a vpp that is compiled separately # living in $VPP_DIR which is mounted # from the host home by yaml/overlays/dev # Assumes that -# vpp was built by make -C vpp-manager/ vpp +# vpp was built by make -C pkg/vpp-manager/ vpp if [[ "x$DEBUG" != x ]]; then VPP="$VPP_DIR/build-root/install-vpp_debug-native/vpp" diff --git a/vpp-manager/images/init-eks/Dockerfile b/images/init-eks/Dockerfile similarity index 100% rename from vpp-manager/images/init-eks/Dockerfile rename to images/init-eks/Dockerfile diff --git a/vpp-manager/images/init-eks/entrypoint.sh b/images/init-eks/entrypoint.sh similarity index 100% rename from vpp-manager/images/init-eks/entrypoint.sh rename to images/init-eks/entrypoint.sh diff --git a/vpp-manager/images/init-eks/init_eks.sh b/images/init-eks/init_eks.sh similarity index 100% rename from vpp-manager/images/init-eks/init_eks.sh rename to images/init-eks/init_eks.sh diff --git a/vpp-manager/images/mock-pod/Dockerfile b/images/mock-pod/Dockerfile similarity index 100% rename from vpp-manager/images/mock-pod/Dockerfile rename to images/mock-pod/Dockerfile diff --git a/vpp-manager/images/ubuntu-build/Dockerfile b/images/ubuntu-build/Dockerfile similarity index 100% rename from vpp-manager/images/ubuntu-build/Dockerfile rename to images/ubuntu-build/Dockerfile diff --git a/vpp-manager/images/ubuntu-build/build_script.sh b/images/ubuntu-build/build_script.sh similarity index 100% rename from vpp-manager/images/ubuntu-build/build_script.sh rename to images/ubuntu-build/build_script.sh diff --git a/vpp-manager/images/ubuntu/Dockerfile b/images/ubuntu/Dockerfile similarity index 71% rename from vpp-manager/images/ubuntu/Dockerfile rename to images/ubuntu/Dockerfile index eab1d9bd7..18300353e 100644 --- a/vpp-manager/images/ubuntu/Dockerfile +++ b/images/ubuntu/Dockerfile @@ -29,8 +29,21 @@ RUN export VPP_INSTALL_SKIP_SYSCTL=1 && \ /tmp/vpp/vpp-plugin-devtools_*.deb && \ rm -rf /tmp/vpp +# vpp-manager binary and helper script ADD bin/vpp-manager /usr/bin/ ADD bin/vppdev.sh /usr/bin/calivppctl ADD artifacts/release/calicovppversion /etc/calicovppversion +# agent binaries +ADD bin/calico-vpp-agent /bin/calico-vpp-agent +ADD bin/felix-api-proxy /bin/felix-api-proxy +ADD bin/gobgp /bin/gobgp + +# multinet-monitor binary +ADD bin/multinet-monitor /bin/multinet-monitor + +# init-eks scripts +ADD bin/init_eks.sh /bin/init_eks.sh +ADD bin/init_eks_entrypoint.sh /bin/init_eks_entrypoint.sh + ENTRYPOINT ["/usr/bin/vpp-manager"] diff --git a/vpp-manager/images/ubuntu/Dockerfile.debug b/images/ubuntu/Dockerfile.debug similarity index 71% rename from vpp-manager/images/ubuntu/Dockerfile.debug rename to images/ubuntu/Dockerfile.debug index 1e24fe8a9..f7faa8bbc 100644 --- a/vpp-manager/images/ubuntu/Dockerfile.debug +++ b/images/ubuntu/Dockerfile.debug @@ -29,8 +29,21 @@ RUN export VPP_INSTALL_SKIP_SYSCTL=1 && \ /tmp/vpp/vpp-plugin-devtools_*.deb && \ rm -rf /tmp/vpp +# vpp-manager binary and helper script ADD bin/vpp-manager /usr/bin/ ADD bin/vppdev.sh /usr/bin/calivppctl ADD artifacts/debug/calicovppversion /etc/calicovppversion +# agent binaries +ADD bin/calico-vpp-agent /bin/calico-vpp-agent +ADD bin/felix-api-proxy /bin/felix-api-proxy +ADD bin/gobgp /bin/gobgp + +# multinet-monitor binary +ADD bin/multinet-monitor /bin/multinet-monitor + +# init-eks scripts +ADD bin/init_eks.sh /bin/init_eks.sh +ADD bin/init_eks_entrypoint.sh /bin/init_eks_entrypoint.sh + ENTRYPOINT ["/usr/bin/vpp-manager"] diff --git a/vpp-manager/images/vclsidecar/Dockerfile b/images/vclsidecar/Dockerfile similarity index 100% rename from vpp-manager/images/vclsidecar/Dockerfile rename to images/vclsidecar/Dockerfile diff --git a/vpp-manager/images/vclsidecar/Dockerfile.debug b/images/vclsidecar/Dockerfile.debug similarity index 100% rename from vpp-manager/images/vclsidecar/Dockerfile.debug rename to images/vclsidecar/Dockerfile.debug diff --git a/multinet-monitor/Dockerfile b/multinet-monitor/Dockerfile deleted file mode 100644 index 5f3541b15..000000000 --- a/multinet-monitor/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:22.04 - -LABEL maintainer="hbouatto@cisco.com" - -ARG GIT_COMMIT=unknown -LABEL git-commit=$GIT_COMMIT - -ADD watcher /bin/watcher - -ENTRYPOINT ["/bin/watcher"] diff --git a/multinet-monitor/Makefile b/multinet-monitor/Makefile deleted file mode 100644 index 7eca8bc9e..000000000 --- a/multinet-monitor/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -include ../common.mk - -VERSION_FILE=version -GENERATE_LOG_FILE=../vpplink/generated/generate.log -ALSO_LATEST ?= n # If 'y' also tag images with :latest - -.PHONY: build -build: - ${DOCKER_RUN} go build -o ./watcher . - -.PHONY: image -image: build - @cat $(GENERATE_LOG_FILE) > $(VERSION_FILE) - docker build --pull $(DOCKER_BUILD_ARGS) -t calicovpp/multinet-monitor:$(TAG) . - @if [ "${ALSO_LATEST}" = "y" ]; then \ - docker tag calicovpp/multinet-monitor:$(TAG) calicovpp/multinet-monitor:latest; \ - docker tag calicovpp/multinet-monitor:$(TAG) calicovpp/multinet-monitor:prerelease; \ - fi - -.PHONY: dev -dev: image - -push: ${PUSH_DEP} - set -e; for registry in ${REGISTRIES}; do \ - docker tag calicovpp/multinet-monitor:$(TAG) $${registry}calicovpp/multinet-monitor:$(TAG); \ - if [ "${ALSO_LATEST}" = "y" ]; then \ - docker tag calicovpp/multinet-monitor:latest $${registry}calicovpp/multinet-monitor:latest; \ - docker tag calicovpp/multinet-monitor:prerelease $${registry}calicovpp/multinet-monitor:prerelease; \ - fi; \ - docker push --all-tags $${registry}calicovpp/multinet-monitor; \ - done diff --git a/calico-vpp-agent/LICENSE b/pkg/calico-vpp-agent/LICENSE similarity index 100% rename from calico-vpp-agent/LICENSE rename to pkg/calico-vpp-agent/LICENSE diff --git a/pkg/calico-vpp-agent/Makefile b/pkg/calico-vpp-agent/Makefile new file mode 100644 index 000000000..5c65ecc69 --- /dev/null +++ b/pkg/calico-vpp-agent/Makefile @@ -0,0 +1,17 @@ +include ../../common.mk + +.PHONY: all +all: build + +bin: + mkdir -p bin + +.PHONY: build +build: bin + ${DOCKER_RUN} go build $(COVER_OPTS) -o ./bin/felix-api-proxy ../../cmd/api-proxy + ${DOCKER_RUN} go build $(COVER_OPTS) -o ./bin/calico-vpp-agent ../../cmd/calico-vpp-agent + ${DOCKER_RUN} go build -o ./bin/gobgp github.com/osrg/gobgp/v3/cmd/gobgp/ + +.PHONY: proto +proto: + $(MAKE) -C proto $@ diff --git a/calico-vpp-agent/README.md b/pkg/calico-vpp-agent/README.md similarity index 100% rename from calico-vpp-agent/README.md rename to pkg/calico-vpp-agent/README.md diff --git a/calico-vpp-agent/cni/cni_node_test.go b/pkg/calico-vpp-agent/cni/cni_node_test.go similarity index 98% rename from calico-vpp-agent/cni/cni_node_test.go rename to pkg/calico-vpp-agent/cni/cni_node_test.go index 116dcf351..df78debf9 100644 --- a/calico-vpp-agent/cni/cni_node_test.go +++ b/pkg/calico-vpp-agent/cni/cni_node_test.go @@ -35,14 +35,14 @@ import ( "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/connectivity" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks/calico" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/testutils" - agentConf "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/connectivity" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/tests/mocks" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/tests/mocks/calico" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/testutils" + agentConf "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) // Names of integration tests arguments diff --git a/calico-vpp-agent/cni/cni_pod_test.go b/pkg/calico-vpp-agent/cni/cni_pod_test.go similarity index 98% rename from calico-vpp-agent/cni/cni_pod_test.go rename to pkg/calico-vpp-agent/cni/cni_pod_test.go index 14576ddcb..b25e1d04a 100644 --- a/calico-vpp-agent/cni/cni_pod_test.go +++ b/pkg/calico-vpp-agent/cni/cni_pod_test.go @@ -31,14 +31,14 @@ import ( "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/testutils" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/tests/mocks" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/testutils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" "go.fd.io/govpp/adapter" "go.fd.io/govpp/core" diff --git a/calico-vpp-agent/cni/cni_server.go b/pkg/calico-vpp-agent/cni/cni_server.go similarity index 97% rename from calico-vpp-agent/cni/cni_server.go rename to pkg/calico-vpp-agent/cni/cni_server.go index 2eb26fca6..ed0fab269 100644 --- a/calico-vpp-agent/cni/cni_server.go +++ b/pkg/calico-vpp-agent/cni/cni_server.go @@ -35,13 +35,13 @@ import ( "google.golang.org/grpc" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/podinterface" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/podinterface" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type Server struct { diff --git a/calico-vpp-agent/cni/model/pod_annotations.go b/pkg/calico-vpp-agent/cni/model/pod_annotations.go similarity index 97% rename from calico-vpp-agent/cni/model/pod_annotations.go rename to pkg/calico-vpp-agent/cni/model/pod_annotations.go index 46dc4a1a1..54d6d213c 100644 --- a/calico-vpp-agent/cni/model/pod_annotations.go +++ b/pkg/calico-vpp-agent/cni/model/pod_annotations.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" cnet "github.com/projectcalico/calico/libcalico-go/lib/net" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type PodAnnotations struct { diff --git a/calico-vpp-agent/cni/model/pod_spec.go b/pkg/calico-vpp-agent/cni/model/pod_spec.go similarity index 97% rename from calico-vpp-agent/cni/model/pod_spec.go rename to pkg/calico-vpp-agent/cni/model/pod_spec.go index a964c8051..c8a219373 100644 --- a/calico-vpp-agent/cni/model/pod_spec.go +++ b/pkg/calico-vpp-agent/cni/model/pod_spec.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" cniproto "github.com/projectcalico/calico/cni-plugin/pkg/dataplane/grpc/proto" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func isMemif(ifName string) bool { diff --git a/calico-vpp-agent/cni/model/pod_status.go b/pkg/calico-vpp-agent/cni/model/pod_status.go similarity index 98% rename from calico-vpp-agent/cni/model/pod_status.go rename to pkg/calico-vpp-agent/cni/model/pod_status.go index 8fd99918f..26d19764e 100644 --- a/calico-vpp-agent/cni/model/pod_status.go +++ b/pkg/calico-vpp-agent/cni/model/pod_status.go @@ -16,7 +16,7 @@ package model import ( - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) // LocalPodSpecStatus contains VPP internal ids, mutable fields in AddVppInterface diff --git a/calico-vpp-agent/cni/model/server_state.go b/pkg/calico-vpp-agent/cni/model/server_state.go similarity index 97% rename from calico-vpp-agent/cni/model/server_state.go rename to pkg/calico-vpp-agent/cni/model/server_state.go index 870ef6aa2..aa1e2bbe8 100644 --- a/calico-vpp-agent/cni/model/server_state.go +++ b/pkg/calico-vpp-agent/cni/model/server_state.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) type CniServerState struct { diff --git a/calico-vpp-agent/cni/netns_linux.go b/pkg/calico-vpp-agent/cni/netns_linux.go similarity index 100% rename from calico-vpp-agent/cni/netns_linux.go rename to pkg/calico-vpp-agent/cni/netns_linux.go diff --git a/calico-vpp-agent/cni/network_vpp.go b/pkg/calico-vpp-agent/cni/network_vpp.go similarity index 96% rename from calico-vpp-agent/cni/network_vpp.go rename to pkg/calico-vpp-agent/cni/network_vpp.go index 88c7319c6..8adb96994 100644 --- a/calico-vpp-agent/cni/network_vpp.go +++ b/pkg/calico-vpp-agent/cni/network_vpp.go @@ -22,12 +22,12 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type PodNSNotFoundErr struct { diff --git a/calico-vpp-agent/cni/network_vpp_hostports.go b/pkg/calico-vpp-agent/cni/network_vpp_hostports.go similarity index 93% rename from calico-vpp-agent/cni/network_vpp_hostports.go rename to pkg/calico-vpp-agent/cni/network_vpp_hostports.go index aec0de83d..c519bc886 100644 --- a/calico-vpp-agent/cni/network_vpp_hostports.go +++ b/pkg/calico-vpp-agent/cni/network_vpp_hostports.go @@ -18,9 +18,9 @@ package cni import ( "net" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) // getHostPortHostIP returns the hostIP for a given diff --git a/calico-vpp-agent/cni/network_vpp_routes.go b/pkg/calico-vpp-agent/cni/network_vpp_routes.go similarity index 98% rename from calico-vpp-agent/cni/network_vpp_routes.go rename to pkg/calico-vpp-agent/cni/network_vpp_routes.go index 5e7ecfcdf..1b424339a 100644 --- a/calico-vpp-agent/cni/network_vpp_routes.go +++ b/pkg/calico-vpp-agent/cni/network_vpp_routes.go @@ -18,11 +18,11 @@ package cni import ( "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (s *Server) RoutePodInterface(podSpec *model.LocalPodSpec, stack *vpplink.CleanupStack, swIfIndex uint32, isL3 bool, inPodVrf bool) error { diff --git a/calico-vpp-agent/cni/packet_helper.go b/pkg/calico-vpp-agent/cni/packet_helper.go similarity index 100% rename from calico-vpp-agent/cni/packet_helper.go rename to pkg/calico-vpp-agent/cni/packet_helper.go diff --git a/calico-vpp-agent/cni/podinterface/common.go b/pkg/calico-vpp-agent/cni/podinterface/common.go similarity index 94% rename from calico-vpp-agent/cni/podinterface/common.go rename to pkg/calico-vpp-agent/cni/podinterface/common.go index 123d61688..838a78dce 100644 --- a/calico-vpp-agent/cni/podinterface/common.go +++ b/pkg/calico-vpp-agent/cni/podinterface/common.go @@ -19,11 +19,11 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type PodInterfaceDriverData struct { diff --git a/calico-vpp-agent/cni/podinterface/loopback.go b/pkg/calico-vpp-agent/cni/podinterface/loopback.go similarity index 91% rename from calico-vpp-agent/cni/podinterface/loopback.go rename to pkg/calico-vpp-agent/cni/podinterface/loopback.go index 86adf083b..17e79c6f3 100644 --- a/calico-vpp-agent/cni/podinterface/loopback.go +++ b/pkg/calico-vpp-agent/cni/podinterface/loopback.go @@ -19,9 +19,9 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) type LoopbackPodInterfaceDriver struct { diff --git a/calico-vpp-agent/cni/podinterface/memif.go b/pkg/calico-vpp-agent/cni/podinterface/memif.go similarity index 96% rename from calico-vpp-agent/cni/podinterface/memif.go rename to pkg/calico-vpp-agent/cni/podinterface/memif.go index 0b77a243e..64cc8a1a5 100644 --- a/calico-vpp-agent/cni/podinterface/memif.go +++ b/pkg/calico-vpp-agent/cni/podinterface/memif.go @@ -23,11 +23,11 @@ import ( "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type MemifPodInterfaceDriver struct { diff --git a/calico-vpp-agent/cni/podinterface/tuntap.go b/pkg/calico-vpp-agent/cni/podinterface/tuntap.go similarity index 97% rename from calico-vpp-agent/cni/podinterface/tuntap.go rename to pkg/calico-vpp-agent/cni/podinterface/tuntap.go index d38ccd170..3b06752c9 100644 --- a/calico-vpp-agent/cni/podinterface/tuntap.go +++ b/pkg/calico-vpp-agent/cni/podinterface/tuntap.go @@ -28,11 +28,11 @@ import ( "github.com/vishvananda/netlink" "golang.org/x/sys/unix" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type TunTapPodInterfaceDriver struct { diff --git a/calico-vpp-agent/cni/podinterface/vcl.go b/pkg/calico-vpp-agent/cni/podinterface/vcl.go similarity index 90% rename from calico-vpp-agent/cni/podinterface/vcl.go rename to pkg/calico-vpp-agent/cni/podinterface/vcl.go index 677ee157c..91bee0bd8 100644 --- a/calico-vpp-agent/cni/podinterface/vcl.go +++ b/pkg/calico-vpp-agent/cni/podinterface/vcl.go @@ -20,10 +20,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type VclPodInterfaceDriver struct { diff --git a/calico-vpp-agent/common/common.go b/pkg/calico-vpp-agent/common/common.go similarity index 98% rename from calico-vpp-agent/common/common.go rename to pkg/calico-vpp-agent/common/common.go index 39c7e5146..1645f9748 100644 --- a/calico-vpp-agent/common/common.go +++ b/pkg/calico-vpp-agent/common/common.go @@ -28,7 +28,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" bgpapi "github.com/osrg/gobgp/v3/api" calicov3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3" @@ -37,8 +37,8 @@ import ( apb "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) var ( diff --git a/calico-vpp-agent/common/pubsub.go b/pkg/calico-vpp-agent/common/pubsub.go similarity index 100% rename from calico-vpp-agent/common/pubsub.go rename to pkg/calico-vpp-agent/common/pubsub.go diff --git a/calico-vpp-agent/common/srv6_policy_test.go b/pkg/calico-vpp-agent/common/srv6_policy_test.go similarity index 100% rename from calico-vpp-agent/common/srv6_policy_test.go rename to pkg/calico-vpp-agent/common/srv6_policy_test.go diff --git a/calico-vpp-agent/connectivity/connectivity.go b/pkg/calico-vpp-agent/connectivity/connectivity.go similarity index 94% rename from calico-vpp-agent/connectivity/connectivity.go rename to pkg/calico-vpp-agent/connectivity/connectivity.go index 09511a4e2..d617135c2 100644 --- a/calico-vpp-agent/connectivity/connectivity.go +++ b/pkg/calico-vpp-agent/connectivity/connectivity.go @@ -23,8 +23,8 @@ import ( calicov3cli "github.com/projectcalico/calico/libcalico-go/lib/clientv3" "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) const ( diff --git a/calico-vpp-agent/connectivity/connectivity_server.go b/pkg/calico-vpp-agent/connectivity/connectivity_server.go similarity index 98% rename from calico-vpp-agent/connectivity/connectivity_server.go rename to pkg/calico-vpp-agent/connectivity/connectivity_server.go index 70e2a034f..094f31e00 100644 --- a/calico-vpp-agent/connectivity/connectivity_server.go +++ b/pkg/calico-vpp-agent/connectivity/connectivity_server.go @@ -26,10 +26,10 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) type ConnectivityServer struct { diff --git a/calico-vpp-agent/connectivity/flat.go b/pkg/calico-vpp-agent/connectivity/flat.go similarity index 90% rename from calico-vpp-agent/connectivity/flat.go rename to pkg/calico-vpp-agent/connectivity/flat.go index ccd8d4b23..0abe4e2f4 100644 --- a/calico-vpp-agent/connectivity/flat.go +++ b/pkg/calico-vpp-agent/connectivity/flat.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type FlatL3Provider struct { diff --git a/calico-vpp-agent/connectivity/ipip.go b/pkg/calico-vpp-agent/connectivity/ipip.go similarity index 97% rename from calico-vpp-agent/connectivity/ipip.go rename to pkg/calico-vpp-agent/connectivity/ipip.go index 8fd270471..e53897458 100644 --- a/calico-vpp-agent/connectivity/ipip.go +++ b/pkg/calico-vpp-agent/connectivity/ipip.go @@ -22,9 +22,9 @@ import ( vpptypes "github.com/calico-vpp/vpplink/api/v0" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type IpipProvider struct { diff --git a/calico-vpp-agent/connectivity/ipsec.go b/pkg/calico-vpp-agent/connectivity/ipsec.go similarity index 98% rename from calico-vpp-agent/connectivity/ipsec.go rename to pkg/calico-vpp-agent/connectivity/ipsec.go index c6e4ffc81..15f36b33f 100644 --- a/calico-vpp-agent/connectivity/ipsec.go +++ b/pkg/calico-vpp-agent/connectivity/ipsec.go @@ -25,10 +25,10 @@ import ( vpptypes "github.com/calico-vpp/vpplink/api/v0" "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type IpsecTunnel struct { diff --git a/calico-vpp-agent/connectivity/srv6.go b/pkg/calico-vpp-agent/connectivity/srv6.go similarity index 97% rename from calico-vpp-agent/connectivity/srv6.go rename to pkg/calico-vpp-agent/connectivity/srv6.go index 349bb3695..7870d0611 100644 --- a/calico-vpp-agent/connectivity/srv6.go +++ b/pkg/calico-vpp-agent/connectivity/srv6.go @@ -10,11 +10,11 @@ import ( cnet "github.com/projectcalico/calico/libcalico-go/lib/net" "github.com/projectcalico/calico/libcalico-go/lib/options" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) // NodeToPrefixes is data holder for node and traffic destination prefixes (subnets) that should end in the given node diff --git a/calico-vpp-agent/connectivity/vxlan.go b/pkg/calico-vpp-agent/connectivity/vxlan.go similarity index 97% rename from calico-vpp-agent/connectivity/vxlan.go rename to pkg/calico-vpp-agent/connectivity/vxlan.go index d7e1eb218..0a7e3dd18 100644 --- a/calico-vpp-agent/connectivity/vxlan.go +++ b/pkg/calico-vpp-agent/connectivity/vxlan.go @@ -22,10 +22,10 @@ import ( vpptypes "github.com/calico-vpp/vpplink/api/v0" "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type VXLanProvider struct { diff --git a/calico-vpp-agent/connectivity/wireguard.go b/pkg/calico-vpp-agent/connectivity/wireguard.go similarity index 98% rename from calico-vpp-agent/connectivity/wireguard.go rename to pkg/calico-vpp-agent/connectivity/wireguard.go index 859143487..5f1a5a737 100644 --- a/calico-vpp-agent/connectivity/wireguard.go +++ b/pkg/calico-vpp-agent/connectivity/wireguard.go @@ -26,9 +26,9 @@ import ( "github.com/projectcalico/calico/libcalico-go/lib/options" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type WireguardProvider struct { diff --git a/calico-vpp-agent/felix/felix_server.go b/pkg/calico-vpp-agent/felix/felix_server.go similarity index 99% rename from calico-vpp-agent/felix/felix_server.go rename to pkg/calico-vpp-agent/felix/felix_server.go index 4e3c2c6ba..8f3b749d1 100644 --- a/calico-vpp-agent/felix/felix_server.go +++ b/pkg/calico-vpp-agent/felix/felix_server.go @@ -35,14 +35,14 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" "github.com/projectcalico/calico/felix/proto" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/prometheus" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/npol" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/prometheus" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/npol" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/calico-vpp-agent/felix/felix_server_test.go b/pkg/calico-vpp-agent/felix/felix_server_test.go similarity index 99% rename from calico-vpp-agent/felix/felix_server_test.go rename to pkg/calico-vpp-agent/felix/felix_server_test.go index 9aba9bc5d..f4c042754 100644 --- a/calico-vpp-agent/felix/felix_server_test.go +++ b/pkg/calico-vpp-agent/felix/felix_server_test.go @@ -11,10 +11,10 @@ import ( . "github.com/onsi/gomega" felixConfig "github.com/projectcalico/calico/felix/config" "github.com/projectcalico/calico/felix/proto" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/testutils" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/testutils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" "github.com/sirupsen/logrus" ) diff --git a/calico-vpp-agent/felix/host_endpoint.go b/pkg/calico-vpp-agent/felix/host_endpoint.go similarity index 98% rename from calico-vpp-agent/felix/host_endpoint.go rename to pkg/calico-vpp-agent/felix/host_endpoint.go index baebb06bc..e99784701 100644 --- a/calico-vpp-agent/felix/host_endpoint.go +++ b/pkg/calico-vpp-agent/felix/host_endpoint.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "github.com/projectcalico/calico/felix/proto" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/npol" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/npol" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type HostEndpointID struct { diff --git a/calico-vpp-agent/felix/ipset.go b/pkg/calico-vpp-agent/felix/ipset.go similarity index 98% rename from calico-vpp-agent/felix/ipset.go rename to pkg/calico-vpp-agent/felix/ipset.go index ebe4b5650..d7db8d000 100644 --- a/calico-vpp-agent/felix/ipset.go +++ b/pkg/calico-vpp-agent/felix/ipset.go @@ -25,8 +25,8 @@ import ( "github.com/projectcalico/calico/felix/proto" "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type IPSet struct { diff --git a/calico-vpp-agent/felix/messages.go b/pkg/calico-vpp-agent/felix/messages.go similarity index 100% rename from calico-vpp-agent/felix/messages.go rename to pkg/calico-vpp-agent/felix/messages.go diff --git a/calico-vpp-agent/felix/policy.go b/pkg/calico-vpp-agent/felix/policy.go similarity index 98% rename from calico-vpp-agent/felix/policy.go rename to pkg/calico-vpp-agent/felix/policy.go index 152c68895..9fcd00944 100644 --- a/calico-vpp-agent/felix/policy.go +++ b/pkg/calico-vpp-agent/felix/policy.go @@ -22,8 +22,8 @@ import ( "github.com/projectcalico/calico/felix/proto" log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/calico-vpp-agent/felix/policy_state.go b/pkg/calico-vpp-agent/felix/policy_state.go similarity index 100% rename from calico-vpp-agent/felix/policy_state.go rename to pkg/calico-vpp-agent/felix/policy_state.go diff --git a/calico-vpp-agent/felix/rule.go b/pkg/calico-vpp-agent/felix/rule.go similarity index 98% rename from calico-vpp-agent/felix/rule.go rename to pkg/calico-vpp-agent/felix/rule.go index c8742a8de..d07c49c81 100644 --- a/calico-vpp-agent/felix/rule.go +++ b/pkg/calico-vpp-agent/felix/rule.go @@ -25,8 +25,8 @@ import ( "github.com/projectcalico/calico/felix/proto" "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type Rule struct { diff --git a/calico-vpp-agent/felix/workload_endpoint.go b/pkg/calico-vpp-agent/felix/workload_endpoint.go similarity index 96% rename from calico-vpp-agent/felix/workload_endpoint.go rename to pkg/calico-vpp-agent/felix/workload_endpoint.go index 5fea1d86d..1a01f1c19 100644 --- a/calico-vpp-agent/felix/workload_endpoint.go +++ b/pkg/calico-vpp-agent/felix/workload_endpoint.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "github.com/projectcalico/calico/felix/proto" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/npol" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/npol" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type WorkloadEndpointID struct { diff --git a/calico-vpp-agent/health/health.go b/pkg/calico-vpp-agent/health/health.go similarity index 100% rename from calico-vpp-agent/health/health.go rename to pkg/calico-vpp-agent/health/health.go diff --git a/calico-vpp-agent/network/network.go b/pkg/calico-vpp-agent/network/network.go similarity index 100% rename from calico-vpp-agent/network/network.go rename to pkg/calico-vpp-agent/network/network.go diff --git a/calico-vpp-agent/prometheus/prometheus.go b/pkg/calico-vpp-agent/prometheus/prometheus.go similarity index 98% rename from calico-vpp-agent/prometheus/prometheus.go rename to pkg/calico-vpp-agent/prometheus/prometheus.go index 85c35fe3e..334f2f2a2 100644 --- a/calico-vpp-agent/prometheus/prometheus.go +++ b/pkg/calico-vpp-agent/prometheus/prometheus.go @@ -30,9 +30,9 @@ import ( "go.fd.io/govpp/adapter" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) type podInterfaceDetails struct { diff --git a/calico-vpp-agent/prometheus/prometheus_test.go b/pkg/calico-vpp-agent/prometheus/prometheus_test.go similarity index 97% rename from calico-vpp-agent/prometheus/prometheus_test.go rename to pkg/calico-vpp-agent/prometheus/prometheus_test.go index 8e791b850..640eaf52f 100644 --- a/calico-vpp-agent/prometheus/prometheus_test.go +++ b/pkg/calico-vpp-agent/prometheus/prometheus_test.go @@ -31,11 +31,11 @@ import ( "go.fd.io/govpp/adapter/statsclient" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/prometheus" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/testutils" - agentConf "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/prometheus" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/testutils" + agentConf "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) // Names of integration tests arguments diff --git a/calico-vpp-agent/prometheus/stats_description.go b/pkg/calico-vpp-agent/prometheus/stats_description.go similarity index 100% rename from calico-vpp-agent/prometheus/stats_description.go rename to pkg/calico-vpp-agent/prometheus/stats_description.go diff --git a/calico-vpp-agent/routing/bgp_watcher.go b/pkg/calico-vpp-agent/routing/bgp_watcher.go similarity index 98% rename from calico-vpp-agent/routing/bgp_watcher.go rename to pkg/calico-vpp-agent/routing/bgp_watcher.go index 96aa1975c..1fcb5cda6 100644 --- a/calico-vpp-agent/routing/bgp_watcher.go +++ b/pkg/calico-vpp-agent/routing/bgp_watcher.go @@ -26,12 +26,12 @@ import ( "gopkg.in/tomb.v2" calicov3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" // needed for GoBGP building (in ../Makefile, gobgp target) _ "github.com/inconshreveable/mousetrap" diff --git a/calico-vpp-agent/routing/routing_server.go b/pkg/calico-vpp-agent/routing/routing_server.go similarity index 97% rename from calico-vpp-agent/routing/routing_server.go rename to pkg/calico-vpp-agent/routing/routing_server.go index 7defdf829..56fd0af61 100644 --- a/calico-vpp-agent/routing/routing_server.go +++ b/pkg/calico-vpp-agent/routing/routing_server.go @@ -29,10 +29,10 @@ import ( "github.com/vishvananda/netlink" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) const ( diff --git a/calico-vpp-agent/routing/routing_server_init.go b/pkg/calico-vpp-agent/routing/routing_server_init.go similarity index 98% rename from calico-vpp-agent/routing/routing_server_init.go rename to pkg/calico-vpp-agent/routing/routing_server_init.go index 72f62b4c4..2cca1627f 100644 --- a/calico-vpp-agent/routing/routing_server_init.go +++ b/pkg/calico-vpp-agent/routing/routing_server_init.go @@ -21,7 +21,7 @@ import ( bgpapi "github.com/osrg/gobgp/v3/api" "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" ) func (s *Server) createEmptyPrefixSet(name string) error { diff --git a/calico-vpp-agent/services/service.go b/pkg/calico-vpp-agent/services/service.go similarity index 92% rename from calico-vpp-agent/services/service.go rename to pkg/calico-vpp-agent/services/service.go index 79b48fbd8..c407b53f6 100644 --- a/calico-vpp-agent/services/service.go +++ b/pkg/calico-vpp-agent/services/service.go @@ -15,7 +15,7 @@ package services -import "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" +import "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" type lbType string diff --git a/calico-vpp-agent/services/service_handler.go b/pkg/calico-vpp-agent/services/service_handler.go similarity index 97% rename from calico-vpp-agent/services/service_handler.go rename to pkg/calico-vpp-agent/services/service_handler.go index eedf92948..563cbfb97 100644 --- a/calico-vpp-agent/services/service_handler.go +++ b/pkg/calico-vpp-agent/services/service_handler.go @@ -24,11 +24,11 @@ import ( discoveryv1 "k8s.io/api/discovery/v1" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func getCnatBackendDstPort(servicePort *v1.ServicePort, endpointPort *discoveryv1.EndpointPort) int32 { diff --git a/calico-vpp-agent/services/service_server.go b/pkg/calico-vpp-agent/services/service_server.go similarity index 98% rename from calico-vpp-agent/services/service_server.go rename to pkg/calico-vpp-agent/services/service_server.go index 445408dfd..49e4c2082 100644 --- a/calico-vpp-agent/services/service_server.go +++ b/pkg/calico-vpp-agent/services/service_server.go @@ -34,11 +34,11 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) /** diff --git a/calico-vpp-agent/services/services_test.go b/pkg/calico-vpp-agent/services/services_test.go similarity index 98% rename from calico-vpp-agent/services/services_test.go rename to pkg/calico-vpp-agent/services/services_test.go index e7c7f24cb..ebaa01c6a 100644 --- a/calico-vpp-agent/services/services_test.go +++ b/pkg/calico-vpp-agent/services/services_test.go @@ -9,11 +9,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/testutils" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/testutils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" "github.com/sirupsen/logrus" apiv1 "k8s.io/api/core/v1" diff --git a/calico-vpp-agent/tests/mocks/calico/client.go b/pkg/calico-vpp-agent/tests/mocks/calico/client.go similarity index 100% rename from calico-vpp-agent/tests/mocks/calico/client.go rename to pkg/calico-vpp-agent/tests/mocks/calico/client.go diff --git a/calico-vpp-agent/tests/mocks/calico/ipam.go b/pkg/calico-vpp-agent/tests/mocks/calico/ipam.go similarity index 100% rename from calico-vpp-agent/tests/mocks/calico/ipam.go rename to pkg/calico-vpp-agent/tests/mocks/calico/ipam.go diff --git a/calico-vpp-agent/tests/mocks/calico/ippools.go b/pkg/calico-vpp-agent/tests/mocks/calico/ippools.go similarity index 100% rename from calico-vpp-agent/tests/mocks/calico/ippools.go rename to pkg/calico-vpp-agent/tests/mocks/calico/ippools.go diff --git a/calico-vpp-agent/tests/mocks/calico/nodes.go b/pkg/calico-vpp-agent/tests/mocks/calico/nodes.go similarity index 100% rename from calico-vpp-agent/tests/mocks/calico/nodes.go rename to pkg/calico-vpp-agent/tests/mocks/calico/nodes.go diff --git a/calico-vpp-agent/tests/mocks/ipam.go b/pkg/calico-vpp-agent/tests/mocks/ipam.go similarity index 100% rename from calico-vpp-agent/tests/mocks/ipam.go rename to pkg/calico-vpp-agent/tests/mocks/ipam.go diff --git a/calico-vpp-agent/tests/mocks/pubsub_handler.go b/pkg/calico-vpp-agent/tests/mocks/pubsub_handler.go similarity index 96% rename from calico-vpp-agent/tests/mocks/pubsub_handler.go rename to pkg/calico-vpp-agent/tests/mocks/pubsub_handler.go index 61ee919b7..4483b68bc 100644 --- a/calico-vpp-agent/tests/mocks/pubsub_handler.go +++ b/pkg/calico-vpp-agent/tests/mocks/pubsub_handler.go @@ -16,7 +16,7 @@ package mocks import ( "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" ) // PubSubHandlerMock is mocking the handlers registering to common.ThePubSub diff --git a/calico-vpp-agent/testutils/testutils.go b/pkg/calico-vpp-agent/testutils/testutils.go similarity index 96% rename from calico-vpp-agent/testutils/testutils.go rename to pkg/calico-vpp-agent/testutils/testutils.go index 423dd309f..db8382334 100644 --- a/calico-vpp-agent/testutils/testutils.go +++ b/pkg/calico-vpp-agent/testutils/testutils.go @@ -40,17 +40,17 @@ import ( apiv3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3" cniproto "github.com/projectcalico/calico/cni-plugin/pkg/dataplane/grpc/proto" "github.com/projectcalico/calico/libcalico-go/lib/options" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/model" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/podinterface" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/connectivity" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks/calico" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/multinet-monitor/multinettypes" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/model" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/podinterface" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/connectivity" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/tests/mocks/calico" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/multinet-monitor/multinettypes" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/calico-vpp-agent/watchers/bgp_configuration_watcher.go b/pkg/calico-vpp-agent/watchers/bgp_configuration_watcher.go similarity index 97% rename from calico-vpp-agent/watchers/bgp_configuration_watcher.go rename to pkg/calico-vpp-agent/watchers/bgp_configuration_watcher.go index 87534725c..8d5f39639 100644 --- a/calico-vpp-agent/watchers/bgp_configuration_watcher.go +++ b/pkg/calico-vpp-agent/watchers/bgp_configuration_watcher.go @@ -28,8 +28,8 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) type BGPConfigurationWatcher struct { diff --git a/calico-vpp-agent/watchers/bgpfilter_watcher.go b/pkg/calico-vpp-agent/watchers/bgpfilter_watcher.go similarity index 98% rename from calico-vpp-agent/watchers/bgpfilter_watcher.go rename to pkg/calico-vpp-agent/watchers/bgpfilter_watcher.go index b466fd5bc..128ec0e1b 100644 --- a/calico-vpp-agent/watchers/bgpfilter_watcher.go +++ b/pkg/calico-vpp-agent/watchers/bgpfilter_watcher.go @@ -31,7 +31,7 @@ import ( "github.com/projectcalico/calico/libcalico-go/lib/options" "github.com/projectcalico/calico/libcalico-go/lib/watch" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" ) type BGPFilterWatcher struct { diff --git a/calico-vpp-agent/watchers/common.go b/pkg/calico-vpp-agent/watchers/common.go similarity index 100% rename from calico-vpp-agent/watchers/common.go rename to pkg/calico-vpp-agent/watchers/common.go diff --git a/calico-vpp-agent/watchers/net_watcher.go b/pkg/calico-vpp-agent/watchers/net_watcher.go similarity index 97% rename from calico-vpp-agent/watchers/net_watcher.go rename to pkg/calico-vpp-agent/watchers/net_watcher.go index 654222820..20c85372c 100644 --- a/calico-vpp-agent/watchers/net_watcher.go +++ b/pkg/calico-vpp-agent/watchers/net_watcher.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/watch" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - networkv3 "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/network" - nadv1 "github.com/projectcalico/vpp-dataplane/v3/multinet-monitor/multinettypes" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + networkv3 "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/network" + nadv1 "github.com/projectcalico/vpp-dataplane/v3/pkg/multinet-monitor/multinettypes" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) type VRF struct { diff --git a/calico-vpp-agent/watchers/peers_watcher.go b/pkg/calico-vpp-agent/watchers/peers_watcher.go similarity index 99% rename from calico-vpp-agent/watchers/peers_watcher.go rename to pkg/calico-vpp-agent/watchers/peers_watcher.go index a7d3d1ade..07de8c068 100644 --- a/calico-vpp-agent/watchers/peers_watcher.go +++ b/pkg/calico-vpp-agent/watchers/peers_watcher.go @@ -38,8 +38,8 @@ import ( "github.com/projectcalico/calico/libcalico-go/lib/selector" "github.com/projectcalico/calico/libcalico-go/lib/watch" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) type LocalBGPPeer struct { diff --git a/calico-vpp-agent/watchers/prefix_watcher.go b/pkg/calico-vpp-agent/watchers/prefix_watcher.go similarity index 98% rename from calico-vpp-agent/watchers/prefix_watcher.go rename to pkg/calico-vpp-agent/watchers/prefix_watcher.go index 7f8041f72..fb008f167 100644 --- a/calico-vpp-agent/watchers/prefix_watcher.go +++ b/pkg/calico-vpp-agent/watchers/prefix_watcher.go @@ -31,8 +31,8 @@ import ( "github.com/projectcalico/calico/libcalico-go/lib/options" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) type PrefixWatcher struct { diff --git a/calico-vpp-agent/watchers/secret_watcher.go b/pkg/calico-vpp-agent/watchers/secret_watcher.go similarity index 100% rename from calico-vpp-agent/watchers/secret_watcher.go rename to pkg/calico-vpp-agent/watchers/secret_watcher.go diff --git a/calico-vpp-agent/watchers/srv6_localsid_watcher.go b/pkg/calico-vpp-agent/watchers/srv6_localsid_watcher.go similarity index 90% rename from calico-vpp-agent/watchers/srv6_localsid_watcher.go rename to pkg/calico-vpp-agent/watchers/srv6_localsid_watcher.go index c62e11f1b..984a817b5 100644 --- a/calico-vpp-agent/watchers/srv6_localsid_watcher.go +++ b/pkg/calico-vpp-agent/watchers/srv6_localsid_watcher.go @@ -12,11 +12,11 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type LocalSIDWatcher struct { diff --git a/calico-vpp-agent/watchers/uplink_link_watcher.go b/pkg/calico-vpp-agent/watchers/uplink_link_watcher.go similarity index 98% rename from calico-vpp-agent/watchers/uplink_link_watcher.go rename to pkg/calico-vpp-agent/watchers/uplink_link_watcher.go index 46cedb458..9bb3abcc8 100644 --- a/calico-vpp-agent/watchers/uplink_link_watcher.go +++ b/pkg/calico-vpp-agent/watchers/uplink_link_watcher.go @@ -23,7 +23,7 @@ import ( "github.com/vishvananda/netlink" "gopkg.in/tomb.v2" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" ) type LinkWatcher struct { diff --git a/calico-vpp-agent/watchers/uplink_route_watcher.go b/pkg/calico-vpp-agent/watchers/uplink_route_watcher.go similarity index 98% rename from calico-vpp-agent/watchers/uplink_route_watcher.go rename to pkg/calico-vpp-agent/watchers/uplink_route_watcher.go index 94c5b231a..2bbacb1e7 100644 --- a/calico-vpp-agent/watchers/uplink_route_watcher.go +++ b/pkg/calico-vpp-agent/watchers/uplink_route_watcher.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" "github.com/projectcalico/calico/felix/proto" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" diff --git a/config/config.go b/pkg/config/config.go similarity index 99% rename from config/config.go rename to pkg/config/config.go index f2e366568..c54abe090 100644 --- a/config/config.go +++ b/pkg/config/config.go @@ -34,8 +34,8 @@ import ( "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/config/config_parse.go b/pkg/config/config_parse.go similarity index 100% rename from config/config_parse.go rename to pkg/config/config_parse.go diff --git a/config/config_test.go b/pkg/config/config_test.go similarity index 100% rename from config/config_test.go rename to pkg/config/config_test.go diff --git a/config/default_hook.sh b/pkg/config/default_hook.sh similarity index 100% rename from config/default_hook.sh rename to pkg/config/default_hook.sh diff --git a/config/utils.go b/pkg/config/utils.go similarity index 100% rename from config/utils.go rename to pkg/config/utils.go diff --git a/pkg/multinet-monitor/Makefile b/pkg/multinet-monitor/Makefile new file mode 100644 index 000000000..95e102d9b --- /dev/null +++ b/pkg/multinet-monitor/Makefile @@ -0,0 +1,8 @@ +include ../../common.mk + +.PHONY: all +all: build + +.PHONY: build +build: + ${DOCKER_RUN} go build -o ./watcher ../../cmd/multinet-monitor diff --git a/multinet-monitor/multinettypes/multinettypes.go b/pkg/multinet-monitor/multinettypes/multinettypes.go similarity index 100% rename from multinet-monitor/multinettypes/multinettypes.go rename to pkg/multinet-monitor/multinettypes/multinettypes.go diff --git a/multinet-monitor/watcher.go b/pkg/multinet-monitor/watcher.go similarity index 98% rename from multinet-monitor/watcher.go rename to pkg/multinet-monitor/watcher.go index 29dd10f43..0dbb316bc 100644 --- a/multinet-monitor/watcher.go +++ b/pkg/multinet-monitor/watcher.go @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package main +package multinetmonitor import ( "context" @@ -22,8 +22,8 @@ import ( "time" netv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers" - nadv1 "github.com/projectcalico/vpp-dataplane/v3/multinet-monitor/multinettypes" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/watchers" + nadv1 "github.com/projectcalico/vpp-dataplane/v3/pkg/multinet-monitor/multinettypes" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" discoveryv1 "k8s.io/api/discovery/v1" @@ -46,7 +46,7 @@ var currentSvcList map[string]*v1.Service var currentEpSliceList map[string]*discoveryv1.EndpointSlice var currentNadMap map[string]string -func main() { +func Run() { log = logrus.New() currentPodList = make(map[string]*v1.Pod) diff --git a/vpp-manager/Makefile b/pkg/vpp-manager/Makefile similarity index 86% rename from vpp-manager/Makefile rename to pkg/vpp-manager/Makefile index 24ca04c0a..999de2309 100644 --- a/vpp-manager/Makefile +++ b/pkg/vpp-manager/Makefile @@ -1,18 +1,18 @@ -include ../common.mk +include ../../common.mk SHELL := /bin/bash VPPLINK_DIR=../vpplink -INIT_EKS_IMAGE_DIR=images/init-eks -DEV_IMAGE_DIR=images/dev -IMAGE_DIR=images/ubuntu -VCLSIDECAR_IMAGE_DIR=images/vclsidecar +INIT_EKS_IMAGE_DIR=../../images/init-eks +DEV_IMAGE_DIR=../../images/dev +IMAGE_DIR=../../images/ubuntu +VCLSIDECAR_IMAGE_DIR=../../images/vclsidecar -VPPDEV_FILE=../test/scripts/vppdev.sh +VPPDEV_FILE=../../test/scripts/vppdev.sh GENERATE_LOG_FILE=../vpplink/generated/generate.log ALSO_LATEST ?= n # If 'y' also tag images with :latest -VPP_DIR ?= $(CURDIR)/vpp_build +VPP_DIR ?= $(CURDIR)/../../vpp_build # temporary directory to build VPP in VERSION_FILE=$(VPP_DIR)/calicovppversion @@ -71,20 +71,17 @@ all: image build: mkdir -p $(IMAGE_DIR)/bin cp $(VPPDEV_FILE) $(IMAGE_DIR)/bin/vppdev.sh - ${DOCKER_RUN} go build $(COVER_OPTS) -o $(IMAGE_DIR)/bin/vpp-manager + cp $(INIT_EKS_IMAGE_DIR)/init_eks.sh $(IMAGE_DIR)/bin/init_eks.sh + cp $(INIT_EKS_IMAGE_DIR)/entrypoint.sh $(IMAGE_DIR)/bin/init_eks_entrypoint.sh + ${DOCKER_RUN} go build $(COVER_OPTS) -o $(IMAGE_DIR)/bin/vpp-manager ../../cmd/vpp-manager + ${DOCKER_RUN} go build $(COVER_OPTS) -o $(IMAGE_DIR)/bin/calico-vpp-agent ../../cmd/calico-vpp-agent + ${DOCKER_RUN} go build $(COVER_OPTS) -o $(IMAGE_DIR)/bin/felix-api-proxy ../../cmd/api-proxy + ${DOCKER_RUN} go build -o $(IMAGE_DIR)/bin/gobgp github.com/osrg/gobgp/v3/cmd/gobgp/ + ${DOCKER_RUN} go build -o $(IMAGE_DIR)/bin/multinet-monitor ../../cmd/multinet-monitor .PHONY: mock-pod-image mock-pod-image: - docker build $(DOCKER_BUILD_ARGS) -t ${MOCK_POD_IMAGE} images/mock-pod - -.PHONY: eks-image -eks-image: - docker build --pull $(DOCKER_BUILD_ARGS) \ - -t calicovpp/init-eks:$(TAG) $(INIT_EKS_IMAGE_DIR) - @if [ "${ALSO_LATEST}" = "y" ]; then \ - docker tag calicovpp/init-eks:$(TAG) calicovpp/init-eks:latest; \ - docker tag calicovpp/init-eks:$(TAG) calicovpp/init-eks:prerelease; \ - fi + docker build $(DOCKER_BUILD_ARGS) -t ${MOCK_POD_IMAGE} ../../images/mock-pod .PHONY: vclsidecar-image vclsidecar-image: ${VPP_TARBALL} @@ -105,7 +102,7 @@ vpp-image: build ${VPP_TARBALL} rm -rf $(IMAGE_DIR)/artifacts tar -xvf ${VPP_TARBALL} -C $(IMAGE_DIR) docker build --pull $(DOCKER_BUILD_ARGS) \ - -t calicovpp/vpp:$(TAG) $(IMAGE_DIR) + -t calicovpp/vpp:$(TAG) -f $(IMAGE_DIR)/Dockerfile $(IMAGE_DIR) docker build --pull $(DOCKER_BUILD_ARGS) \ --build-arg WITH_GDB=${WITH_GDB} \ -t calicovpp/vpp:dbg-$(TAG) -f $(IMAGE_DIR)/Dockerfile.debug $(IMAGE_DIR) @@ -116,7 +113,7 @@ vpp-image: build ${VPP_TARBALL} rm -rf $(IMAGE_DIR)/artifacts .PHONY: image -image: vpp-image eks-image vclsidecar-image +image: vpp-image vclsidecar-image .PHONY: image-cov image-cov: build-cov ${VPP_TARBALL} @@ -124,14 +121,13 @@ image-cov: build-cov ${VPP_TARBALL} tar -xvf ${VPP_TARBALL} -C $(IMAGE_DIR) @cp $(VPPDEV_FILE) $(IMAGE_DIR) docker build --pull $(DOCKER_BUILD_ARGS) \ - -t calicovpp/vpp:$(TAG) $(IMAGE_DIR) + -t calicovpp/vpp:$(TAG) -f $(IMAGE_DIR)/Dockerfile $(IMAGE_DIR) .PHONY: push push: ${PUSH_DEP} set -e; for registry in ${REGISTRIES}; do \ docker tag calicovpp/vpp:$(TAG) $${registry}calicovpp/vpp:$(TAG); \ docker tag calicovpp/vpp:dbg-$(TAG) $${registry}calicovpp/vpp:dbg-$(TAG); \ - docker tag calicovpp/init-eks:$(TAG) $${registry}calicovpp/init-eks:$(TAG); \ docker tag calicovpp/vclsidecar:$(TAG) $${registry}calicovpp/vclsidecar:$(TAG); \ docker tag calicovpp/vclsidecar:dbg-$(TAG) $${registry}calicovpp/vclsidecar:dbg-$(TAG); \ \ @@ -139,14 +135,10 @@ push: ${PUSH_DEP} docker tag calicovpp/vpp:$(TAG) $${registry}calicovpp/vpp:latest; \ docker tag calicovpp/vpp:$(TAG) $${registry}calicovpp/vpp:prerelease; \ \ - docker tag calicovpp/init-eks:$(TAG) $${registry}calicovpp/init-eks:latest; \ - docker tag calicovpp/init-eks:$(TAG) $${registry}calicovpp/init-eks:prerelease; \ - \ docker tag calicovpp/vclsidecar:$(TAG) $${registry}calicovpp/vclsidecar:latest; \ docker tag calicovpp/vclsidecar:$(TAG) $${registry}calicovpp/vclsidecar:prerelease; \ fi; \ docker push --all-tags $${registry}calicovpp/vpp; \ - docker push --all-tags $${registry}calicovpp/init-eks; \ docker push --all-tags $${registry}calicovpp/vclsidecar; \ done @@ -155,7 +147,7 @@ clean: clean-vpp .PHONY: clone-vpp clone-vpp: - BASE=$(BASE) bash $(VPPLINK_DIR)/generated/vpp_clone_current.sh ./vpp_build + BASE=$(BASE) bash $(VPPLINK_DIR)/generated/vpp_clone_current.sh $(VPP_DIR) .PHONY: clean-vpp clean-vpp: @@ -222,7 +214,7 @@ version-file: .PHONY: vpp-build-env vpp-build-env: docker build $(DOCKER_BUILD_ARGS) \ - -t calicovpp/vpp-build:latest images/ubuntu-build + -t calicovpp/vpp-build:latest ../../images/ubuntu-build .PHONY: dev dev: build diff --git a/vpp-manager/README.md b/pkg/vpp-manager/README.md similarity index 100% rename from vpp-manager/README.md rename to pkg/vpp-manager/README.md diff --git a/vpp-manager/hooks/network_manager_hook.go b/pkg/vpp-manager/hooks/network_manager_hook.go similarity index 99% rename from vpp-manager/hooks/network_manager_hook.go rename to pkg/vpp-manager/hooks/network_manager_hook.go index 8da878d39..f699bfaba 100644 --- a/vpp-manager/hooks/network_manager_hook.go +++ b/pkg/vpp-manager/hooks/network_manager_hook.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" "github.com/sirupsen/logrus" ) diff --git a/vpp-manager/main.go b/pkg/vpp-manager/main.go similarity index 95% rename from vpp-manager/main.go rename to pkg/vpp-manager/main.go index 9429defed..9c196fa3d 100644 --- a/vpp-manager/main.go +++ b/pkg/vpp-manager/main.go @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package main +package vppmanager import ( "context" @@ -23,11 +23,11 @@ import ( "syscall" "time" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/hooks" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/startup" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/uplink" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/hooks" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/startup" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/uplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" "github.com/sirupsen/logrus" ) @@ -149,7 +149,7 @@ func makeNewVPPIndex() { VPPgotTimeout[currentVPPIndex] = false } -func main() { +func Run() { log = logrus.New() vppDeadChan = make(chan bool, 1) diff --git a/vpp-manager/startup/interface_config.go b/pkg/vpp-manager/startup/interface_config.go similarity index 97% rename from vpp-manager/startup/interface_config.go rename to pkg/vpp-manager/startup/interface_config.go index 1e931d9d0..1a90e4a80 100644 --- a/vpp-manager/startup/interface_config.go +++ b/pkg/vpp-manager/startup/interface_config.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" ) func GetInterfaceConfig(params *config.VppManagerParams) (conf []*config.LinuxInterfaceState, err error) { diff --git a/vpp-manager/startup/startup.go b/pkg/vpp-manager/startup/startup.go similarity index 97% rename from vpp-manager/startup/startup.go rename to pkg/vpp-manager/startup/startup.go index 77fe0909d..3b1ba6072 100644 --- a/vpp-manager/startup/startup.go +++ b/pkg/vpp-manager/startup/startup.go @@ -20,8 +20,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" ) func NewVppManagerParams() *config.VppManagerParams { diff --git a/vpp-manager/uplink/af_packet.go b/pkg/vpp-manager/uplink/af_packet.go similarity index 92% rename from vpp-manager/uplink/af_packet.go rename to pkg/vpp-manager/uplink/af_packet.go index 1289e356e..05f80df1a 100644 --- a/vpp-manager/uplink/af_packet.go +++ b/pkg/vpp-manager/uplink/af_packet.go @@ -22,11 +22,11 @@ import ( log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/af_packet" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/af_packet" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type AFPacketDriver struct { diff --git a/vpp-manager/uplink/af_xdp.go b/pkg/vpp-manager/uplink/af_xdp.go similarity index 95% rename from vpp-manager/uplink/af_xdp.go rename to pkg/vpp-manager/uplink/af_xdp.go index 4b9d5ab0b..5702fa8ee 100644 --- a/vpp-manager/uplink/af_xdp.go +++ b/pkg/vpp-manager/uplink/af_xdp.go @@ -20,10 +20,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/vpp-manager/uplink/common.go b/pkg/vpp-manager/uplink/common.go similarity index 96% rename from vpp-manager/uplink/common.go rename to pkg/vpp-manager/uplink/common.go index 738a96dbe..37cfe6289 100644 --- a/vpp-manager/uplink/common.go +++ b/pkg/vpp-manager/uplink/common.go @@ -24,10 +24,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/vpp-manager/uplink/default.go b/pkg/vpp-manager/uplink/default.go similarity index 94% rename from vpp-manager/uplink/default.go rename to pkg/vpp-manager/uplink/default.go index 507254ae8..07a9b52e1 100644 --- a/vpp-manager/uplink/default.go +++ b/pkg/vpp-manager/uplink/default.go @@ -20,9 +20,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) type DefaultDriver struct { diff --git a/vpp-manager/uplink/dpdk.go b/pkg/vpp-manager/uplink/dpdk.go similarity index 96% rename from vpp-manager/uplink/dpdk.go rename to pkg/vpp-manager/uplink/dpdk.go index 2b76fbd3e..d1de744d4 100644 --- a/vpp-manager/uplink/dpdk.go +++ b/pkg/vpp-manager/uplink/dpdk.go @@ -25,10 +25,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type DPDKDriver struct { diff --git a/vpp-manager/uplink/rdma.go b/pkg/vpp-manager/uplink/rdma.go similarity index 91% rename from vpp-manager/uplink/rdma.go rename to pkg/vpp-manager/uplink/rdma.go index 8862e835d..5644ec26e 100644 --- a/vpp-manager/uplink/rdma.go +++ b/pkg/vpp-manager/uplink/rdma.go @@ -19,10 +19,10 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type RDMADriver struct { diff --git a/vpp-manager/uplink/virtio.go b/pkg/vpp-manager/uplink/virtio.go similarity index 94% rename from vpp-manager/uplink/virtio.go rename to pkg/vpp-manager/uplink/virtio.go index d27d98d68..a2dd19a28 100644 --- a/vpp-manager/uplink/virtio.go +++ b/pkg/vpp-manager/uplink/virtio.go @@ -19,10 +19,10 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type VirtioDriver struct { diff --git a/vpp-manager/uplink/vmxnet3.go b/pkg/vpp-manager/uplink/vmxnet3.go similarity index 93% rename from vpp-manager/uplink/vmxnet3.go rename to pkg/vpp-manager/uplink/vmxnet3.go index eeaea3893..0e21c8a2d 100644 --- a/vpp-manager/uplink/vmxnet3.go +++ b/pkg/vpp-manager/uplink/vmxnet3.go @@ -19,10 +19,10 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type Vmxnet3Driver struct { diff --git a/vpp-manager/utils/utils.go b/pkg/vpp-manager/utils/utils.go similarity index 99% rename from vpp-manager/utils/utils.go rename to pkg/vpp-manager/utils/utils.go index aaca5c297..9aefc2266 100644 --- a/vpp-manager/utils/utils.go +++ b/pkg/vpp-manager/utils/utils.go @@ -43,8 +43,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" ) func IsDriverLoaded(driver string) (bool, error) { diff --git a/vpp-manager/utils/utils_test.go b/pkg/vpp-manager/utils/utils_test.go similarity index 100% rename from vpp-manager/utils/utils_test.go rename to pkg/vpp-manager/utils/utils_test.go diff --git a/vpp-manager/vpp_runner.go b/pkg/vpp-manager/vpp_runner.go similarity index 98% rename from vpp-manager/vpp_runner.go rename to pkg/vpp-manager/vpp_runner.go index b3caa42a8..2097b0fa7 100644 --- a/vpp-manager/vpp_runner.go +++ b/pkg/vpp-manager/vpp_runner.go @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package main +package vppmanager import ( "context" @@ -33,14 +33,14 @@ import ( calicoopts "github.com/projectcalico/calico/libcalico-go/lib/options" "github.com/vishvananda/netlink" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/podinterface" - "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common" - "github.com/projectcalico/vpp-dataplane/v3/config" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/hooks" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/uplink" - "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/utils" - "github.com/projectcalico/vpp-dataplane/v3/vpplink" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/cni/podinterface" + "github.com/projectcalico/vpp-dataplane/v3/pkg/calico-vpp-agent/common" + "github.com/projectcalico/vpp-dataplane/v3/pkg/config" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/hooks" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/uplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpp-manager/utils" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type VppRunner struct { diff --git a/vpplink/abf.go b/pkg/vpplink/abf.go similarity index 89% rename from vpplink/abf.go rename to pkg/vpplink/abf.go index da7028091..2bfac9490 100644 --- a/vpplink/abf.go +++ b/pkg/vpplink/abf.go @@ -18,10 +18,10 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/abf" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/abf" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) var ( diff --git a/vpplink/acl.go b/pkg/vpplink/acl.go similarity index 86% rename from vpplink/acl.go rename to pkg/vpplink/acl.go index 95ed00012..ae5d413d5 100644 --- a/vpplink/acl.go +++ b/pkg/vpplink/acl.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - vppacl "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/acl" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/acl_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + vppacl "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/acl" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/acl_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) AddACL(acl *types.ACL) error { diff --git a/vpplink/addr.go b/pkg/vpplink/addr.go similarity index 93% rename from vpplink/addr.go rename to pkg/vpplink/addr.go index aa576e741..770a30f86 100644 --- a/vpplink/addr.go +++ b/pkg/vpplink/addr.go @@ -18,7 +18,7 @@ package vpplink import ( "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func IsIP4(ip net.IP) bool { diff --git a/vpplink/af_packet.go b/pkg/vpplink/af_packet.go similarity index 89% rename from vpplink/af_packet.go rename to pkg/vpplink/af_packet.go index 14d776e6c..060664984 100644 --- a/vpplink/af_packet.go +++ b/pkg/vpplink/af_packet.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/af_packet" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/af_packet" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) CreateAfPacket(intf *types.AfPacketInterface) (swIfIndex uint32, err error) { diff --git a/vpplink/af_xdp.go b/pkg/vpplink/af_xdp.go similarity index 87% rename from vpplink/af_xdp.go rename to pkg/vpplink/af_xdp.go index 78126ee8c..0644e697d 100644 --- a/vpplink/af_xdp.go +++ b/pkg/vpplink/af_xdp.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/af_xdp" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/af_xdp" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) CreateAfXDP(intf *types.VppXDPInterface) error { diff --git a/vpplink/arp.go b/pkg/vpplink/arp.go similarity index 85% rename from vpplink/arp.go rename to pkg/vpplink/arp.go index ba3a4c54d..93af734fd 100644 --- a/vpplink/arp.go +++ b/pkg/vpplink/arp.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/arp" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/arp" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" ) func (v *VppLink) EnableArpProxy(swIfIndex, tableID uint32) error { diff --git a/vpplink/classify.go b/pkg/vpplink/classify.go similarity index 94% rename from vpplink/classify.go rename to pkg/vpplink/classify.go index 3a57eb0ec..2c7989390 100644 --- a/vpplink/classify.go +++ b/pkg/vpplink/classify.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/classify" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/classify" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) addDelClassifyTable(table *types.ClassifyTable, action types.ClassifyAction) (uint32, error) { diff --git a/vpplink/cnat.go b/pkg/vpplink/cnat.go similarity index 95% rename from vpplink/cnat.go rename to pkg/vpplink/cnat.go index b873f4aa9..f5023a7c1 100644 --- a/vpplink/cnat.go +++ b/pkg/vpplink/cnat.go @@ -19,10 +19,10 @@ import ( "fmt" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/cnat" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/cnat" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/vpplink/crypto_sw_scheduler.go b/pkg/vpplink/crypto_sw_scheduler.go similarity index 91% rename from vpplink/crypto_sw_scheduler.go rename to pkg/vpplink/crypto_sw_scheduler.go index ade375ff8..8d23007c6 100644 --- a/vpplink/crypto_sw_scheduler.go +++ b/pkg/vpplink/crypto_sw_scheduler.go @@ -18,7 +18,7 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/crypto_sw_scheduler" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/crypto_sw_scheduler" ) func (v *VppLink) SetCryptoWorker(workerIndex uint32, enable bool) error { diff --git a/vpplink/feature.go b/pkg/vpplink/feature.go similarity index 94% rename from vpplink/feature.go rename to pkg/vpplink/feature.go index 8a5e37991..6cd777dc9 100644 --- a/vpplink/feature.go +++ b/pkg/vpplink/feature.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/feature" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/feature" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" ) func (v *VppLink) featureEnableDisable(swIfIndex uint32, isEnable bool, arcName, featureName string) error { diff --git a/vpplink/generated/.gitignore b/pkg/vpplink/generated/.gitignore similarity index 100% rename from vpplink/generated/.gitignore rename to pkg/vpplink/generated/.gitignore diff --git a/vpplink/generated/bindings/abf/abf.ba.go b/pkg/vpplink/generated/bindings/abf/abf.ba.go similarity index 98% rename from vpplink/generated/bindings/abf/abf.ba.go rename to pkg/vpplink/generated/bindings/abf/abf.ba.go index 5d2eb9d46..6fa132688 100644 --- a/vpplink/generated/bindings/abf/abf.ba.go +++ b/pkg/vpplink/generated/bindings/abf/abf.ba.go @@ -8,9 +8,9 @@ package abf import ( - fib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + fib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/abf/abf_rpc.ba.go b/pkg/vpplink/generated/bindings/abf/abf_rpc.ba.go similarity index 97% rename from vpplink/generated/bindings/abf/abf_rpc.ba.go rename to pkg/vpplink/generated/bindings/abf/abf_rpc.ba.go index c97f94a2a..42a3160c0 100644 --- a/vpplink/generated/bindings/abf/abf_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/abf/abf_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/acl/acl.ba.go b/pkg/vpplink/generated/bindings/acl/acl.ba.go similarity index 99% rename from vpplink/generated/bindings/acl/acl.ba.go rename to pkg/vpplink/generated/bindings/acl/acl.ba.go index 02e3386c3..2aae5471e 100644 --- a/vpplink/generated/bindings/acl/acl.ba.go +++ b/pkg/vpplink/generated/bindings/acl/acl.ba.go @@ -7,10 +7,10 @@ package acl import ( - acl_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/acl_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + acl_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/acl_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/acl/acl_rpc.ba.go b/pkg/vpplink/generated/bindings/acl/acl_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/acl/acl_rpc.ba.go rename to pkg/vpplink/generated/bindings/acl/acl_rpc.ba.go index 2424cdd94..4f8455ceb 100644 --- a/vpplink/generated/bindings/acl/acl_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/acl/acl_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/acl_types/acl_types.ba.go b/pkg/vpplink/generated/bindings/acl_types/acl_types.ba.go similarity index 93% rename from vpplink/generated/bindings/acl_types/acl_types.ba.go rename to pkg/vpplink/generated/bindings/acl_types/acl_types.ba.go index 4d7f61e59..ed67c4a75 100644 --- a/vpplink/generated/bindings/acl_types/acl_types.ba.go +++ b/pkg/vpplink/generated/bindings/acl_types/acl_types.ba.go @@ -10,8 +10,8 @@ package acl_types import ( "strconv" - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/af_packet/af_packet.ba.go b/pkg/vpplink/generated/bindings/af_packet/af_packet.ba.go similarity index 99% rename from vpplink/generated/bindings/af_packet/af_packet.ba.go rename to pkg/vpplink/generated/bindings/af_packet/af_packet.ba.go index 341ddb759..c9e7887ab 100644 --- a/vpplink/generated/bindings/af_packet/af_packet.ba.go +++ b/pkg/vpplink/generated/bindings/af_packet/af_packet.ba.go @@ -10,8 +10,8 @@ package af_packet import ( "strconv" - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/af_packet/af_packet_rpc.ba.go b/pkg/vpplink/generated/bindings/af_packet/af_packet_rpc.ba.go similarity index 97% rename from vpplink/generated/bindings/af_packet/af_packet_rpc.ba.go rename to pkg/vpplink/generated/bindings/af_packet/af_packet_rpc.ba.go index 021ce6e72..ca51b599d 100644 --- a/vpplink/generated/bindings/af_packet/af_packet_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/af_packet/af_packet_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/af_xdp/af_xdp.ba.go b/pkg/vpplink/generated/bindings/af_xdp/af_xdp.ba.go similarity index 98% rename from vpplink/generated/bindings/af_xdp/af_xdp.ba.go rename to pkg/vpplink/generated/bindings/af_xdp/af_xdp.ba.go index 392a014c5..c75b3de83 100644 --- a/vpplink/generated/bindings/af_xdp/af_xdp.ba.go +++ b/pkg/vpplink/generated/bindings/af_xdp/af_xdp.ba.go @@ -10,7 +10,7 @@ package af_xdp import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/af_xdp/af_xdp_rpc.ba.go b/pkg/vpplink/generated/bindings/af_xdp/af_xdp_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/af_xdp/af_xdp_rpc.ba.go rename to pkg/vpplink/generated/bindings/af_xdp/af_xdp_rpc.ba.go diff --git a/vpplink/generated/bindings/arp/arp.ba.go b/pkg/vpplink/generated/bindings/arp/arp.ba.go similarity index 97% rename from vpplink/generated/bindings/arp/arp.ba.go rename to pkg/vpplink/generated/bindings/arp/arp.ba.go index 30f82e719..4bcf8621c 100644 --- a/vpplink/generated/bindings/arp/arp.ba.go +++ b/pkg/vpplink/generated/bindings/arp/arp.ba.go @@ -8,9 +8,9 @@ package arp import ( - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/arp/arp_rpc.ba.go b/pkg/vpplink/generated/bindings/arp/arp_rpc.ba.go similarity index 97% rename from vpplink/generated/bindings/arp/arp_rpc.ba.go rename to pkg/vpplink/generated/bindings/arp/arp_rpc.ba.go index 9cd1933d7..e29d8c5d6 100644 --- a/vpplink/generated/bindings/arp/arp_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/arp/arp_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/classify/classify.ba.go b/pkg/vpplink/generated/bindings/classify/classify.ba.go similarity index 99% rename from vpplink/generated/bindings/classify/classify.ba.go rename to pkg/vpplink/generated/bindings/classify/classify.ba.go index 3034bc348..6489c4e16 100644 --- a/vpplink/generated/bindings/classify/classify.ba.go +++ b/pkg/vpplink/generated/bindings/classify/classify.ba.go @@ -10,7 +10,7 @@ package classify import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/classify/classify_rpc.ba.go b/pkg/vpplink/generated/bindings/classify/classify_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/classify/classify_rpc.ba.go rename to pkg/vpplink/generated/bindings/classify/classify_rpc.ba.go index a75f70757..1d6fa2853 100644 --- a/vpplink/generated/bindings/classify/classify_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/classify/classify_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/cnat/cnat.ba.go b/pkg/vpplink/generated/bindings/cnat/cnat.ba.go similarity index 98% rename from vpplink/generated/bindings/cnat/cnat.ba.go rename to pkg/vpplink/generated/bindings/cnat/cnat.ba.go index f952755cf..9e323bc79 100644 --- a/vpplink/generated/bindings/cnat/cnat.ba.go +++ b/pkg/vpplink/generated/bindings/cnat/cnat.ba.go @@ -11,12 +11,12 @@ package cnat import ( "strconv" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/mfib_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/mfib_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/cnat/cnat_rpc.ba.go b/pkg/vpplink/generated/bindings/cnat/cnat_rpc.ba.go similarity index 98% rename from vpplink/generated/bindings/cnat/cnat_rpc.ba.go rename to pkg/vpplink/generated/bindings/cnat/cnat_rpc.ba.go index 0b4de8ed1..9b53d2806 100644 --- a/vpplink/generated/bindings/cnat/cnat_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/cnat/cnat_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler.ba.go b/pkg/vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler.ba.go similarity index 100% rename from vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler.ba.go rename to pkg/vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler.ba.go diff --git a/vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler_rpc.ba.go b/pkg/vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler_rpc.ba.go rename to pkg/vpplink/generated/bindings/crypto_sw_scheduler/crypto_sw_scheduler_rpc.ba.go diff --git a/vpplink/generated/bindings/ethernet_types/ethernet_types.ba.go b/pkg/vpplink/generated/bindings/ethernet_types/ethernet_types.ba.go similarity index 100% rename from vpplink/generated/bindings/ethernet_types/ethernet_types.ba.go rename to pkg/vpplink/generated/bindings/ethernet_types/ethernet_types.ba.go diff --git a/vpplink/generated/bindings/feature/feature.ba.go b/pkg/vpplink/generated/bindings/feature/feature.ba.go similarity index 98% rename from vpplink/generated/bindings/feature/feature.ba.go rename to pkg/vpplink/generated/bindings/feature/feature.ba.go index 1c526504b..a2ba3de54 100644 --- a/vpplink/generated/bindings/feature/feature.ba.go +++ b/pkg/vpplink/generated/bindings/feature/feature.ba.go @@ -7,7 +7,7 @@ package feature import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/feature/feature_rpc.ba.go b/pkg/vpplink/generated/bindings/feature/feature_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/feature/feature_rpc.ba.go rename to pkg/vpplink/generated/bindings/feature/feature_rpc.ba.go diff --git a/vpplink/generated/bindings/fib_types/fib_types.ba.go b/pkg/vpplink/generated/bindings/fib_types/fib_types.ba.go similarity index 98% rename from vpplink/generated/bindings/fib_types/fib_types.ba.go rename to pkg/vpplink/generated/bindings/fib_types/fib_types.ba.go index 7d03c6138..16e0ac7c5 100644 --- a/vpplink/generated/bindings/fib_types/fib_types.ba.go +++ b/pkg/vpplink/generated/bindings/fib_types/fib_types.ba.go @@ -10,7 +10,7 @@ package fib_types import ( "strconv" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/gso/gso.ba.go b/pkg/vpplink/generated/bindings/gso/gso.ba.go similarity index 97% rename from vpplink/generated/bindings/gso/gso.ba.go rename to pkg/vpplink/generated/bindings/gso/gso.ba.go index 4bb6345cd..a04f467a8 100644 --- a/vpplink/generated/bindings/gso/gso.ba.go +++ b/pkg/vpplink/generated/bindings/gso/gso.ba.go @@ -7,7 +7,7 @@ package gso import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/gso/gso_rpc.ba.go b/pkg/vpplink/generated/bindings/gso/gso_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/gso/gso_rpc.ba.go rename to pkg/vpplink/generated/bindings/gso/gso_rpc.ba.go diff --git a/vpplink/generated/bindings/ikev2/ikev2.ba.go b/pkg/vpplink/generated/bindings/ikev2/ikev2.ba.go similarity index 99% rename from vpplink/generated/bindings/ikev2/ikev2.ba.go rename to pkg/vpplink/generated/bindings/ikev2/ikev2.ba.go index 64ed0825f..1a77899bc 100644 --- a/vpplink/generated/bindings/ikev2/ikev2.ba.go +++ b/pkg/vpplink/generated/bindings/ikev2/ikev2.ba.go @@ -7,9 +7,9 @@ package ikev2 import ( - ikev2_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ikev2_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ikev2_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ikev2_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ikev2/ikev2_rpc.ba.go b/pkg/vpplink/generated/bindings/ikev2/ikev2_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/ikev2/ikev2_rpc.ba.go rename to pkg/vpplink/generated/bindings/ikev2/ikev2_rpc.ba.go index 453e2f511..3b94f3468 100644 --- a/vpplink/generated/bindings/ikev2/ikev2_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ikev2/ikev2_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ikev2_types/ikev2_types.ba.go b/pkg/vpplink/generated/bindings/ikev2_types/ikev2_types.ba.go similarity index 98% rename from vpplink/generated/bindings/ikev2_types/ikev2_types.ba.go rename to pkg/vpplink/generated/bindings/ikev2_types/ikev2_types.ba.go index 6286a6888..08d8e9659 100644 --- a/vpplink/generated/bindings/ikev2_types/ikev2_types.ba.go +++ b/pkg/vpplink/generated/bindings/ikev2_types/ikev2_types.ba.go @@ -10,8 +10,8 @@ package ikev2_types import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/interface/interface.ba.go b/pkg/vpplink/generated/bindings/interface/interface.ba.go similarity index 99% rename from vpplink/generated/bindings/interface/interface.ba.go rename to pkg/vpplink/generated/bindings/interface/interface.ba.go index d93fc29c7..df84fd50f 100644 --- a/vpplink/generated/bindings/interface/interface.ba.go +++ b/pkg/vpplink/generated/bindings/interface/interface.ba.go @@ -7,9 +7,9 @@ package interfaces import ( - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/interface/interface_rpc.ba.go b/pkg/vpplink/generated/bindings/interface/interface_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/interface/interface_rpc.ba.go rename to pkg/vpplink/generated/bindings/interface/interface_rpc.ba.go index 884d4da98..a56a2ce3c 100644 --- a/vpplink/generated/bindings/interface/interface_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/interface/interface_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/interface_types/interface_types.ba.go b/pkg/vpplink/generated/bindings/interface_types/interface_types.ba.go similarity index 100% rename from vpplink/generated/bindings/interface_types/interface_types.ba.go rename to pkg/vpplink/generated/bindings/interface_types/interface_types.ba.go diff --git a/vpplink/generated/bindings/ip/ip.ba.go b/pkg/vpplink/generated/bindings/ip/ip.ba.go similarity index 99% rename from vpplink/generated/bindings/ip/ip.ba.go rename to pkg/vpplink/generated/bindings/ip/ip.ba.go index 292ca2330..811e5318d 100644 --- a/vpplink/generated/bindings/ip/ip.ba.go +++ b/pkg/vpplink/generated/bindings/ip/ip.ba.go @@ -11,11 +11,11 @@ package ip import ( "strconv" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - fib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - mfib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/mfib_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + fib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + mfib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/mfib_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ip/ip_rpc.ba.go b/pkg/vpplink/generated/bindings/ip/ip_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/ip/ip_rpc.ba.go rename to pkg/vpplink/generated/bindings/ip/ip_rpc.ba.go index b9f776ea8..f7fa24ce0 100644 --- a/vpplink/generated/bindings/ip/ip_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ip/ip_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go b/pkg/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go similarity index 99% rename from vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go rename to pkg/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go index 21d4861f3..02666bab7 100644 --- a/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go +++ b/pkg/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go @@ -8,8 +8,8 @@ package ip6_nd import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go b/pkg/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go similarity index 98% rename from vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go rename to pkg/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go index 0a64abf0d..a7ade529f 100644 --- a/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ip_neighbor/ip_neighbor.ba.go b/pkg/vpplink/generated/bindings/ip_neighbor/ip_neighbor.ba.go similarity index 99% rename from vpplink/generated/bindings/ip_neighbor/ip_neighbor.ba.go rename to pkg/vpplink/generated/bindings/ip_neighbor/ip_neighbor.ba.go index 05fae9ead..ebff66796 100644 --- a/vpplink/generated/bindings/ip_neighbor/ip_neighbor.ba.go +++ b/pkg/vpplink/generated/bindings/ip_neighbor/ip_neighbor.ba.go @@ -11,9 +11,9 @@ package ip_neighbor import ( "strconv" - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ip_neighbor/ip_neighbor_rpc.ba.go b/pkg/vpplink/generated/bindings/ip_neighbor/ip_neighbor_rpc.ba.go similarity index 98% rename from vpplink/generated/bindings/ip_neighbor/ip_neighbor_rpc.ba.go rename to pkg/vpplink/generated/bindings/ip_neighbor/ip_neighbor_rpc.ba.go index 88bacc721..b743890be 100644 --- a/vpplink/generated/bindings/ip_neighbor/ip_neighbor_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ip_neighbor/ip_neighbor_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect.ba.go b/pkg/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect.ba.go similarity index 98% rename from vpplink/generated/bindings/ip_session_redirect/ip_session_redirect.ba.go rename to pkg/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect.ba.go index 8e412970f..82ceaf1d6 100644 --- a/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect.ba.go +++ b/pkg/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect.ba.go @@ -7,9 +7,9 @@ package ip_session_redirect import ( - fib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + fib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect_rpc.ba.go b/pkg/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect_rpc.ba.go similarity index 96% rename from vpplink/generated/bindings/ip_session_redirect/ip_session_redirect_rpc.ba.go rename to pkg/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect_rpc.ba.go index 2fd480ad6..fc893a61a 100644 --- a/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ip_session_redirect/ip_session_redirect_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup.ba.go b/pkg/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup.ba.go similarity index 97% rename from vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup.ba.go rename to pkg/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup.ba.go index 2aea6c138..62dd145c4 100644 --- a/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup.ba.go +++ b/pkg/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup.ba.go @@ -7,7 +7,7 @@ package ip_ttl_fixup import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup_rpc.ba.go b/pkg/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup_rpc.ba.go rename to pkg/vpplink/generated/bindings/ip_ttl_fixup/ip_ttl_fixup_rpc.ba.go diff --git a/vpplink/generated/bindings/ip_types/ip_types.ba.go b/pkg/vpplink/generated/bindings/ip_types/ip_types.ba.go similarity index 100% rename from vpplink/generated/bindings/ip_types/ip_types.ba.go rename to pkg/vpplink/generated/bindings/ip_types/ip_types.ba.go diff --git a/vpplink/generated/bindings/ipip/ipip.ba.go b/pkg/vpplink/generated/bindings/ipip/ipip.ba.go similarity index 98% rename from vpplink/generated/bindings/ipip/ipip.ba.go rename to pkg/vpplink/generated/bindings/ipip/ipip.ba.go index d879ff800..39d08d770 100644 --- a/vpplink/generated/bindings/ipip/ipip.ba.go +++ b/pkg/vpplink/generated/bindings/ipip/ipip.ba.go @@ -8,9 +8,9 @@ package ipip import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - tunnel_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/tunnel_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + tunnel_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/tunnel_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ipip/ipip_rpc.ba.go b/pkg/vpplink/generated/bindings/ipip/ipip_rpc.ba.go similarity index 96% rename from vpplink/generated/bindings/ipip/ipip_rpc.ba.go rename to pkg/vpplink/generated/bindings/ipip/ipip_rpc.ba.go index 69ada543e..a84cad133 100644 --- a/vpplink/generated/bindings/ipip/ipip_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ipip/ipip_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ipsec/ipsec.ba.go b/pkg/vpplink/generated/bindings/ipsec/ipsec.ba.go similarity index 99% rename from vpplink/generated/bindings/ipsec/ipsec.ba.go rename to pkg/vpplink/generated/bindings/ipsec/ipsec.ba.go index 7ec1e3ca8..9ab552207 100644 --- a/vpplink/generated/bindings/ipsec/ipsec.ba.go +++ b/pkg/vpplink/generated/bindings/ipsec/ipsec.ba.go @@ -8,10 +8,10 @@ package ipsec import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - ipsec_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ipsec_types" - tunnel_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/tunnel_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + ipsec_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ipsec_types" + tunnel_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/tunnel_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/ipsec/ipsec_rpc.ba.go b/pkg/vpplink/generated/bindings/ipsec/ipsec_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/ipsec/ipsec_rpc.ba.go rename to pkg/vpplink/generated/bindings/ipsec/ipsec_rpc.ba.go index cb343524a..f8d084fa1 100644 --- a/vpplink/generated/bindings/ipsec/ipsec_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/ipsec/ipsec_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/ipsec_types/ipsec_types.ba.go b/pkg/vpplink/generated/bindings/ipsec_types/ipsec_types.ba.go similarity index 98% rename from vpplink/generated/bindings/ipsec_types/ipsec_types.ba.go rename to pkg/vpplink/generated/bindings/ipsec_types/ipsec_types.ba.go index 120eba126..330c2fd03 100644 --- a/vpplink/generated/bindings/ipsec_types/ipsec_types.ba.go +++ b/pkg/vpplink/generated/bindings/ipsec_types/ipsec_types.ba.go @@ -10,9 +10,9 @@ package ipsec_types import ( "strconv" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - tunnel_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/tunnel_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + tunnel_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/tunnel_types" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/memclnt/memclnt.ba.go b/pkg/vpplink/generated/bindings/memclnt/memclnt.ba.go similarity index 100% rename from vpplink/generated/bindings/memclnt/memclnt.ba.go rename to pkg/vpplink/generated/bindings/memclnt/memclnt.ba.go diff --git a/vpplink/generated/bindings/memclnt/memclnt_rpc.ba.go b/pkg/vpplink/generated/bindings/memclnt/memclnt_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/memclnt/memclnt_rpc.ba.go rename to pkg/vpplink/generated/bindings/memclnt/memclnt_rpc.ba.go diff --git a/vpplink/generated/bindings/memif/memif.ba.go b/pkg/vpplink/generated/bindings/memif/memif.ba.go similarity index 99% rename from vpplink/generated/bindings/memif/memif.ba.go rename to pkg/vpplink/generated/bindings/memif/memif.ba.go index 5d760b18c..17ed21fcc 100644 --- a/vpplink/generated/bindings/memif/memif.ba.go +++ b/pkg/vpplink/generated/bindings/memif/memif.ba.go @@ -10,8 +10,8 @@ package memif import ( "strconv" - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/memif/memif_rpc.ba.go b/pkg/vpplink/generated/bindings/memif/memif_rpc.ba.go similarity index 98% rename from vpplink/generated/bindings/memif/memif_rpc.ba.go rename to pkg/vpplink/generated/bindings/memif/memif_rpc.ba.go index ece12f8df..f4339baba 100644 --- a/vpplink/generated/bindings/memif/memif_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/memif/memif_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/mfib_types/mfib_types.ba.go b/pkg/vpplink/generated/bindings/mfib_types/mfib_types.ba.go similarity index 95% rename from vpplink/generated/bindings/mfib_types/mfib_types.ba.go rename to pkg/vpplink/generated/bindings/mfib_types/mfib_types.ba.go index 6d1663744..0907db0c4 100644 --- a/vpplink/generated/bindings/mfib_types/mfib_types.ba.go +++ b/pkg/vpplink/generated/bindings/mfib_types/mfib_types.ba.go @@ -10,8 +10,8 @@ package mfib_types import ( "strconv" - fib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + fib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go b/pkg/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go similarity index 99% rename from vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go rename to pkg/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go index 3a4d727bf..507b82c0f 100644 --- a/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go +++ b/pkg/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go @@ -11,9 +11,9 @@ package nat44_ed import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - nat_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/nat_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + nat_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/nat_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/nat44_ed/nat44_ed_rpc.ba.go b/pkg/vpplink/generated/bindings/nat44_ed/nat44_ed_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/nat44_ed/nat44_ed_rpc.ba.go rename to pkg/vpplink/generated/bindings/nat44_ed/nat44_ed_rpc.ba.go index d733a3ba6..dc8af5885 100644 --- a/vpplink/generated/bindings/nat44_ed/nat44_ed_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/nat44_ed/nat44_ed_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/nat_types/nat_types.ba.go b/pkg/vpplink/generated/bindings/nat_types/nat_types.ba.go similarity index 100% rename from vpplink/generated/bindings/nat_types/nat_types.ba.go rename to pkg/vpplink/generated/bindings/nat_types/nat_types.ba.go diff --git a/vpplink/generated/bindings/npol/npol.ba.go b/pkg/vpplink/generated/bindings/npol/npol.ba.go similarity index 99% rename from vpplink/generated/bindings/npol/npol.ba.go rename to pkg/vpplink/generated/bindings/npol/npol.ba.go index 0a72491ae..462834993 100644 --- a/vpplink/generated/bindings/npol/npol.ba.go +++ b/pkg/vpplink/generated/bindings/npol/npol.ba.go @@ -12,8 +12,8 @@ package npol import ( "strconv" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/npol/npol_rpc.ba.go b/pkg/vpplink/generated/bindings/npol/npol_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/npol/npol_rpc.ba.go rename to pkg/vpplink/generated/bindings/npol/npol_rpc.ba.go diff --git a/vpplink/generated/bindings/pbl/pbl.ba.go b/pkg/vpplink/generated/bindings/pbl/pbl.ba.go similarity index 98% rename from vpplink/generated/bindings/pbl/pbl.ba.go rename to pkg/vpplink/generated/bindings/pbl/pbl.ba.go index 1e90fcdd9..6e78fad9e 100644 --- a/vpplink/generated/bindings/pbl/pbl.ba.go +++ b/pkg/vpplink/generated/bindings/pbl/pbl.ba.go @@ -11,9 +11,9 @@ package pbl import ( "strconv" - fib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + fib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/pbl/pbl_rpc.ba.go b/pkg/vpplink/generated/bindings/pbl/pbl_rpc.ba.go similarity index 95% rename from vpplink/generated/bindings/pbl/pbl_rpc.ba.go rename to pkg/vpplink/generated/bindings/pbl/pbl_rpc.ba.go index 5473226b2..54bfffd8c 100644 --- a/vpplink/generated/bindings/pbl/pbl_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/pbl/pbl_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/pci_types/pci_types.ba.go b/pkg/vpplink/generated/bindings/pci_types/pci_types.ba.go similarity index 100% rename from vpplink/generated/bindings/pci_types/pci_types.ba.go rename to pkg/vpplink/generated/bindings/pci_types/pci_types.ba.go diff --git a/vpplink/generated/bindings/punt/punt.ba.go b/pkg/vpplink/generated/bindings/punt/punt.ba.go similarity index 99% rename from vpplink/generated/bindings/punt/punt.ba.go rename to pkg/vpplink/generated/bindings/punt/punt.ba.go index 4c2ca2efc..295d73224 100644 --- a/vpplink/generated/bindings/punt/punt.ba.go +++ b/pkg/vpplink/generated/bindings/punt/punt.ba.go @@ -12,7 +12,7 @@ package punt import ( "strconv" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/punt/punt_rpc.ba.go b/pkg/vpplink/generated/bindings/punt/punt_rpc.ba.go similarity index 97% rename from vpplink/generated/bindings/punt/punt_rpc.ba.go rename to pkg/vpplink/generated/bindings/punt/punt_rpc.ba.go index ab2972d36..075e412a9 100644 --- a/vpplink/generated/bindings/punt/punt_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/punt/punt_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/rdma/rdma.ba.go b/pkg/vpplink/generated/bindings/rdma/rdma.ba.go similarity index 99% rename from vpplink/generated/bindings/rdma/rdma.ba.go rename to pkg/vpplink/generated/bindings/rdma/rdma.ba.go index 4baf0773d..84b4981c6 100644 --- a/vpplink/generated/bindings/rdma/rdma.ba.go +++ b/pkg/vpplink/generated/bindings/rdma/rdma.ba.go @@ -10,7 +10,7 @@ package rdma import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/rdma/rdma_rpc.ba.go b/pkg/vpplink/generated/bindings/rdma/rdma_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/rdma/rdma_rpc.ba.go rename to pkg/vpplink/generated/bindings/rdma/rdma_rpc.ba.go diff --git a/vpplink/generated/bindings/session/session.ba.go b/pkg/vpplink/generated/bindings/session/session.ba.go similarity index 99% rename from vpplink/generated/bindings/session/session.ba.go rename to pkg/vpplink/generated/bindings/session/session.ba.go index ff7e346b1..3ce091735 100644 --- a/vpplink/generated/bindings/session/session.ba.go +++ b/pkg/vpplink/generated/bindings/session/session.ba.go @@ -11,8 +11,8 @@ package session import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/session/session_rpc.ba.go b/pkg/vpplink/generated/bindings/session/session_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/session/session_rpc.ba.go rename to pkg/vpplink/generated/bindings/session/session_rpc.ba.go index 38fcc90af..f2e92eecc 100644 --- a/vpplink/generated/bindings/session/session_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/session/session_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/sr/sr.ba.go b/pkg/vpplink/generated/bindings/sr/sr.ba.go similarity index 99% rename from vpplink/generated/bindings/sr/sr.ba.go rename to pkg/vpplink/generated/bindings/sr/sr.ba.go index bc69ac1bd..13d33d549 100644 --- a/vpplink/generated/bindings/sr/sr.ba.go +++ b/pkg/vpplink/generated/bindings/sr/sr.ba.go @@ -11,9 +11,9 @@ package sr import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - sr_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/sr_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + sr_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/sr_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/sr/sr_rpc.ba.go b/pkg/vpplink/generated/bindings/sr/sr_rpc.ba.go similarity index 99% rename from vpplink/generated/bindings/sr/sr_rpc.ba.go rename to pkg/vpplink/generated/bindings/sr/sr_rpc.ba.go index 2bfa7de7c..92c4bd7b7 100644 --- a/vpplink/generated/bindings/sr/sr_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/sr/sr_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/sr_types/sr_types.ba.go b/pkg/vpplink/generated/bindings/sr_types/sr_types.ba.go similarity index 100% rename from vpplink/generated/bindings/sr_types/sr_types.ba.go rename to pkg/vpplink/generated/bindings/sr_types/sr_types.ba.go diff --git a/vpplink/generated/bindings/tapv2/tapv2.ba.go b/pkg/vpplink/generated/bindings/tapv2/tapv2.ba.go similarity index 99% rename from vpplink/generated/bindings/tapv2/tapv2.ba.go rename to pkg/vpplink/generated/bindings/tapv2/tapv2.ba.go index 67326df2d..37c60b024 100644 --- a/vpplink/generated/bindings/tapv2/tapv2.ba.go +++ b/pkg/vpplink/generated/bindings/tapv2/tapv2.ba.go @@ -10,9 +10,9 @@ package tapv2 import ( "strconv" - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/tapv2/tapv2_rpc.ba.go b/pkg/vpplink/generated/bindings/tapv2/tapv2_rpc.ba.go similarity index 96% rename from vpplink/generated/bindings/tapv2/tapv2_rpc.ba.go rename to pkg/vpplink/generated/bindings/tapv2/tapv2_rpc.ba.go index 8f33fdd85..086ca953e 100644 --- a/vpplink/generated/bindings/tapv2/tapv2_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/tapv2/tapv2_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/tunnel_types/tunnel_types.ba.go b/pkg/vpplink/generated/bindings/tunnel_types/tunnel_types.ba.go similarity index 96% rename from vpplink/generated/bindings/tunnel_types/tunnel_types.ba.go rename to pkg/vpplink/generated/bindings/tunnel_types/tunnel_types.ba.go index 7b0c8ceab..a4d695408 100644 --- a/vpplink/generated/bindings/tunnel_types/tunnel_types.ba.go +++ b/pkg/vpplink/generated/bindings/tunnel_types/tunnel_types.ba.go @@ -10,8 +10,8 @@ package tunnel_types import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/urpf/urpf.ba.go b/pkg/vpplink/generated/bindings/urpf/urpf.ba.go similarity index 97% rename from vpplink/generated/bindings/urpf/urpf.ba.go rename to pkg/vpplink/generated/bindings/urpf/urpf.ba.go index f51a5c41a..37ef0b387 100644 --- a/vpplink/generated/bindings/urpf/urpf.ba.go +++ b/pkg/vpplink/generated/bindings/urpf/urpf.ba.go @@ -10,9 +10,9 @@ package urpf import ( "strconv" - _ "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + _ "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/urpf/urpf_rpc.ba.go b/pkg/vpplink/generated/bindings/urpf/urpf_rpc.ba.go similarity index 96% rename from vpplink/generated/bindings/urpf/urpf_rpc.ba.go rename to pkg/vpplink/generated/bindings/urpf/urpf_rpc.ba.go index 966e136e1..a22247ccc 100644 --- a/vpplink/generated/bindings/urpf/urpf_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/urpf/urpf_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/virtio/virtio.ba.go b/pkg/vpplink/generated/bindings/virtio/virtio.ba.go similarity index 98% rename from vpplink/generated/bindings/virtio/virtio.ba.go rename to pkg/vpplink/generated/bindings/virtio/virtio.ba.go index d293d8054..ded24507e 100644 --- a/vpplink/generated/bindings/virtio/virtio.ba.go +++ b/pkg/vpplink/generated/bindings/virtio/virtio.ba.go @@ -10,9 +10,9 @@ package virtio import ( "strconv" - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - pci_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/pci_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + pci_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/pci_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/virtio/virtio_rpc.ba.go b/pkg/vpplink/generated/bindings/virtio/virtio_rpc.ba.go similarity index 96% rename from vpplink/generated/bindings/virtio/virtio_rpc.ba.go rename to pkg/vpplink/generated/bindings/virtio/virtio_rpc.ba.go index 487429fe2..449d351ee 100644 --- a/vpplink/generated/bindings/virtio/virtio_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/virtio/virtio_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/vlib/vlib.ba.go b/pkg/vpplink/generated/bindings/vlib/vlib.ba.go similarity index 100% rename from vpplink/generated/bindings/vlib/vlib.ba.go rename to pkg/vpplink/generated/bindings/vlib/vlib.ba.go diff --git a/vpplink/generated/bindings/vlib/vlib_rpc.ba.go b/pkg/vpplink/generated/bindings/vlib/vlib_rpc.ba.go similarity index 100% rename from vpplink/generated/bindings/vlib/vlib_rpc.ba.go rename to pkg/vpplink/generated/bindings/vlib/vlib_rpc.ba.go diff --git a/vpplink/generated/bindings/vmxnet3/vmxnet3.ba.go b/pkg/vpplink/generated/bindings/vmxnet3/vmxnet3.ba.go similarity index 98% rename from vpplink/generated/bindings/vmxnet3/vmxnet3.ba.go rename to pkg/vpplink/generated/bindings/vmxnet3/vmxnet3.ba.go index d72158e1e..c814c6bb8 100644 --- a/vpplink/generated/bindings/vmxnet3/vmxnet3.ba.go +++ b/pkg/vpplink/generated/bindings/vmxnet3/vmxnet3.ba.go @@ -8,8 +8,8 @@ package vmxnet3 import ( - ethernet_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + ethernet_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/vmxnet3/vmxnet3_rpc.ba.go b/pkg/vpplink/generated/bindings/vmxnet3/vmxnet3_rpc.ba.go similarity index 97% rename from vpplink/generated/bindings/vmxnet3/vmxnet3_rpc.ba.go rename to pkg/vpplink/generated/bindings/vmxnet3/vmxnet3_rpc.ba.go index 505e3d708..e9dd09c14 100644 --- a/vpplink/generated/bindings/vmxnet3/vmxnet3_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/vmxnet3/vmxnet3_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/vpe/vpe.ba.go b/pkg/vpplink/generated/bindings/vpe/vpe.ba.go similarity index 98% rename from vpplink/generated/bindings/vpe/vpe.ba.go rename to pkg/vpplink/generated/bindings/vpe/vpe.ba.go index 70ba0708d..cb4b1ce6b 100644 --- a/vpplink/generated/bindings/vpe/vpe.ba.go +++ b/pkg/vpplink/generated/bindings/vpe/vpe.ba.go @@ -7,7 +7,7 @@ package vpe import ( - vpe_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/vpe_types" + vpe_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/vpe_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/vpe/vpe_rpc.ba.go b/pkg/vpplink/generated/bindings/vpe/vpe_rpc.ba.go similarity index 95% rename from vpplink/generated/bindings/vpe/vpe_rpc.ba.go rename to pkg/vpplink/generated/bindings/vpe/vpe_rpc.ba.go index 1c9071785..784260569 100644 --- a/vpplink/generated/bindings/vpe/vpe_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/vpe/vpe_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/vpe_types/vpe_types.ba.go b/pkg/vpplink/generated/bindings/vpe_types/vpe_types.ba.go similarity index 100% rename from vpplink/generated/bindings/vpe_types/vpe_types.ba.go rename to pkg/vpplink/generated/bindings/vpe_types/vpe_types.ba.go diff --git a/vpplink/generated/bindings/vxlan/vxlan.ba.go b/pkg/vpplink/generated/bindings/vxlan/vxlan.ba.go similarity index 99% rename from vpplink/generated/bindings/vxlan/vxlan.ba.go rename to pkg/vpplink/generated/bindings/vxlan/vxlan.ba.go index c1e96a844..ec7bde7f4 100644 --- a/vpplink/generated/bindings/vxlan/vxlan.ba.go +++ b/pkg/vpplink/generated/bindings/vxlan/vxlan.ba.go @@ -7,8 +7,8 @@ package vxlan import ( - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/vxlan/vxlan_rpc.ba.go b/pkg/vpplink/generated/bindings/vxlan/vxlan_rpc.ba.go similarity index 98% rename from vpplink/generated/bindings/vxlan/vxlan_rpc.ba.go rename to pkg/vpplink/generated/bindings/vxlan/vxlan_rpc.ba.go index 84dd01fe1..8ae881faa 100644 --- a/vpplink/generated/bindings/vxlan/vxlan_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/vxlan/vxlan_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/bindings/wireguard/wireguard.ba.go b/pkg/vpplink/generated/bindings/wireguard/wireguard.ba.go similarity index 99% rename from vpplink/generated/bindings/wireguard/wireguard.ba.go rename to pkg/vpplink/generated/bindings/wireguard/wireguard.ba.go index 5ae95d1f3..df6bd7141 100644 --- a/vpplink/generated/bindings/wireguard/wireguard.ba.go +++ b/pkg/vpplink/generated/bindings/wireguard/wireguard.ba.go @@ -11,8 +11,8 @@ package wireguard import ( "strconv" - interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + interface_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + ip_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" api "go.fd.io/govpp/api" codec "go.fd.io/govpp/codec" ) diff --git a/vpplink/generated/bindings/wireguard/wireguard_rpc.ba.go b/pkg/vpplink/generated/bindings/wireguard/wireguard_rpc.ba.go similarity index 98% rename from vpplink/generated/bindings/wireguard/wireguard_rpc.ba.go rename to pkg/vpplink/generated/bindings/wireguard/wireguard_rpc.ba.go index 04971b7c2..e313b74e3 100644 --- a/vpplink/generated/bindings/wireguard/wireguard_rpc.ba.go +++ b/pkg/vpplink/generated/bindings/wireguard/wireguard_rpc.ba.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - memclnt "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memclnt" + memclnt "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memclnt" api "go.fd.io/govpp/api" ) diff --git a/vpplink/generated/gen.go b/pkg/vpplink/generated/gen.go similarity index 100% rename from vpplink/generated/gen.go rename to pkg/vpplink/generated/gen.go diff --git a/pkg/vpplink/generated/generate.log b/pkg/vpplink/generated/generate.log new file mode 100755 index 000000000..7be8f373f --- /dev/null +++ b/pkg/vpplink/generated/generate.log @@ -0,0 +1,13 @@ +VPP Version : 26.10-rc0~148-gcd9306bea +Binapi-generator version : v0.14.0-dev +VPP Base commit : 03c33e979 gerrit:42343/2 vcl: LDP default to regular option +------------------ Cherry picked commits -------------------- +calicovpp plugin:pbl +calicovpp plugin:ip_ttl_fixup +ip-neighbor: preserve interface LL receive DPO for self link-local +cnat: [WIP] no k8s maglev from pods +gerrit:45046/4 ip6-nd: add punt reason for neigh advs +gerrit:45099/2 ip6-nd: add nd-proxy all dst +gerrit:44350/3 vnet: fix unicast NA handling in ND proxy +gerrit:42343/2 vcl: LDP default to regular option +------------------------------------------------------------- diff --git a/vpplink/generated/patches/0001-cnat-WIP-no-k8s-maglev-from-pods.patch b/pkg/vpplink/generated/patches/0001-cnat-WIP-no-k8s-maglev-from-pods.patch similarity index 100% rename from vpplink/generated/patches/0001-cnat-WIP-no-k8s-maglev-from-pods.patch rename to pkg/vpplink/generated/patches/0001-cnat-WIP-no-k8s-maglev-from-pods.patch diff --git a/vpplink/generated/patches/0002-ip-neighbor-preserve-interface-LL-receive-DPO-for-se.patch b/pkg/vpplink/generated/patches/0002-ip-neighbor-preserve-interface-LL-receive-DPO-for-se.patch similarity index 100% rename from vpplink/generated/patches/0002-ip-neighbor-preserve-interface-LL-receive-DPO-for-se.patch rename to pkg/vpplink/generated/patches/0002-ip-neighbor-preserve-interface-LL-receive-DPO-for-se.patch diff --git a/vpplink/generated/pkg/gen_vpplink.go b/pkg/vpplink/generated/pkg/gen_vpplink.go similarity index 100% rename from vpplink/generated/pkg/gen_vpplink.go rename to pkg/vpplink/generated/pkg/gen_vpplink.go diff --git a/vpplink/generated/private_plugins/ip_ttl_fixup/CMakeLists.txt b/pkg/vpplink/generated/private_plugins/ip_ttl_fixup/CMakeLists.txt similarity index 100% rename from vpplink/generated/private_plugins/ip_ttl_fixup/CMakeLists.txt rename to pkg/vpplink/generated/private_plugins/ip_ttl_fixup/CMakeLists.txt diff --git a/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.api b/pkg/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.api similarity index 100% rename from vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.api rename to pkg/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.api diff --git a/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.c b/pkg/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.c similarity index 100% rename from vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.c rename to pkg/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.c diff --git a/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.h b/pkg/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.h similarity index 100% rename from vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.h rename to pkg/vpplink/generated/private_plugins/ip_ttl_fixup/ip_ttl_fixup.h diff --git a/vpplink/generated/private_plugins/pbl/CMakeLists.txt b/pkg/vpplink/generated/private_plugins/pbl/CMakeLists.txt similarity index 100% rename from vpplink/generated/private_plugins/pbl/CMakeLists.txt rename to pkg/vpplink/generated/private_plugins/pbl/CMakeLists.txt diff --git a/vpplink/generated/private_plugins/pbl/FEATURE.yaml b/pkg/vpplink/generated/private_plugins/pbl/FEATURE.yaml similarity index 100% rename from vpplink/generated/private_plugins/pbl/FEATURE.yaml rename to pkg/vpplink/generated/private_plugins/pbl/FEATURE.yaml diff --git a/vpplink/generated/private_plugins/pbl/pbl.api b/pkg/vpplink/generated/private_plugins/pbl/pbl.api similarity index 100% rename from vpplink/generated/private_plugins/pbl/pbl.api rename to pkg/vpplink/generated/private_plugins/pbl/pbl.api diff --git a/vpplink/generated/private_plugins/pbl/pbl_api.c b/pkg/vpplink/generated/private_plugins/pbl/pbl_api.c similarity index 100% rename from vpplink/generated/private_plugins/pbl/pbl_api.c rename to pkg/vpplink/generated/private_plugins/pbl/pbl_api.c diff --git a/vpplink/generated/private_plugins/pbl/pbl_client.c b/pkg/vpplink/generated/private_plugins/pbl/pbl_client.c similarity index 100% rename from vpplink/generated/private_plugins/pbl/pbl_client.c rename to pkg/vpplink/generated/private_plugins/pbl/pbl_client.c diff --git a/vpplink/generated/private_plugins/pbl/pbl_client.h b/pkg/vpplink/generated/private_plugins/pbl/pbl_client.h similarity index 100% rename from vpplink/generated/private_plugins/pbl/pbl_client.h rename to pkg/vpplink/generated/private_plugins/pbl/pbl_client.h diff --git a/vpplink/generated/private_plugins/pbl/pbl_error.def b/pkg/vpplink/generated/private_plugins/pbl/pbl_error.def similarity index 100% rename from vpplink/generated/private_plugins/pbl/pbl_error.def rename to pkg/vpplink/generated/private_plugins/pbl/pbl_error.def diff --git a/vpplink/generated/private_plugins/pbl/pbl_node.c b/pkg/vpplink/generated/private_plugins/pbl/pbl_node.c similarity index 100% rename from vpplink/generated/private_plugins/pbl/pbl_node.c rename to pkg/vpplink/generated/private_plugins/pbl/pbl_node.c diff --git a/vpplink/generated/vpp_clone_current.sh b/pkg/vpplink/generated/vpp_clone_current.sh similarity index 100% rename from vpplink/generated/vpp_clone_current.sh rename to pkg/vpplink/generated/vpp_clone_current.sh diff --git a/vpplink/helpers.go b/pkg/vpplink/helpers.go similarity index 97% rename from vpplink/helpers.go rename to pkg/vpplink/helpers.go index 4263603c8..53840f048 100644 --- a/vpplink/helpers.go +++ b/pkg/vpplink/helpers.go @@ -21,7 +21,7 @@ import ( "time" "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" log "github.com/sirupsen/logrus" ) diff --git a/vpplink/ikev2.go b/pkg/vpplink/ikev2.go similarity index 97% rename from vpplink/ikev2.go rename to pkg/vpplink/ikev2.go index 773abde73..e79810390 100644 --- a/vpplink/ikev2.go +++ b/pkg/vpplink/ikev2.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ikev2" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ikev2_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ikev2" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ikev2_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) type IKEv2IDType uint8 diff --git a/vpplink/index_allocator.go b/pkg/vpplink/index_allocator.go similarity index 100% rename from vpplink/index_allocator.go rename to pkg/vpplink/index_allocator.go diff --git a/vpplink/interfaces.go b/pkg/vpplink/interfaces.go similarity index 97% rename from vpplink/interfaces.go rename to pkg/vpplink/interfaces.go index bc29b7e3f..3e3627a04 100644 --- a/vpplink/interfaces.go +++ b/pkg/vpplink/interfaces.go @@ -25,14 +25,14 @@ import ( "github.com/pkg/errors" "go.fd.io/govpp/api" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/gso" - interfaces "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - vppip "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_neighbor" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/tapv2" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/gso" + interfaces "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + vppip "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_neighbor" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/tapv2" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) const ( diff --git a/vpplink/ip.go b/pkg/vpplink/ip.go similarity index 93% rename from vpplink/ip.go rename to pkg/vpplink/ip.go index 045955381..ad27419bf 100644 --- a/vpplink/ip.go +++ b/pkg/vpplink/ip.go @@ -19,11 +19,11 @@ import ( "fmt" "io" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/punt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/punt" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) ListVRFs() (vrfs []types.VRF, err error) { diff --git a/vpplink/ip6_nd.go b/pkg/vpplink/ip6_nd.go similarity index 89% rename from vpplink/ip6_nd.go rename to pkg/vpplink/ip6_nd.go index 1bab218f0..818978eb7 100644 --- a/vpplink/ip6_nd.go +++ b/pkg/vpplink/ip6_nd.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip6_nd" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip6_nd" ) func (v *VppLink) DisableIP6RouterAdvertisements(swIfIndex uint32) error { diff --git a/vpplink/ipip.go b/pkg/vpplink/ipip.go similarity index 90% rename from vpplink/ipip.go rename to pkg/vpplink/ipip.go index a90e74c97..6e6e1dd49 100644 --- a/vpplink/ipip.go +++ b/pkg/vpplink/ipip.go @@ -20,9 +20,9 @@ import ( "io" types "github.com/calico-vpp/vpplink/api/v0" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ipip" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ipip" ) func (v *Vpp) ListIPIPTunnels() ([]*types.IPIPTunnel, error) { diff --git a/vpplink/ipsec.go b/pkg/vpplink/ipsec.go similarity index 94% rename from vpplink/ipsec.go rename to pkg/vpplink/ipsec.go index c4cccfc20..a48188b0e 100644 --- a/vpplink/ipsec.go +++ b/pkg/vpplink/ipsec.go @@ -20,10 +20,10 @@ import ( "io" vpptypes "github.com/calico-vpp/vpplink/api/v0" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ipsec" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ipsec_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ipsec" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ipsec_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *Vpp) GetIPsecTunnelProtection(tunnelInterface uint32) ([]types.IPsecTunnelProtection, error) { diff --git a/vpplink/ipsec_helpers.go b/pkg/vpplink/ipsec_helpers.go similarity index 89% rename from vpplink/ipsec_helpers.go rename to pkg/vpplink/ipsec_helpers.go index d4206dcf7..ff5da07fd 100644 --- a/vpplink/ipsec_helpers.go +++ b/pkg/vpplink/ipsec_helpers.go @@ -16,9 +16,9 @@ package vpplink import ( typesv0 "github.com/calico-vpp/vpplink/api/v0" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ipsec_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/tunnel_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ipsec_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/tunnel_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func toVppSaFlags(flags typesv0.SaFlags) ipsec_types.IpsecSadFlags { diff --git a/vpplink/memif.go b/pkg/vpplink/memif.go similarity index 94% rename from vpplink/memif.go rename to pkg/vpplink/memif.go index 83f52023a..a5c0a8a32 100644 --- a/vpplink/memif.go +++ b/pkg/vpplink/memif.go @@ -19,9 +19,9 @@ import ( "fmt" "io" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memif" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memif" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) addDelMemifSocketFileName(socketFileName string, socketID uint32, isAdd bool) (uint32, error) { diff --git a/vpplink/nat44.go b/pkg/vpplink/nat44.go similarity index 95% rename from vpplink/nat44.go rename to pkg/vpplink/nat44.go index 17b7dc8c8..ed5dd4734 100644 --- a/vpplink/nat44.go +++ b/pkg/vpplink/nat44.go @@ -19,10 +19,10 @@ import ( "fmt" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - nat "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/nat44_ed" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/nat_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + nat "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/nat44_ed" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/nat_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) EnableNatForwarding() error { diff --git a/vpplink/neighbor.go b/pkg/vpplink/neighbor.go similarity index 90% rename from vpplink/neighbor.go rename to pkg/vpplink/neighbor.go index d4a9d6035..63025a4b9 100644 --- a/vpplink/neighbor.go +++ b/pkg/vpplink/neighbor.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_neighbor" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_neighbor" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) AddNeighbor(neighbor *types.Neighbor) error { diff --git a/vpplink/npol.go b/pkg/vpplink/npol.go similarity index 97% rename from vpplink/npol.go rename to pkg/vpplink/npol.go index dbab017b5..10e288ee6 100644 --- a/vpplink/npol.go +++ b/pkg/vpplink/npol.go @@ -19,8 +19,8 @@ import ( "fmt" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/npol" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/npol" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) IpsetCreate(ipsetType types.IpsetType) (setID uint32, err error) { diff --git a/vpplink/pbl.go b/pkg/vpplink/pbl.go similarity index 92% rename from vpplink/pbl.go rename to pkg/vpplink/pbl.go index d8873608e..2f3bff842 100644 --- a/vpplink/pbl.go +++ b/pkg/vpplink/pbl.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/pbl" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/pbl" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) AddPblClient(pblClient *types.PblClient) (id uint32, err error) { diff --git a/vpplink/rdma.go b/pkg/vpplink/rdma.go similarity index 89% rename from vpplink/rdma.go rename to pkg/vpplink/rdma.go index de76f22b8..6c1c1e0a5 100644 --- a/vpplink/rdma.go +++ b/pkg/vpplink/rdma.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/rdma" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/rdma" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) CreateRDMA(intf *types.RDMAInterface) (swIfIndex uint32, err error) { diff --git a/vpplink/redirect.go b/pkg/vpplink/redirect.go similarity index 88% rename from vpplink/redirect.go rename to pkg/vpplink/redirect.go index bbf3fba18..4a68514e2 100644 --- a/vpplink/redirect.go +++ b/pkg/vpplink/redirect.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - fib_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_session_redirect" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + fib_types "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_session_redirect" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) AddSessionRedirect(redirect *types.SessionRedirect, paths ...*types.RoutePath) (err error) { diff --git a/vpplink/routes.go b/pkg/vpplink/routes.go similarity index 95% rename from vpplink/routes.go rename to pkg/vpplink/routes.go index b8ffb62e4..94fdab4e1 100644 --- a/vpplink/routes.go +++ b/pkg/vpplink/routes.go @@ -20,11 +20,11 @@ import ( "io" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" - vppip "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/mfib_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" + vppip "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/mfib_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) GetRoutes(tableID uint32, isIPv6 bool) ([]types.Route, error) { diff --git a/vpplink/session.go b/pkg/vpplink/session.go similarity index 91% rename from vpplink/session.go rename to pkg/vpplink/session.go index fcc48ff06..74ef2b70d 100644 --- a/vpplink/session.go +++ b/pkg/vpplink/session.go @@ -18,9 +18,9 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/session" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/session" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) enableDisableSessionLayer(isEnable bool) error { diff --git a/vpplink/srv6.go b/pkg/vpplink/srv6.go similarity index 94% rename from vpplink/srv6.go rename to pkg/vpplink/srv6.go index e1b989099..1d23088e2 100644 --- a/vpplink/srv6.go +++ b/pkg/vpplink/srv6.go @@ -7,11 +7,11 @@ import ( "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/sr" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/sr_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/sr" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/sr_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) SetEncapSource(addr net.IP) error { diff --git a/vpplink/ttl_fixup.go b/pkg/vpplink/ttl_fixup.go similarity index 91% rename from vpplink/ttl_fixup.go rename to pkg/vpplink/ttl_fixup.go index 7df820a9c..4e5752116 100644 --- a/vpplink/ttl_fixup.go +++ b/pkg/vpplink/ttl_fixup.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_ttl_fixup" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_ttl_fixup" ) // EnableTTLFixup configures TTL fixup for transparent host forwarding on diff --git a/vpplink/types/abf.go b/pkg/vpplink/types/abf.go similarity index 100% rename from vpplink/types/abf.go rename to pkg/vpplink/types/abf.go diff --git a/vpplink/types/acl.go b/pkg/vpplink/types/acl.go similarity index 94% rename from vpplink/types/acl.go rename to pkg/vpplink/types/acl.go index b0939ee9c..017a97704 100644 --- a/vpplink/types/acl.go +++ b/pkg/vpplink/types/acl.go @@ -18,7 +18,7 @@ package types import ( "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/acl_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/acl_types" ) type ACLRule struct { diff --git a/vpplink/types/classify.go b/pkg/vpplink/types/classify.go similarity index 100% rename from vpplink/types/classify.go rename to pkg/vpplink/types/classify.go diff --git a/vpplink/types/cnat.go b/pkg/vpplink/types/cnat.go similarity index 97% rename from vpplink/types/cnat.go rename to pkg/vpplink/types/cnat.go index 4f3114e72..bae9f913a 100644 --- a/vpplink/types/cnat.go +++ b/pkg/vpplink/types/cnat.go @@ -20,7 +20,7 @@ import ( "net" "strings" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/cnat" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/cnat" ) const ( diff --git a/vpplink/types/errors.go b/pkg/vpplink/types/errors.go similarity index 100% rename from vpplink/types/errors.go rename to pkg/vpplink/types/errors.go diff --git a/vpplink/types/errors_test.go b/pkg/vpplink/types/errors_test.go similarity index 100% rename from vpplink/types/errors_test.go rename to pkg/vpplink/types/errors_test.go diff --git a/vpplink/types/ethernet.go b/pkg/vpplink/types/ethernet.go similarity index 62% rename from vpplink/types/ethernet.go rename to pkg/vpplink/types/ethernet.go index b21ea8421..1fd75aa71 100644 --- a/vpplink/types/ethernet.go +++ b/pkg/vpplink/types/ethernet.go @@ -3,7 +3,7 @@ package types import ( "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" ) func MacAddress(hwAddr net.HardwareAddr) ethernet_types.MacAddress { diff --git a/vpplink/types/ip_types.go b/pkg/vpplink/types/ip_types.go similarity index 97% rename from vpplink/types/ip_types.go rename to pkg/vpplink/types/ip_types.go index 4e3cb8b22..b762afaf7 100644 --- a/vpplink/types/ip_types.go +++ b/pkg/vpplink/types/ip_types.go @@ -23,8 +23,8 @@ import ( "golang.org/x/sys/unix" - vppip "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" + vppip "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" ) type IPProto uint8 diff --git a/vpplink/types/ipsec.go b/pkg/vpplink/types/ipsec.go similarity index 100% rename from vpplink/types/ipsec.go rename to pkg/vpplink/types/ipsec.go diff --git a/vpplink/types/memif.go b/pkg/vpplink/types/memif.go similarity index 89% rename from vpplink/types/memif.go rename to pkg/vpplink/types/memif.go index 1ef10efeb..3992cba92 100644 --- a/vpplink/types/memif.go +++ b/pkg/vpplink/types/memif.go @@ -18,8 +18,8 @@ package types import ( "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/memif" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/memif" ) type MemifRole uint32 diff --git a/vpplink/types/nat.go b/pkg/vpplink/types/nat.go similarity index 95% rename from vpplink/types/nat.go rename to pkg/vpplink/types/nat.go index 2cd46e76b..dda3b6ca9 100644 --- a/vpplink/types/nat.go +++ b/pkg/vpplink/types/nat.go @@ -19,7 +19,7 @@ import ( "fmt" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/nat_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/nat_types" ) type NatFlags uint8 diff --git a/vpplink/types/neigh.go b/pkg/vpplink/types/neigh.go similarity index 94% rename from vpplink/types/neigh.go rename to pkg/vpplink/types/neigh.go index 1b16eaf73..ef720238c 100644 --- a/vpplink/types/neigh.go +++ b/pkg/vpplink/types/neigh.go @@ -19,7 +19,7 @@ import ( "fmt" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_neighbor" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_neighbor" ) type IPNeighborFlags uint32 diff --git a/vpplink/types/npol.go b/pkg/vpplink/types/npol.go similarity index 99% rename from vpplink/types/npol.go rename to pkg/vpplink/types/npol.go index 4d3d86824..a9817d759 100644 --- a/vpplink/types/npol.go +++ b/pkg/vpplink/types/npol.go @@ -20,7 +20,7 @@ import ( "net" "reflect" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/npol" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/npol" ) const InvalidID uint32 = ^uint32(0) diff --git a/vpplink/types/pbl.go b/pkg/vpplink/types/pbl.go similarity index 100% rename from vpplink/types/pbl.go rename to pkg/vpplink/types/pbl.go diff --git a/vpplink/types/redirect.go b/pkg/vpplink/types/redirect.go similarity index 100% rename from vpplink/types/redirect.go rename to pkg/vpplink/types/redirect.go diff --git a/vpplink/types/route.go b/pkg/vpplink/types/route.go similarity index 98% rename from vpplink/types/route.go rename to pkg/vpplink/types/route.go index 99e39d70a..1c6cb1025 100644 --- a/vpplink/types/route.go +++ b/pkg/vpplink/types/route.go @@ -20,7 +20,7 @@ import ( "net" "strings" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/fib_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/fib_types" ) type RoutePath struct { diff --git a/vpplink/types/session.go b/pkg/vpplink/types/session.go similarity index 100% rename from vpplink/types/session.go rename to pkg/vpplink/types/session.go diff --git a/vpplink/types/sr.go b/pkg/vpplink/types/sr.go similarity index 92% rename from vpplink/types/sr.go rename to pkg/vpplink/types/sr.go index b8e8cc660..7f8013cc3 100644 --- a/vpplink/types/sr.go +++ b/pkg/vpplink/types/sr.go @@ -5,10 +5,10 @@ import ( bgpapi "github.com/osrg/gobgp/v3/api" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/sr" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/sr_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/sr" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/sr_types" ) type SrBehavior uint8 diff --git a/vpplink/types/vpp_interface.go b/pkg/vpplink/types/vpp_interface.go similarity index 95% rename from vpplink/types/vpp_interface.go rename to pkg/vpplink/types/vpp_interface.go index e8b4b2f49..44e3a0130 100644 --- a/vpplink/types/vpp_interface.go +++ b/pkg/vpplink/types/vpp_interface.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/af_packet" - interfaces "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/af_packet" + interfaces "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" ) type RxMode uint32 diff --git a/vpplink/types/vxlan.go b/pkg/vpplink/types/vxlan.go similarity index 100% rename from vpplink/types/vxlan.go rename to pkg/vpplink/types/vxlan.go diff --git a/vpplink/types/wireguard.go b/pkg/vpplink/types/wireguard.go similarity index 100% rename from vpplink/types/wireguard.go rename to pkg/vpplink/types/wireguard.go diff --git a/vpplink/urpf.go b/pkg/vpplink/urpf.go similarity index 89% rename from vpplink/urpf.go rename to pkg/vpplink/urpf.go index 594b80c30..24d88884d 100644 --- a/vpplink/urpf.go +++ b/pkg/vpplink/urpf.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/urpf" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/urpf" ) func (v *VppLink) SetCustomURPF(swifindex uint32, tableID uint32, ipFamily IPFamily) error { diff --git a/vpplink/util.go b/pkg/vpplink/util.go similarity index 100% rename from vpplink/util.go rename to pkg/vpplink/util.go diff --git a/vpplink/virtio.go b/pkg/vpplink/virtio.go similarity index 85% rename from vpplink/virtio.go rename to pkg/vpplink/virtio.go index 786303de2..621db3119 100644 --- a/vpplink/virtio.go +++ b/pkg/vpplink/virtio.go @@ -19,11 +19,11 @@ import ( "fmt" "strconv" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ethernet_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/pci_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/virtio" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ethernet_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/pci_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/virtio" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func parsePciAddr(addr string) (*pci_types.PciAddress, error) { diff --git a/vpplink/vlib.go b/pkg/vpplink/vlib.go similarity index 96% rename from vpplink/vlib.go rename to pkg/vpplink/vlib.go index bf6cce1bf..9b4c1bd68 100644 --- a/vpplink/vlib.go +++ b/pkg/vpplink/vlib.go @@ -18,7 +18,7 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/vlib" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/vlib" ) // GetNodeIndex gets node index of the node given by name. This is a helper method for VPP's node graph diff --git a/vpplink/vmxnet3.go b/pkg/vpplink/vmxnet3.go similarity index 90% rename from vpplink/vmxnet3.go rename to pkg/vpplink/vmxnet3.go index ee9286b38..9be35f7d2 100644 --- a/vpplink/vmxnet3.go +++ b/pkg/vpplink/vmxnet3.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/vmxnet3" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/vmxnet3" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" ) func (v *VppLink) CreateVmxnet3(intf *types.Vmxnet3Interface) (uint32, error) { diff --git a/vpplink/vpe.go b/pkg/vpplink/vpe.go similarity index 89% rename from vpplink/vpe.go rename to pkg/vpplink/vpe.go index 42fd9512f..f6be6287f 100644 --- a/vpplink/vpe.go +++ b/pkg/vpplink/vpe.go @@ -18,8 +18,8 @@ package vpplink import ( "fmt" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/vlib" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/vpe" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/vlib" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/vpe" ) func (v *VppLink) GetVPPVersion() (string, error) { diff --git a/vpplink/vpplink.go b/pkg/vpplink/vpplink.go similarity index 100% rename from vpplink/vpplink.go rename to pkg/vpplink/vpplink.go diff --git a/vpplink/vxlan.go b/pkg/vpplink/vxlan.go similarity index 91% rename from vpplink/vxlan.go rename to pkg/vpplink/vxlan.go index 66aeeadb1..5f475c733 100644 --- a/vpplink/vxlan.go +++ b/pkg/vpplink/vxlan.go @@ -19,9 +19,9 @@ import ( "io" types "github.com/calico-vpp/vpplink/api/v0" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/vxlan" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/vxlan" ) func (v *Vpp) ListVXLanTunnels() ([]types.VXLanTunnel, error) { diff --git a/vpplink/wireguard.go b/pkg/vpplink/wireguard.go similarity index 94% rename from vpplink/wireguard.go rename to pkg/vpplink/wireguard.go index 857eaef0a..61eb77787 100644 --- a/vpplink/wireguard.go +++ b/pkg/vpplink/wireguard.go @@ -20,12 +20,12 @@ import ( "io" "net" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/wireguard" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/ip_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/wireguard" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/types" typesv0 "github.com/calico-vpp/vpplink/api/v0" - "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types" + "github.com/projectcalico/vpp-dataplane/v3/pkg/vpplink/generated/bindings/interface_types" ) func (v *Vpp) ListWireguardTunnels() ([]*typesv0.WireguardTunnel, error) { diff --git a/test/kind/Makefile b/test/kind/Makefile index daef3376c..58d450b30 100644 --- a/test/kind/Makefile +++ b/test/kind/Makefile @@ -31,10 +31,6 @@ rm-cluster: dev: docker image tag calicovpp/vpp:$(TAG) localhost:5000/calicovpp/vpp:master docker push localhost:5000/calicovpp/vpp:master - docker image tag calicovpp/agent:$(TAG) localhost:5000/calicovpp/agent:master - docker push localhost:5000/calicovpp/agent:master - docker image tag calicovpp/multinet-monitor:$(TAG) localhost:5000/calicovpp/multinet-monitor:master - docker push localhost:5000/calicovpp/multinet-monitor:master # this is for a cluster using a mirror docker.io -> localhost:5000 to avoid pull rate limit .PHONY: load-mirror diff --git a/test/kind/install_calico_vpp.sh b/test/kind/install_calico_vpp.sh index 4ac2dabb9..0256bb594 100755 --- a/test/kind/install_calico_vpp.sh +++ b/test/kind/install_calico_vpp.sh @@ -15,8 +15,6 @@ while [[ "$(kubectl api-resources --api-group=operator.tigera.io | grep Installa export TAG=${TAG:-latest} -export CALICO_AGENT_IMAGE=localhost:5000/calicovpp/agent:${TAG} -export MULTINET_MONITOR_IMAGE=localhost:5000/calicovpp/multinet-monitor:${TAG} if [[ "${DEBUG}" = "true" ]]; then export CALICO_VPP_IMAGE=localhost:5000/calicovpp/vpp:dbg-${TAG} else diff --git a/test/scale/README.md b/test/scale/README.md index 877658d27..ec95caf2d 100644 --- a/test/scale/README.md +++ b/test/scale/README.md @@ -128,9 +128,7 @@ kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/master/ If you want to use local CalicoVPP images run the following: ````bash -export CALICO_AGENT_IMAGE=localhost:5000/calicovpp/agent:latest export CALICO_VPP_IMAGE=localhost:5000/calicovpp/vpp:latest -export MULTINET_MONITOR_IMAGE=localhost:5000/calicovpp/multinet-monitor:latest export IMAGE_PULL_POLICY=Always ```` diff --git a/test/scripts/README.md b/test/scripts/README.md index e98c91ad4..a4ba319cc 100644 --- a/test/scripts/README.md +++ b/test/scripts/README.md @@ -49,9 +49,7 @@ kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/master/ ````bash # ---------------- images ---------------- -export CALICO_AGENT_IMAGE=calicovpp/agent:v3.26.0 export CALICO_VPP_IMAGE=calicovpp/vpp:v3.26.0 -export MULTINET_MONITOR_IMAGE=calicovpp/multinet-monitor:v3.26.0 export IMAGE_PULL_POLICY=IfNotPresent # ---------------- interfaces ---------------- diff --git a/test/scripts/ci_util.sh b/test/scripts/ci_util.sh index ca1cff07c..31d9ce083 100644 --- a/test/scripts/ci_util.sh +++ b/test/scripts/ci_util.sh @@ -16,7 +16,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source $SCRIPTDIR/shared.sh -PCI_BIND_NIC_TO_KERNEL=~/vpp-manager/vpp_build/extras/scripts/pci-nic-bind-to-kernel +PCI_BIND_NIC_TO_KERNEL=~/vpp_build/extras/scripts/pci-nic-bind-to-kernel # ------------ CLUSTER ------------ @@ -72,7 +72,6 @@ function wait_for_calico_vpp () { function start_calico () { blue "Starting calico $1... at $(date)" - export CALICO_NODE_IMAGE=calicovpp/node:latest export CALICO_VPP_IMAGE=calicovpp/vpp:latest export IMAGE_PULL_POLICY=Never export CALICOVPP_CORE_PATTERN=/home/hostuser/vppcore.%e.%p diff --git a/test/scripts/mngmt.sh b/test/scripts/mngmt.sh index ff3825422..566619f26 100755 --- a/test/scripts/mngmt.sh +++ b/test/scripts/mngmt.sh @@ -56,12 +56,9 @@ git clean -fd make -C $VPP_DATAPLANE_DIRECTORY image TAG=$TAG echo "built calicovpp/vpp:${TAG}" -echo "built calicovpp/agent:${TAG}" for tagname in $(echo $EXTRA_TAGS | sed 's/,/ /g'); do echo "Tagging calicovpp/vpp:\${tagname}..." docker tag calicovpp/vpp:${TAG} calicovpp/vpp:\${tagname} - echo "Tagging calicovpp/agent:\${tagname}..." - docker tag calicovpp/agent:${TAG} calicovpp/agent:\${tagname} done if [ $PUSH != "y" ]; then @@ -74,13 +71,9 @@ docker login --username $DOCKER_USERNAME --password $DOCKER_TOKEN echo ">> Pushing calicovpp/vpp:${TAG}...." docker push calicovpp/vpp:${TAG} -echo ">> Pushing calicovpp/agent:${TAG}...." -docker push calicovpp/agent:${TAG} for tagname in $(echo $EXTRA_TAGS | sed 's/,/ /g'); do echo ">> Pushing calicovpp/vpp:\${tagname}...." docker push calicovpp/vpp:\${tagname} - echo ">> Pushing calicovpp/vpp:\${tagname}...." - docker push calicovpp/agent:\${tagname} done EOF @@ -101,7 +94,7 @@ EOF echo "SHAs :" >> ${BUILD_LOG_DIR}/${BUILD_NAME}/summary echo "--------------------------------------------------" >> ${BUILD_LOG_DIR}/${BUILD_NAME}/summary ssh $SSH_NAME /bin/bash >> ${BUILD_LOG_DIR}/${BUILD_NAME}/summary << EOF -for imgname in calicovpp/vpp calicovpp/agent; do +for imgname in calicovpp/vpp; do for tagname in $(echo "${TAG},${EXTRA_TAGS}" | sed 's/,/ /g'); do echo "\${imgname}:\${tagname} \$(docker inspect \${imgname}:\${tagname} --format '{{ .RepoDigests }}')" done diff --git a/test/yaml/mvpp/README.md b/test/yaml/mvpp/README.md index ff4828d03..c99396bd3 100644 --- a/test/yaml/mvpp/README.md +++ b/test/yaml/mvpp/README.md @@ -19,7 +19,7 @@ spec: spec: containers: - name: agent - image: calicovpp/agent:latest + image: calicovpp/vpp:latest env: - name: CALICOVPP_ENABLE_MEMIF value: "true" diff --git a/yaml/Makefile b/yaml/Makefile index 2c8d701f4..91d03c151 100644 --- a/yaml/Makefile +++ b/yaml/Makefile @@ -21,6 +21,16 @@ build: clean kubectl kustomize overlays/eks-dpdk-multinet > generated/calico-vpp-eks-dpdk-multinet.yaml kubectl kustomize overlays/kind > generated/calico-vpp-kind.yaml kubectl kustomize overlays/kind-multinet > generated/calico-vpp-kind-multinet.yaml + # Kube-test manifest (consumed by `make -C .. kube-test-template`). + # The kind flavor is checked-in as the canonical generated file; the + # baremetal flavor is generated on demand via `make kube-test-template + # FLAVOR=baremetal` from the repo root. + { kubectl kustomize overlays/kube-test-kind ; \ + echo "---" ; \ + cat components/kube-test/tigera-installation.snippet.yaml ; \ + } > generated/calico-vpp-kubetest.yaml + # Sanity-check the baremetal flavor compiles (not exported) + kubectl kustomize overlays/kube-test-baremetal > /dev/null # Do not export the test-* overlays, but still check they compile kubectl kustomize overlays/test-vagrant > /dev/null kubectl kustomize overlays/test-vagrant-mounts > /dev/null @@ -34,4 +44,4 @@ build: clean .PHONY: clean clean: - @rm -f generated/*.yaml + @rm -f generated/*.yaml \ No newline at end of file diff --git a/yaml/base/calico-vpp-daemonset.yaml b/yaml/base/calico-vpp-daemonset.yaml index 3de4f6eda..770722292 100644 --- a/yaml/base/calico-vpp-daemonset.yaml +++ b/yaml/base/calico-vpp-daemonset.yaml @@ -261,7 +261,8 @@ spec: priorityClassName: system-node-critical containers: - name: agent - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest + command: ["/bin/calico-vpp-agent"] imagePullPolicy: IfNotPresent envFrom: - configMapRef: diff --git a/yaml/components/kube-test/README.md b/yaml/components/kube-test/README.md new file mode 100644 index 000000000..1554722c8 --- /dev/null +++ b/yaml/components/kube-test/README.md @@ -0,0 +1,42 @@ +# Kube-test kustomize component + +This component transforms the standard CalicoVPP daemonset for use +by the VPP `extras/kube-test` test harness (and other consumers that +share its constraints). + +This file documents the **split-image** variant of the component used +on release branches `<= v3.32`. `master`/`>= v3.33` ships a unified-image +variant where the agent container reuses `calicovpp/vpp` with an explicit +`command: ["/bin/calico-vpp-agent"]` override. Either way, the consumer +just sees a working manifest. + +## What this component owns (consumer-agnostic, layout-aware) + +* Image references (registry `localhost:5000`, `imagePullPolicy: Always`). +* The split-image layout: the `vpp` container uses `calicovpp/vpp` and the + `agent` container uses `calicovpp/agent` with no command override. +* The path to the in-tree VPP build output that is bind-mounted into the + containers as `/repo/vpp-manager/vpp_build/...`. +* The tigera-operator `Installation` and `APIServer` CRs that kube-test + needs to bootstrap Calico. + +When the layout changes, **only this component** (and its base manifest) +needs to change. Consumers stay untouched. + +## What the consumer (e.g. VPP kube-test) owns + +Only the following placeholders survive in the emitted manifest and must +be substituted by the consumer at apply-time (e.g. via `envsubst`): + +| Placeholder | Owner / typical source | +| ----------------------------- | ------------------------------------ | +| `${CALICOVPP_VERSION}` | image tag (`kt-master`, `v3.32.0`) | +| `${HOME}` | host path for calicovpp checkout | +| `${ADDITIONAL_VPP_CONFIG}` | per-test extra VPP startup CLI | +| `${CALICOVPP_ENABLE_MEMIF}` | per-test memif feature toggle | +| `${CALICO_NETWORK_CONFIG}` | per-test calico-network override | +| `${CALICOVPP_INTERFACE}` | baremetal-only: uplink NIC name | + +The consumer MUST NOT need to know which image name to use, what the +in-repo path of the VPP build directory is or any other CalicoVPP +internal detail. diff --git a/yaml/components/kube-test/baremetal/configmap-baremetal.yaml b/yaml/components/kube-test/baremetal/configmap-baremetal.yaml new file mode 100644 index 000000000..1aa2dfcf5 --- /dev/null +++ b/yaml/components/kube-test/baremetal/configmap-baremetal.yaml @@ -0,0 +1,58 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: calico-vpp-config + namespace: calico-vpp-dataplane +data: + CALICOVPP_CONFIG_TEMPLATE: |- + unix { + nodaemon + full-coredump + cli-listen /var/run/vpp/cli.sock + pidfile /run/vpp/vpp.pid + exec /etc/vpp/startup.exec + } + api-trace { on } + socksvr { + socket-name /var/run/vpp/vpp-api.sock + } + plugins { + plugin default { enable } + plugin dpdk_plugin.so { enable } + plugin calico_plugin.so { enable } + plugin ping_plugin.so { enable } + plugin dispatch_trace_plugin.so { enable } + } + buffers { + buffers-per-numa 131072 + } + ${ADDITIONAL_VPP_CONFIG} + CALICOVPP_INITIAL_CONFIG: |- + { + "vppStartupSleepSeconds": 1, + "corePattern": "/var/lib/vpp/vppcore.%e.%p" + } + CALICOVPP_FEATURE_GATES: |- + { + "memifEnabled": true, + "vclEnabled": true + } + CALICOVPP_INTERFACES: |- + { + "maxPodIfSpec": { + "rx": 10, "tx": 10, "rxqsz": 1024, "txqsz": 1024 + }, + "defaultPodIfSpec": { + "rx": 1, "tx":1, "isl3": true + }, + "vppHostTapSpec": { + "rx": 1, "tx":1, "rxqsz": 1024, "txqsz": 1024, "isl3": false + }, + "uplinkInterfaces": [ + { + "interfaceName": "${CALICOVPP_INTERFACE}", + "vppDriver": "dpdk" + } + ] + } + SERVICE_PREFIX: 10.96.0.0/12 diff --git a/yaml/components/kube-test/baremetal/daemonset-baremetal.yaml b/yaml/components/kube-test/baremetal/daemonset-baremetal.yaml new file mode 100644 index 000000000..ed2b61c12 --- /dev/null +++ b/yaml/components/kube-test/baremetal/daemonset-baremetal.yaml @@ -0,0 +1,29 @@ +# Baremetal kube-test overrides: DPDK driver requires hugepages and a +# larger CPU allocation than the KinD flavor. +# +# Also: baremetal uses docker.io as the image registry (no kind-registry), +# so we override the registry prefix back to docker.io and switch to +# `imagePullPolicy: IfNotPresent` since images come from a public registry. +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: calico-vpp-node + namespace: calico-vpp-dataplane +spec: + template: + spec: + containers: + - name: vpp + image: docker.io/calicovpp/vpp:${CALICOVPP_VERSION} + imagePullPolicy: IfNotPresent + resources: + limits: + cpu: "10" + hugepages-2Mi: 4Gi + memory: 4Gi + requests: + cpu: "10" + memory: 4Gi + - name: agent + image: docker.io/calicovpp/vpp:${CALICOVPP_VERSION} + imagePullPolicy: IfNotPresent diff --git a/yaml/components/kube-test/baremetal/kustomization.yaml b/yaml/components/kube-test/baremetal/kustomization.yaml new file mode 100644 index 000000000..428dd76a1 --- /dev/null +++ b/yaml/components/kube-test/baremetal/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +# Baremetal-flavor adjustments on top of components/kube-test: +# - uplink interface name is provided by the consumer at apply-time +# - DPDK driver +# - hugepages and a larger buffer pool +patchesStrategicMerge: +- daemonset-baremetal.yaml +- configmap-baremetal.yaml diff --git a/yaml/components/kube-test/configmap-kube-test.yaml b/yaml/components/kube-test/configmap-kube-test.yaml new file mode 100644 index 000000000..8be72ce82 --- /dev/null +++ b/yaml/components/kube-test/configmap-kube-test.yaml @@ -0,0 +1,71 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: calico-vpp-config + namespace: calico-vpp-dataplane +data: + CALICOVPP_BGP_LOG_LEVEL: "" + CALICOVPP_CONFIG_EXEC_TEMPLATE: "" + CALICOVPP_CONFIG_TEMPLATE: |- + unix { + nodaemon + full-coredump + log /var/run/vpp/vpp.log + cli-listen /var/run/vpp/cli.sock + pidfile /run/vpp/vpp.pid + } + cpu { + workers 0 + } + socksvr { + socket-name /var/run/vpp/vpp-api.sock + } + buffers { + buffers-per-numa 16384 + page-size 4K + } + plugins { + plugin default { enable } + plugin calico_plugin.so { enable } + plugin dpdk_plugin.so { disable } + } + ${ADDITIONAL_VPP_CONFIG} + CALICOVPP_DEBUG: |- + { + "servicesEnabled": true, + "gsoEnabled": true + } + CALICOVPP_FEATURE_GATES: |- + { + "memifEnabled": true, + "vclEnabled": true, + "multinetEnabled": false, + "ipsecEnabled": false, + "prometheusEnabled": true + } + CALICOVPP_INIT_SCRIPT_TEMPLATE: "" + CALICOVPP_INITIAL_CONFIG: |- + { + "vppStartupSleepSeconds": 0, + "corePattern": "/var/lib/vpp/vppcore.%e.%p", + "defaultGWs": "", + "healthCheckPort": 9090, + "redirectToHostRules": [ + { + "proto": "udp", + "port": 53, + "ip": "172.18.0.1" + } + ] + } + CALICOVPP_IPSEC: |- + {} + CALICOVPP_IPSEC_IKEV2_PSK: "keykeykey" + CALICOVPP_LOG_FORMAT: pretty + CALICOVPP_LOG_LEVEL: "debug" + CALICOVPP_SRV6: |- + {} + CALICOVPP_SWAP_DRIVER: "" + DEBUG: "false" + GOCOVERDIR: /repo/.coverage/kind + SERVICE_PREFIX: 11.96.0.0/12,fd10::0/120 diff --git a/yaml/components/kube-test/daemonset-kube-test.yaml b/yaml/components/kube-test/daemonset-kube-test.yaml new file mode 100644 index 000000000..d24bfcef7 --- /dev/null +++ b/yaml/components/kube-test/daemonset-kube-test.yaml @@ -0,0 +1,59 @@ +# Strategic-merge patch on top of yaml/base/calico-vpp-daemonset.yaml that +# adapts the daemonset for kube-test consumption. +# +# Layout-specific knowledge baked in here (master/>=v3.33 layout): +# - unified image: calicovpp/vpp +# - agent command override: /bin/calico-vpp-agent +# - VPP build path inside repo: vpp_build +# +# Older release branches (<= v3.32) can backport this component by simply +# pointing the agent container at `calicovpp/agent`, dropping the command +# override, and changing the LD_LIBRARY_PATH below. +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: calico-vpp-node + namespace: calico-vpp-dataplane +spec: + template: + spec: + containers: + - name: vpp + image: localhost:5000/calicovpp/vpp:${CALICOVPP_VERSION} + imagePullPolicy: Always + env: + - name: LD_LIBRARY_PATH + value: /repo/vpp_build/build-root/install-vpp-native/vpp/ + resources: + limits: + memory: 80Gi + requests: + cpu: 1 + memory: 4Gi + volumeMounts: + - mountPath: /repo + name: repo-directory + - mountPath: /etc/ssl/certs/ + name: ssl-certs + - mountPath: /usr/share/ca-certificates + name: share-certs + - name: agent + image: localhost:5000/calicovpp/vpp:${CALICOVPP_VERSION} + command: ["/bin/calico-vpp-agent"] + imagePullPolicy: Always + env: + - name: CALICOVPP_ENABLE_MEMIF + value: ${CALICOVPP_ENABLE_MEMIF} + volumeMounts: + - mountPath: /repo + name: repo-directory + volumes: + - name: repo-directory + hostPath: + path: ${HOME}/vpp-dataplane + - name: ssl-certs + hostPath: + path: /etc/ssl/certs/ + - name: share-certs + hostPath: + path: /usr/share/ca-certificates diff --git a/yaml/components/kube-test/kind/configmap-kind.yaml b/yaml/components/kube-test/kind/configmap-kind.yaml new file mode 100644 index 000000000..6392ed444 --- /dev/null +++ b/yaml/components/kube-test/kind/configmap-kind.yaml @@ -0,0 +1,32 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: calico-vpp-config + namespace: calico-vpp-dataplane +data: + CALICOVPP_INTERFACES: |- + { + "defaultPodIfSpec": { + "rx": 1, + "tx": 1, + "rxqsz": 128, + "txqsz": 128, + "isl3": true, + "rxMode": "interrupt" + }, + "vppHostTapSpec": { + "rx": 1, + "tx": 1, + "rxqsz": 512, + "txqsz": 512, + "isl3": false, + "rxMode": "interrupt" + }, + "uplinkInterfaces": [ + { + "interfaceName": "eth0", + "vppDriver": "af_packet", + "rxMode": "interrupt" + } + ] + } diff --git a/yaml/components/kube-test/kind/kustomization.yaml b/yaml/components/kube-test/kind/kustomization.yaml new file mode 100644 index 000000000..d4ef57475 --- /dev/null +++ b/yaml/components/kube-test/kind/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +# KinD-flavor adjustments on top of components/kube-test: +# - uplink interface is the KinD bridge (eth0, af_packet) +# - no hugepages +patchesStrategicMerge: +- configmap-kind.yaml diff --git a/yaml/components/kube-test/kustomization.yaml b/yaml/components/kube-test/kustomization.yaml new file mode 100644 index 000000000..2ee128279 --- /dev/null +++ b/yaml/components/kube-test/kustomization.yaml @@ -0,0 +1,22 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +# Kube-test specific transformations applied on top of the standard +# CalicoVPP daemonset. This component is intentionally consumer-agnostic: +# it produces a manifest that VPP kube-test (or any other consumer) can +# apply after substituting only its own runtime variables. +# +# Layout-specific values (image names, in-repo paths to VPP build, etc.) +# are owned by THIS file and the base daemonset - they MUST NOT leak into +# the consumer (VPP kube-test). Runtime placeholders that remain in the +# emitted manifest are documented in yaml/components/kube-test/README.md. + +patchesStrategicMerge: +- daemonset-kube-test.yaml +- configmap-kube-test.yaml + +# Note: the tigera-operator `Installation`/`APIServer` resources are not part +# of this component because they need to embed the `${CALICO_NETWORK_CONFIG}` +# runtime placeholder, which is not a valid YAML scalar at kustomize parse +# time. They are appended by `make kube-test-template` from +# `components/kube-test/tigera-installation.snippet.yaml`. \ No newline at end of file diff --git a/yaml/components/kube-test/tigera-installation.snippet.yaml b/yaml/components/kube-test/tigera-installation.snippet.yaml new file mode 100644 index 000000000..2390a60f5 --- /dev/null +++ b/yaml/components/kube-test/tigera-installation.snippet.yaml @@ -0,0 +1,29 @@ +# NOT a kustomize resource - this file embeds the `${CALICO_NETWORK_CONFIG}` +# runtime placeholder which makes it invalid YAML until `envsubst` has run. +# Appended verbatim by `make kube-test-template` after the kustomize build. +apiVersion: operator.tigera.io/v1 +kind: APIServer +metadata: + name: default +spec: {} +--- +apiVersion: operator.tigera.io/v1 +kind: Installation +metadata: + name: default +spec: + registry: localhost:5000 + calicoNetwork: + ipPools: + - cidr: 11.0.0.0/24 + encapsulation: IPIP + natOutgoing: Enabled + - cidr: fd20::/64 + encapsulation: VXLAN + natOutgoing: Enabled + linuxDataplane: VPP + nodeAddressAutodetectionV4: + interface: eth0 + nodeAddressAutodetectionV6: + interface: eth0 + ${CALICO_NETWORK_CONFIG} \ No newline at end of file diff --git a/yaml/components/multinet/monitor-deployment.yaml b/yaml/components/multinet/monitor-deployment.yaml index 47b837a50..9a0204e04 100644 --- a/yaml/components/multinet/monitor-deployment.yaml +++ b/yaml/components/multinet/monitor-deployment.yaml @@ -18,7 +18,8 @@ spec: serviceAccountName: calico-vpp-node-sa containers: - name: multinet-monitor - image: docker.io/calicovpp/multinet-monitor:latest + image: docker.io/calicovpp/vpp:latest + command: ["/bin/multinet-monitor"] imagePullPolicy: IfNotPresent resources: requests: diff --git a/yaml/components/vagrant-mounts/mounts.yaml b/yaml/components/vagrant-mounts/mounts.yaml index cd4690de4..0168af161 100644 --- a/yaml/components/vagrant-mounts/mounts.yaml +++ b/yaml/components/vagrant-mounts/mounts.yaml @@ -44,13 +44,12 @@ spec: - name: api-proxy-binary hostPath: type: File - path: /host-repo/calico-vpp-agent/bin/felix-api-proxy + path: /host-repo/pkg/calico-vpp-agent/bin/felix-api-proxy - name: agent-binary hostPath: type: File - path: /host-repo/calico-vpp-agent/bin/calico-vpp-agent + path: /host-repo/pkg/calico-vpp-agent/bin/calico-vpp-agent - name: vpp-root hostPath: type: Directory - path: /host-repo/vpp-manager/vpp_build - + path: /host-repo/vpp_build diff --git a/yaml/generated/calico-vpp-dpdk.yaml b/yaml/generated/calico-vpp-dpdk.yaml index fc7653cea..fbc78f823 100644 --- a/yaml/generated/calico-vpp-dpdk.yaml +++ b/yaml/generated/calico-vpp-dpdk.yaml @@ -256,7 +256,9 @@ spec: name: netns - mountPath: /host name: host-root - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -272,7 +274,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-eks-dpdk-multinet.yaml b/yaml/generated/calico-vpp-eks-dpdk-multinet.yaml index bde7a1603..e6676cd30 100644 --- a/yaml/generated/calico-vpp-eks-dpdk-multinet.yaml +++ b/yaml/generated/calico-vpp-eks-dpdk-multinet.yaml @@ -240,7 +240,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - image: docker.io/calicovpp/multinet-monitor:latest + - command: + - /bin/multinet-monitor + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent name: multinet-monitor resources: @@ -317,7 +319,9 @@ spec: name: netns - mountPath: /host name: host-root - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -333,7 +337,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-eks-dpdk.yaml b/yaml/generated/calico-vpp-eks-dpdk.yaml index 5539634a3..44bf47ded 100644 --- a/yaml/generated/calico-vpp-eks-dpdk.yaml +++ b/yaml/generated/calico-vpp-eks-dpdk.yaml @@ -267,7 +267,9 @@ spec: name: netns - mountPath: /host name: host-root - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -283,7 +285,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-eks-multinet.yaml b/yaml/generated/calico-vpp-eks-multinet.yaml index 5de2f856b..77e47599c 100644 --- a/yaml/generated/calico-vpp-eks-multinet.yaml +++ b/yaml/generated/calico-vpp-eks-multinet.yaml @@ -240,7 +240,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - image: docker.io/calicovpp/multinet-monitor:latest + - command: + - /bin/multinet-monitor + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent name: multinet-monitor resources: @@ -315,7 +317,9 @@ spec: name: netns - mountPath: /host name: host-root - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -331,7 +335,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-eks.yaml b/yaml/generated/calico-vpp-eks.yaml index 97502776e..0253fc0ed 100644 --- a/yaml/generated/calico-vpp-eks.yaml +++ b/yaml/generated/calico-vpp-eks.yaml @@ -265,7 +265,9 @@ spec: name: netns - mountPath: /host name: host-root - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -281,7 +283,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-kind-multinet.yaml b/yaml/generated/calico-vpp-kind-multinet.yaml index 0cd959860..5783b43a1 100644 --- a/yaml/generated/calico-vpp-kind-multinet.yaml +++ b/yaml/generated/calico-vpp-kind-multinet.yaml @@ -243,7 +243,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - image: docker.io/calicovpp/multinet-monitor:latest + - command: + - /bin/multinet-monitor + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent name: multinet-monitor resources: @@ -268,7 +270,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -284,7 +288,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-kind.yaml b/yaml/generated/calico-vpp-kind.yaml index ac96b120a..6619c42ba 100644 --- a/yaml/generated/calico-vpp-kind.yaml +++ b/yaml/generated/calico-vpp-kind.yaml @@ -218,7 +218,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -234,7 +236,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-kubetest.yaml b/yaml/generated/calico-vpp-kubetest.yaml new file mode 100644 index 000000000..660c3246a --- /dev/null +++ b/yaml/generated/calico-vpp-kubetest.yaml @@ -0,0 +1,464 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: calico-vpp-dataplane +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: calico-vpp-node-sa + namespace: calico-vpp-dataplane +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: calico-vpp-node-role +rules: +- apiGroups: + - "" + resources: + - pods + - nodes + - namespaces + verbs: + - get +- apiGroups: + - "" + resources: + - endpoints + - services + verbs: + - watch + - list + - get +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - watch + - list + - get +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get +- apiGroups: + - "" + resources: + - nodes/status + verbs: + - patch + - update +- apiGroups: + - networking.k8s.io + resources: + - networkpolicies + verbs: + - watch + - list +- apiGroups: + - "" + resources: + - pods + - namespaces + - serviceaccounts + verbs: + - list + - watch +- apiGroups: + - "" + resources: + - pods/status + verbs: + - patch +- apiGroups: + - crd.projectcalico.org + resources: + - globalfelixconfigs + - felixconfigurations + - bgppeers + - bgpfilters + - globalbgpconfigs + - bgpconfigurations + - ippools + - ipamblocks + - globalnetworkpolicies + - globalnetworksets + - networkpolicies + - networksets + - clusterinformations + - hostendpoints + - blockaffinities + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - list + - watch +- apiGroups: + - crd.projectcalico.org + resources: + - blockaffinities + - ipamblocks + - ipamhandles + verbs: + - get + - list + - create + - update + - delete +- apiGroups: + - crd.projectcalico.org + resources: + - ipamconfigs + verbs: + - get +- apiGroups: + - crd.projectcalico.org + resources: + - blockaffinities + verbs: + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: calico-vpp-node +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: calico-vpp-node-role +subjects: +- kind: ServiceAccount + name: calico-vpp-node-sa + namespace: calico-vpp-dataplane +--- +apiVersion: v1 +data: + CALICOVPP_BGP_LOG_LEVEL: "" + CALICOVPP_CONFIG_EXEC_TEMPLATE: "" + CALICOVPP_CONFIG_TEMPLATE: |- + unix { + nodaemon + full-coredump + log /var/run/vpp/vpp.log + cli-listen /var/run/vpp/cli.sock + pidfile /run/vpp/vpp.pid + } + cpu { + workers 0 + } + socksvr { + socket-name /var/run/vpp/vpp-api.sock + } + buffers { + buffers-per-numa 16384 + page-size 4K + } + plugins { + plugin default { enable } + plugin calico_plugin.so { enable } + plugin dpdk_plugin.so { disable } + } + ${ADDITIONAL_VPP_CONFIG} + CALICOVPP_DEBUG: |- + { + "servicesEnabled": true, + "gsoEnabled": true + } + CALICOVPP_FEATURE_GATES: |- + { + "memifEnabled": true, + "vclEnabled": true, + "multinetEnabled": false, + "ipsecEnabled": false, + "prometheusEnabled": true + } + CALICOVPP_INIT_SCRIPT_TEMPLATE: "" + CALICOVPP_INITIAL_CONFIG: |- + { + "vppStartupSleepSeconds": 0, + "corePattern": "/var/lib/vpp/vppcore.%e.%p", + "defaultGWs": "", + "healthCheckPort": 9090, + "redirectToHostRules": [ + { + "proto": "udp", + "port": 53, + "ip": "172.18.0.1" + } + ] + } + CALICOVPP_INTERFACES: |- + { + "defaultPodIfSpec": { + "rx": 1, + "tx": 1, + "rxqsz": 128, + "txqsz": 128, + "isl3": true, + "rxMode": "interrupt" + }, + "vppHostTapSpec": { + "rx": 1, + "tx": 1, + "rxqsz": 512, + "txqsz": 512, + "isl3": false, + "rxMode": "interrupt" + }, + "uplinkInterfaces": [ + { + "interfaceName": "eth0", + "vppDriver": "af_packet", + "rxMode": "interrupt" + } + ] + } + CALICOVPP_IPSEC: '{}' + CALICOVPP_IPSEC_IKEV2_PSK: keykeykey + CALICOVPP_LOG_FORMAT: pretty + CALICOVPP_LOG_LEVEL: debug + CALICOVPP_SRV6: '{}' + CALICOVPP_SWAP_DRIVER: "" + DEBUG: "false" + GOCOVERDIR: /repo/.coverage/kind + SERVICE_PREFIX: 11.96.0.0/12,fd10::0/120 +kind: ConfigMap +metadata: + name: calico-vpp-config + namespace: calico-vpp-dataplane +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + labels: + k8s-app: calico-vpp-node + name: calico-vpp-node + namespace: calico-vpp-dataplane +spec: + selector: + matchLabels: + k8s-app: calico-vpp-node + template: + metadata: + labels: + k8s-app: calico-vpp-node + spec: + containers: + - env: + - name: LD_LIBRARY_PATH + value: /repo/vpp_build/build-root/install-vpp-native/vpp/ + - name: DATASTORE_TYPE + value: kubernetes + - name: WAIT_FOR_DATASTORE + value: "true" + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + envFrom: + - configMapRef: + name: calico-vpp-config + image: localhost:5000/calicovpp/vpp:${CALICOVPP_VERSION} + imagePullPolicy: Always + name: vpp + resources: + limits: + memory: 80Gi + requests: + cpu: 1 + memory: 4Gi + securityContext: + privileged: true + volumeMounts: + - mountPath: /repo + name: repo-directory + - mountPath: /etc/ssl/certs/ + name: ssl-certs + - mountPath: /usr/share/ca-certificates + name: share-certs + - mountPath: /lib/firmware + name: lib-firmware + - mountPath: /var/run/vpp + name: vpp-rundir + - mountPath: /var/lib/vpp + name: vpp-data + - mountPath: /etc/vpp + name: vpp-config + - mountPath: /dev + name: devices + - mountPath: /sys + name: hostsys + - mountPath: /run/netns/ + mountPropagation: Bidirectional + name: netns + - mountPath: /host + name: host-root + - command: + - /bin/calico-vpp-agent + env: + - name: CALICOVPP_ENABLE_MEMIF + value: ${CALICOVPP_ENABLE_MEMIF} + - name: DATASTORE_TYPE + value: kubernetes + - name: WAIT_FOR_DATASTORE + value: "true" + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: calico-vpp-config + image: localhost:5000/calicovpp/vpp:${CALICOVPP_VERSION} + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /liveness + port: 9090 + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 3 + name: agent + readinessProbe: + failureThreshold: 3 + httpGet: + path: /readiness + port: 9090 + scheme: HTTP + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 3 + resources: + requests: + cpu: 250m + securityContext: + privileged: true + startupProbe: + failureThreshold: 10 + httpGet: + path: /liveness + port: 9090 + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 30 + timeoutSeconds: 3 + volumeMounts: + - mountPath: /repo + name: repo-directory + - mountPath: /var/run/calico + name: var-run-calico + readOnly: false + - mountPath: /var/lib/calico/felix-plugins + name: felix-plugins + readOnly: false + - mountPath: /var/run/vpp + name: vpp-rundir + - mountPath: /run/netns/ + mountPropagation: Bidirectional + name: netns + hostNetwork: true + hostPID: true + nodeSelector: + kubernetes.io/os: linux + priorityClassName: system-node-critical + serviceAccountName: calico-vpp-node-sa + terminationGracePeriodSeconds: 10 + tolerations: + - effect: NoSchedule + operator: Exists + - key: CriticalAddonsOnly + operator: Exists + - effect: NoExecute + operator: Exists + volumes: + - hostPath: + path: ${HOME}/vpp-dataplane + name: repo-directory + - hostPath: + path: /etc/ssl/certs/ + name: ssl-certs + - hostPath: + path: /usr/share/ca-certificates + name: share-certs + - hostPath: + path: /lib/firmware + name: lib-firmware + - hostPath: + path: /var/run/vpp + name: vpp-rundir + - hostPath: + path: /var/lib/vpp + type: DirectoryOrCreate + name: vpp-data + - hostPath: + path: /etc/vpp + name: vpp-config + - hostPath: + path: /dev + name: devices + - hostPath: + path: /sys + name: hostsys + - hostPath: + path: /var/run/calico + name: var-run-calico + - hostPath: + path: /run/netns + name: netns + - hostPath: + path: /var/lib/calico/felix-plugins + name: felix-plugins + - hostPath: + path: / + name: host-root + updateStrategy: + rollingUpdate: + maxUnavailable: 1 + type: RollingUpdate +--- +# NOT a kustomize resource - this file embeds the `${CALICO_NETWORK_CONFIG}` +# runtime placeholder which makes it invalid YAML until envsubst has run. +# Appended verbatim by `make kube-test-template` after the kustomize build. +apiVersion: operator.tigera.io/v1 +kind: APIServer +metadata: + name: default +spec: {} +--- +apiVersion: operator.tigera.io/v1 +kind: Installation +metadata: + name: default +spec: + registry: localhost:5000 + calicoNetwork: + ipPools: + - cidr: 11.0.0.0/24 + encapsulation: IPIP + natOutgoing: Enabled + - cidr: fd20::/64 + encapsulation: VXLAN + natOutgoing: Enabled + linuxDataplane: VPP + nodeAddressAutodetectionV4: + interface: eth0 + nodeAddressAutodetectionV6: + interface: eth0 + ${CALICO_NETWORK_CONFIG} diff --git a/yaml/generated/calico-vpp-multinet.yaml b/yaml/generated/calico-vpp-multinet.yaml index 93ec3fd97..4136ff794 100644 --- a/yaml/generated/calico-vpp-multinet.yaml +++ b/yaml/generated/calico-vpp-multinet.yaml @@ -240,7 +240,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - image: docker.io/calicovpp/multinet-monitor:latest + - command: + - /bin/multinet-monitor + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent name: multinet-monitor resources: @@ -265,7 +267,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -281,7 +285,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp-nohuge.yaml b/yaml/generated/calico-vpp-nohuge.yaml index fdf6890a4..55ada3168 100644 --- a/yaml/generated/calico-vpp-nohuge.yaml +++ b/yaml/generated/calico-vpp-nohuge.yaml @@ -215,7 +215,9 @@ spec: k8s-app: calico-vpp-node spec: containers: - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -231,7 +233,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/generated/calico-vpp.yaml b/yaml/generated/calico-vpp.yaml index ac2f7ed79..433487658 100644 --- a/yaml/generated/calico-vpp.yaml +++ b/yaml/generated/calico-vpp.yaml @@ -256,7 +256,9 @@ spec: name: netns - mountPath: /host name: host-root - - env: + - command: + - /bin/calico-vpp-agent + env: - name: DATASTORE_TYPE value: kubernetes - name: WAIT_FOR_DATASTORE @@ -272,7 +274,7 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/yaml/overlays/dev/calico-vpp-dev-patch.yaml b/yaml/overlays/dev/calico-vpp-dev-patch.yaml index 5e076448e..01cfa9260 100644 --- a/yaml/overlays/dev/calico-vpp-dev-patch.yaml +++ b/yaml/overlays/dev/calico-vpp-dev-patch.yaml @@ -9,7 +9,8 @@ spec: spec: containers: - name: agent - image: ${CALICO_AGENT_IMAGE} + image: ${CALICO_VPP_IMAGE} + command: ["/bin/calico-vpp-agent"] imagePullPolicy: ${IMAGE_PULL_POLICY} volumeMounts: - name: repo-directory @@ -28,7 +29,7 @@ spec: fieldPath: spec.nodeName # Updates to -env below - name: LD_LIBRARY_PATH - value: "/repo/vpp-manager/vpp_build/build-root/install-vpp-native/vpp/" + value: "/repo/vpp_build/build-root/install-vpp-native/vpp/" resources: requests: cpu: 1 diff --git a/yaml/overlays/dev/kustomize.sh b/yaml/overlays/dev/kustomize.sh index 9496e1c58..79f7724ca 100755 --- a/yaml/overlays/dev/kustomize.sh +++ b/yaml/overlays/dev/kustomize.sh @@ -234,15 +234,11 @@ calico_create_template () DPDK=${DPDK:-true} ## Templating calico-vpp-dev-patch.yaml ## - export CALICO_AGENT_IMAGE=${CALICO_AGENT_IMAGE:-docker.io/calicovpp/agent:latest} export CALICO_VPP_IMAGE=${CALICO_VPP_IMAGE:-docker.io/calicovpp/vpp:latest} export CALICO_VERSION_TAG=${CALICO_VERSION_TAG:-v3.20.0} export IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY:-IfNotPresent} export REPO_DIRECTORY=$(readlink -f ${SCRIPTDIR}/../../..) - ## Templating multinet-monitor-dev-patch.yaml ## - export MULTINET_MONITOR_IMAGE=${MULTINET_MONITOR_IMAGE:-docker.io/calicovpp/multinet-monitor:latest} - ## Templating installation-dev.yaml ## export CALICO_MTU=${CALICO_MTU:-0} export CALICOVPP_MAIN_INTERFACE=${CALICOVPP_MAIN_INTERFACE:-eth0} diff --git a/yaml/overlays/dev/multinet-monitor-dev-patch.yaml b/yaml/overlays/dev/multinet-monitor-dev-patch.yaml index 064f2632a..c4ff9e2b2 100644 --- a/yaml/overlays/dev/multinet-monitor-dev-patch.yaml +++ b/yaml/overlays/dev/multinet-monitor-dev-patch.yaml @@ -9,5 +9,6 @@ spec: spec: containers: - name: multinet-monitor - image: ${MULTINET_MONITOR_IMAGE} + image: ${CALICO_VPP_IMAGE} + command: ["/bin/multinet-monitor"] imagePullPolicy: ${IMAGE_PULL_POLICY} diff --git a/yaml/overlays/kube-test-baremetal/kustomization.yaml b/yaml/overlays/kube-test-baremetal/kustomization.yaml new file mode 100644 index 000000000..efba94cf0 --- /dev/null +++ b/yaml/overlays/kube-test-baremetal/kustomization.yaml @@ -0,0 +1,11 @@ +# Kube-test overlay for baremetal clusters (DPDK uplink). +# +# Consumed by `make kube-test-template FLAVOR=baremetal` and shipped +# to the VPP kube-test harness as a single fully-resolved manifest. + +resources: +- ../../base + +components: +- ../../components/kube-test +- ../../components/kube-test/baremetal \ No newline at end of file diff --git a/yaml/overlays/kube-test-kind/kustomization.yaml b/yaml/overlays/kube-test-kind/kustomization.yaml new file mode 100644 index 000000000..371bad6e9 --- /dev/null +++ b/yaml/overlays/kube-test-kind/kustomization.yaml @@ -0,0 +1,11 @@ +# Kube-test overlay for KinD clusters. +# +# Consumed by `make kube-test-template FLAVOR=kind` and shipped to +# the VPP kube-test harness as a single fully-resolved manifest. + +resources: +- ../../base + +components: +- ../../components/kube-test +- ../../components/kube-test/kind \ No newline at end of file diff --git a/yaml/platforms/openshift/04-calico-vpp-nohuge.yaml b/yaml/platforms/openshift/04-calico-vpp-nohuge.yaml index af63345d7..6c2de3638 100644 --- a/yaml/platforms/openshift/04-calico-vpp-nohuge.yaml +++ b/yaml/platforms/openshift/04-calico-vpp-nohuge.yaml @@ -32,7 +32,8 @@ spec: envFrom: - configMapRef: name: calico-vpp-config - image: docker.io/calicovpp/agent:latest + image: docker.io/calicovpp/vpp:latest + command: ["/bin/calico-vpp-agent"] imagePullPolicy: IfNotPresent name: agent resources: