From a427ffa889e5cba303edb4b1f30f9e5a94b3ad5b Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 4 Jun 2024 15:18:55 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-sriov@main PR link: https://github.com/networkservicemesh/sdk-sriov/pull/597 Commit: 638465e Author: Network Service Mesh Bot Date: 2024-06-04 10:17:57 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#597) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/666 Commit: 293bea6 Author: Network Service Mesh Bot Date: 2024-06-04 10:09:51 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#666) PR link: https://github.com/networkservicemesh/sdk/pull/1640 Commit: e3eed82 Author: Denis Tingaikin Date: 2024-06-04 17:35:37 +0300 Message: - update grpcfd (#1640) Signed-off-by: NSMBot --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 8b141483..720592f4 100644 --- a/go.mod +++ b/go.mod @@ -6,12 +6,12 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/edwarnicke/exechelper v1.0.2 github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 - github.com/edwarnicke/grpcfd v1.1.2 + github.com/edwarnicke/grpcfd v1.1.4 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 - github.com/networkservicemesh/sdk v0.5.1-0.20240530111558-50c0908267de + github.com/networkservicemesh/sdk v0.5.1-0.20240604143537-e3eed82dc1b4 github.com/networkservicemesh/sdk-k8s v0.0.0-20240530112105-0068d6200c94 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240604151757-638465e38b8e github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.1.7 @@ -44,7 +44,7 @@ require ( github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/networkservicemesh/sdk-kernel v0.0.0-20240529105556-06cfa696acac // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20240604150951-293bea632223 // indirect github.com/open-policy-agent/opa v0.44.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.17.0 // indirect diff --git a/go.sum b/go.sum index 008640e9..a302e834 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ github.com/edwarnicke/exechelper v1.0.2 h1:dD49Ui2U0FBFxxhalnKw6vLS0P0TkgnXBRvKL github.com/edwarnicke/exechelper v1.0.2/go.mod h1:/T271jtNX/ND4De6pa2aRy2+8sNtyCDB1A2pp4M+fUs= github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 h1:4/2wgileNvQB4HfJbq7u4FFLKIfc38a6P0S/51ZGgX8= github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29/go.mod h1:3m+ZfVq+z0pTLW798jmqnifMsalrVLIKmfXaMFvqSuc= -github.com/edwarnicke/grpcfd v1.1.2 h1:2b8kCABQ1+JjSKGDoHadqSW7whCeTXMqtyo6jmB5B8k= -github.com/edwarnicke/grpcfd v1.1.2/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA= +github.com/edwarnicke/grpcfd v1.1.4 h1:MuXeJTyIyWuUMYJJBIW7Cr8TUBWPXRxop3aGudhzV2I= +github.com/edwarnicke/grpcfd v1.1.4/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA= 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= @@ -107,14 +107,14 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 h1:EaWGgdwbUP404Hlee80R+jSxgzjOh/tW5Fm4/9NE4B0= github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= -github.com/networkservicemesh/sdk v0.5.1-0.20240530111558-50c0908267de h1:TkzYTOpmtKENFgTiKpiHtkIYcNupzoSIFHErHPQYls4= -github.com/networkservicemesh/sdk v0.5.1-0.20240530111558-50c0908267de/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= +github.com/networkservicemesh/sdk v0.5.1-0.20240604143537-e3eed82dc1b4 h1:6FTn6PPMFCF/awAgvzMJwa+WC6wlbveGvGdGKjRXqoM= +github.com/networkservicemesh/sdk v0.5.1-0.20240604143537-e3eed82dc1b4/go.mod h1:soFR6Mg5LTVvEI0zXNcbWoBnn4hqUK7ItZBQJ3Jbszo= github.com/networkservicemesh/sdk-k8s v0.0.0-20240530112105-0068d6200c94 h1:VSez6xrUsL3lFsK5a+FrE8uKrCjCtEbwPiqXOff/NV4= github.com/networkservicemesh/sdk-k8s v0.0.0-20240530112105-0068d6200c94/go.mod h1:JwRLqtlTSsWsU1u4H3B2jpl/aQJEr3+0WY+whxyJzx4= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240529105556-06cfa696acac h1:/KJ2uHRwLl0InFkGNoniR/UPlqmhA95hAcLYKkp1Jik= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240529105556-06cfa696acac/go.mod h1:vV/VN9Qz8+bsaSFf2GakZNsn5NhFhpkgL34ARLSxDFs= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8 h1:M0kRBrDRGAXprbsnTJ019gzRfCV5rqRN7ti3Y9yzUn8= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8/go.mod h1:Rp531mQB3DevPoS7dtE6mRyngdJOfpTSOwj5DC586GE= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240604150951-293bea632223 h1:1p0VW8jSSYYLdWpcC29lu7wGBcmZf/s/PlLVJi4oGT8= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240604150951-293bea632223/go.mod h1:106yEon0olXuKYX721JqSQycpiuRMeQ/h4WiID2qIHw= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240604151757-638465e38b8e h1:Lz9Al+Kc1e73VqJUCXnRp3kjaMZv2+hZZomobW2dkGs= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240604151757-638465e38b8e/go.mod h1:UuckucP/+8Rx4kU3rbxuj2oiyzZCYuslvlOA7sALysg= github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk= github.com/open-policy-agent/opa v0.44.0/go.mod h1:YpJaFIk5pq89n/k72c1lVvfvR5uopdJft2tMg1CW/yU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From 10cfaffc73be1f9481361d6fe02fa1942e67d941 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 4 Jun 2024 15:23:46 +0000 Subject: [PATCH 2/2] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e572a0ca..b83d49cb 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 github.com/networkservicemesh/sdk v0.5.1-0.20240604143537-e3eed82dc1b4 github.com/networkservicemesh/sdk-k8s v0.0.0-20240604151042-ca05295f9e3c - github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240604151757-638465e38b8e github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.1.7 diff --git a/go.sum b/go.sum index 97bd4c8f..5ee44d4c 100644 --- a/go.sum +++ b/go.sum @@ -111,10 +111,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240604143537-e3eed82dc1b4 h1:6FTn6P github.com/networkservicemesh/sdk v0.5.1-0.20240604143537-e3eed82dc1b4/go.mod h1:soFR6Mg5LTVvEI0zXNcbWoBnn4hqUK7ItZBQJ3Jbszo= github.com/networkservicemesh/sdk-k8s v0.0.0-20240604151042-ca05295f9e3c h1:i2WrsytvQVw8YDmCXXKNIhs8oz02fbv7cj+oW/iroZE= github.com/networkservicemesh/sdk-k8s v0.0.0-20240604151042-ca05295f9e3c/go.mod h1:Kv/OEXuDgT1yT7YbLzmTxyjSNW6vteVWSTagsI5I+DU= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240529105556-06cfa696acac h1:/KJ2uHRwLl0InFkGNoniR/UPlqmhA95hAcLYKkp1Jik= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240529105556-06cfa696acac/go.mod h1:vV/VN9Qz8+bsaSFf2GakZNsn5NhFhpkgL34ARLSxDFs= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8 h1:M0kRBrDRGAXprbsnTJ019gzRfCV5rqRN7ti3Y9yzUn8= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8/go.mod h1:Rp531mQB3DevPoS7dtE6mRyngdJOfpTSOwj5DC586GE= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240604150951-293bea632223 h1:1p0VW8jSSYYLdWpcC29lu7wGBcmZf/s/PlLVJi4oGT8= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240604150951-293bea632223/go.mod h1:106yEon0olXuKYX721JqSQycpiuRMeQ/h4WiID2qIHw= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240604151757-638465e38b8e h1:Lz9Al+Kc1e73VqJUCXnRp3kjaMZv2+hZZomobW2dkGs= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240604151757-638465e38b8e/go.mod h1:UuckucP/+8Rx4kU3rbxuj2oiyzZCYuslvlOA7sALysg= github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk= github.com/open-policy-agent/opa v0.44.0/go.mod h1:YpJaFIk5pq89n/k72c1lVvfvR5uopdJft2tMg1CW/yU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=