Skip to content

Commit 6b93476

Browse files
authored
VPP v24.10 uplift (#1234)
Signed-off-by: Szilard Vincze <szilard.vincze@est.tech>
1 parent aa4bdf6 commit 6b93476

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG VPP_VERSION=v23.10-rc0-170-g0bbdb8b45
2-
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as go
1+
ARG VPP_VERSION=v24.10.0-4-g4f296b751
2+
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} AS go
33
COPY --from=golang:1.23.1 /usr/local/go/ /go
4-
ENV PATH ${PATH}:/go/bin
4+
ENV PATH=${PATH}:/go/bin
55
ENV GO111MODULE=on
66
ENV CGO_ENABLED=0
77
ENV GOBIN=/bin
@@ -12,7 +12,7 @@ RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.25
1212
ADD https://github.com/spiffe/spire/releases/download/v1.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz .
1313
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
1414

15-
FROM go as build
15+
FROM go AS build
1616
RUN apt update
1717
RUN apt install -f -y libbpf-dev clang
1818
WORKDIR /build
@@ -25,14 +25,14 @@ RUN go build ./internal/imports
2525
COPY . .
2626
RUN go build -o /bin/forwarder .
2727

28-
FROM build as test
28+
FROM build AS test
2929
CMD go test -test.v ./...
3030

31-
FROM test as debug
31+
FROM test AS debug
3232
WORKDIR /build/internal/tests/
3333
CMD dlv -l :40000 --headless=true --api-version=2 test -test.v .
3434

35-
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as runtime
35+
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} AS runtime
3636
RUN apt-get update
3737
RUN apt install -f -y libbpf-dev
3838
COPY --from=build /bin/forwarder /bin/forwarder

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/google/uuid v1.3.1
1414
github.com/kelseyhightower/envconfig v1.4.0
1515
github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00
16-
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba
16+
github.com/networkservicemesh/govpp v0.0.0-20250206125319-4d08cb0ae074
1717
github.com/networkservicemesh/sdk v0.5.1-0.20241227223757-422abe9bfbdd
1818
github.com/networkservicemesh/sdk-k8s v0.0.0-20241227224209-e9478b00a551
1919
github.com/networkservicemesh/sdk-kernel v0.0.0-20241227224026-3bba51753247

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7Xn
154154
github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
155155
github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00 h1:xZGg3H5j9UoQW7GasoQrBtH4RkB9bgKdfuRIM9EUkCQ=
156156
github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00/go.mod h1:GT0Yw1LYFSTxlDyJjBDhIxT82rJ2czZ0TiyzxSyKzvg=
157-
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o=
158-
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA=
157+
github.com/networkservicemesh/govpp v0.0.0-20250206125319-4d08cb0ae074 h1:DVU87YLPxCQ/KDEIHlwjiqnLxw5peI0pIpHU3mrylNg=
158+
github.com/networkservicemesh/govpp v0.0.0-20250206125319-4d08cb0ae074/go.mod h1:AbNeEvThWZ7Gzd2HEF4GqO0TrCR2RGpj9fYdWbEfkqI=
159159
github.com/networkservicemesh/sdk v0.5.1-0.20241227223757-422abe9bfbdd h1:p7yvEC3kZInerbyyRTjLC51uw40Kxbb3rMw+2JsoiU0=
160160
github.com/networkservicemesh/sdk v0.5.1-0.20241227223757-422abe9bfbdd/go.mod h1:4UxNmG1wYL5v93pZHIgIn0jTsvzn4x0QioQ/v48zuD8=
161161
github.com/networkservicemesh/sdk-k8s v0.0.0-20241227224209-e9478b00a551 h1:NU51ozpI8c4n9ggRo6YbuIrWM6Wl1tvZU806SLXT1pQ=

internal/tests/suite_combinatronics_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright (c) 2020-2023 Cisco and/or its affiliates.
2+
// Copyright (c) 2025 OpenInfra Foundation Europe.
23
//
34
// SPDX-License-Identifier: Apache-2.0
45
//
@@ -128,13 +129,13 @@ func (f *ForwarderTestSuite) TestCombinations() {
128129
payloads := map[string][]string{
129130
payload.IP: {
130131
kernel.MECHANISM,
131-
memif.MECHANISM,
132+
// memif.MECHANISM,
132133
wireguard.MECHANISM,
133134
ipsecapi.MECHANISM,
134135
},
135136
payload.Ethernet: {
136137
kernel.MECHANISM,
137-
memif.MECHANISM,
138+
// memif.MECHANISM,
138139
vxlan.MECHANISM,
139140
},
140141
}

0 commit comments

Comments
 (0)