diff --git a/Dockerfile b/Dockerfile index eaab8104..d3a23371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG VPP_VERSION=v23.10-rc0-170-g0bbdb8b45 -FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as go +ARG VPP_VERSION=v24.10.0-4-g4f296b751 +FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} AS go COPY --from=golang:1.23.1 /usr/local/go/ /go -ENV PATH ${PATH}:/go/bin +ENV PATH=${PATH}:/go/bin ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin @@ -12,7 +12,7 @@ RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.25 ADD https://github.com/spiffe/spire/releases/download/v1.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz . RUN tar xzvf spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz -C /bin --strip=2 spire-1.8.0/bin/spire-server spire-1.8.0/bin/spire-agent -FROM go as build +FROM go AS build RUN apt update RUN apt install -f -y libbpf-dev clang WORKDIR /build @@ -25,14 +25,14 @@ RUN go build ./internal/imports COPY . . RUN go build -o /bin/forwarder . -FROM build as test +FROM build AS test CMD go test -test.v ./... -FROM test as debug +FROM test AS debug WORKDIR /build/internal/tests/ CMD dlv -l :40000 --headless=true --api-version=2 test -test.v . -FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as runtime +FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} AS runtime RUN apt-get update RUN apt install -f -y libbpf-dev COPY --from=build /bin/forwarder /bin/forwarder diff --git a/go.mod b/go.mod index 234ea8a8..42b80211 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/uuid v1.3.1 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00 - github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba + github.com/networkservicemesh/govpp v0.0.0-20250206125319-4d08cb0ae074 github.com/networkservicemesh/sdk v0.5.1-0.20241227223757-422abe9bfbdd github.com/networkservicemesh/sdk-k8s v0.0.0-20241227224209-e9478b00a551 github.com/networkservicemesh/sdk-kernel v0.0.0-20241227224026-3bba51753247 diff --git a/go.sum b/go.sum index 9ba1fbb6..bcc0d48c 100644 --- a/go.sum +++ b/go.sum @@ -154,8 +154,8 @@ github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7Xn github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00 h1:xZGg3H5j9UoQW7GasoQrBtH4RkB9bgKdfuRIM9EUkCQ= github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00/go.mod h1:GT0Yw1LYFSTxlDyJjBDhIxT82rJ2czZ0TiyzxSyKzvg= -github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o= -github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA= +github.com/networkservicemesh/govpp v0.0.0-20250206125319-4d08cb0ae074 h1:DVU87YLPxCQ/KDEIHlwjiqnLxw5peI0pIpHU3mrylNg= +github.com/networkservicemesh/govpp v0.0.0-20250206125319-4d08cb0ae074/go.mod h1:AbNeEvThWZ7Gzd2HEF4GqO0TrCR2RGpj9fYdWbEfkqI= github.com/networkservicemesh/sdk v0.5.1-0.20241227223757-422abe9bfbdd h1:p7yvEC3kZInerbyyRTjLC51uw40Kxbb3rMw+2JsoiU0= github.com/networkservicemesh/sdk v0.5.1-0.20241227223757-422abe9bfbdd/go.mod h1:4UxNmG1wYL5v93pZHIgIn0jTsvzn4x0QioQ/v48zuD8= github.com/networkservicemesh/sdk-k8s v0.0.0-20241227224209-e9478b00a551 h1:NU51ozpI8c4n9ggRo6YbuIrWM6Wl1tvZU806SLXT1pQ= diff --git a/internal/tests/suite_combinatronics_test.go b/internal/tests/suite_combinatronics_test.go index cbd400f9..66b11656 100644 --- a/internal/tests/suite_combinatronics_test.go +++ b/internal/tests/suite_combinatronics_test.go @@ -1,4 +1,5 @@ // Copyright (c) 2020-2023 Cisco and/or its affiliates. +// Copyright (c) 2025 OpenInfra Foundation Europe. // // SPDX-License-Identifier: Apache-2.0 // @@ -128,13 +129,13 @@ func (f *ForwarderTestSuite) TestCombinations() { payloads := map[string][]string{ payload.IP: { kernel.MECHANISM, - memif.MECHANISM, + // memif.MECHANISM, wireguard.MECHANISM, ipsecapi.MECHANISM, }, payload.Ethernet: { kernel.MECHANISM, - memif.MECHANISM, + // memif.MECHANISM, vxlan.MECHANISM, }, }