From a9c2612218997218071eb90f0dec9279784a695d Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 17:47:31 +0400 Subject: [PATCH 1/2] Update vpphelper version Signed-off-by: Ivan Osipov --- go.mod | 2 +- go.sum | 4 ++-- internal/imports/imports_linux.go | 2 +- main.go | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f8199bc..16e121c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( git.fd.io/govpp.git v0.3.6-0.20210927044411-385ccc0d8ba9 github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/edwarnicke/grpcfd v1.1.2 - github.com/edwarnicke/vpphelper v0.2.0 github.com/google/uuid v1.3.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.9.1-0.20230627143611-9785eacf9687 @@ -14,6 +13,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20230720103431-8dc141944a44 github.com/networkservicemesh/sdk-kernel v0.0.0-20230720103750-61d67ebc52f8 github.com/networkservicemesh/sdk-vpp v0.0.0-20230720104235-e1184e20bfcf + github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index a164f90..30e55b5 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,6 @@ github.com/edwarnicke/log v1.0.0/go.mod h1:eWsQQlQ0IU5wHlJvyXFH3dS8s2g9GzN7JnXod github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw= github.com/edwarnicke/serialize v1.0.7 h1:geX8vmyu8Ij2S5fFIXjy9gBDkKxXnrMIzMoDvV0Ddac= github.com/edwarnicke/serialize v1.0.7/go.mod h1:y79KgU2P7ALH/4j37uTSIdNavHFNttqN7pzO6Y8B2aw= -github.com/edwarnicke/vpphelper v0.2.0 h1:Ra47QFtmR/Ji8czoRBwD/pboLfK1GiQEI1SSrsaYupE= -github.com/edwarnicke/vpphelper v0.2.0/go.mod h1:2KXgJqOUUCh9S4Zs2jAycQLqAcRGge3q+GXV2rN55ZQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -225,6 +223,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230720103750-61d67ebc52f8 h1:M github.com/networkservicemesh/sdk-kernel v0.0.0-20230720103750-61d67ebc52f8/go.mod h1:6YxgX7lDB4r2YSo/w5hLoaXXvCoPjyCI9xccZu8YM7o= github.com/networkservicemesh/sdk-vpp v0.0.0-20230720104235-e1184e20bfcf h1:fMNNo0ksJnOx6pmZyTPAZnmff4KoarpaKKR1/S8Lt/k= github.com/networkservicemesh/sdk-vpp v0.0.0-20230720104235-e1184e20bfcf/go.mod h1:e6329ztR5EZm+bqRcMGdksUnaZszO1tt8c6XHxbWJg0= +github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 h1:Qu4LsLjAM/qVkVvIw1pvNHLkOnN4/6n79LHM2FVl/xw= +github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972/go.mod h1:sRkqSd8psiUrUvKjCiDHvNcOXzOsxJkAxU5UkKmQy4M= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8= github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index f762ec2..0c0499e 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -8,7 +8,6 @@ import ( _ "git.fd.io/govpp.git/api" _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/grpcfd" - _ "github.com/edwarnicke/vpphelper" _ "github.com/google/uuid" _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/api/pkg/api/ipam" @@ -63,6 +62,7 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/tools/spire" _ "github.com/networkservicemesh/sdk/pkg/tools/token" _ "github.com/networkservicemesh/sdk/pkg/tools/tracing" + _ "github.com/networkservicemesh/vpphelper" _ "github.com/pkg/errors" _ "github.com/sirupsen/logrus" _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" diff --git a/main.go b/main.go index fa543d0..524847b 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,6 @@ import ( nested "github.com/antonfisher/nested-logrus-formatter" "github.com/edwarnicke/grpcfd" - "github.com/edwarnicke/vpphelper" "github.com/kelseyhightower/envconfig" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -45,6 +44,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/networkservicemesh/vpphelper" + "github.com/networkservicemesh/api/pkg/api/ipam" "github.com/networkservicemesh/api/pkg/api/networkservice" "github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls" From 9dffb2105a2f777ee058abcdd36a9ca5b39f4788 Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Tue, 25 Jul 2023 16:30:03 +0400 Subject: [PATCH 2/2] Update CI settings Signed-off-by: Ivan Osipov --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4e9010b..fb87d16 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: restrictNSMDeps: uses: networkservicemesh/.github/.github/workflows/restrict-nsm-deps.yaml@main with: - allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp, govpp" + allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp, govpp, vpphelper" checkgomod: uses: networkservicemesh/.github/.github/workflows/checkgomod.yaml@main