From 21e3c8fa63e43bc2447dee8c687f33f043c7dbc3 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 15 Aug 2024 20:55:45 +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/606 Commit: 119f4be Author: Network Service Mesh Bot Date: 2024-08-15 15:55:02 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#606) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/675 Commit: 8fc8a72 Author: Network Service Mesh Bot Date: 2024-08-15 15:51:37 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#675) PR link: https://github.com/networkservicemesh/sdk/pull/1658 Commit: eeb0114 Author: Network Service Mesh Bot Date: 2024-08-15 15:49:07 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/api@main (#1658) PR link: https://github.com/networkservicemesh/api/pull/174 Commit: fdbfcd8 Author: Nikita Skrynnik Date: 2024-08-15 21:15:54 +1100 Message: - Revert changes in strToIPNet func (#174) 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 0ed8898..06be8bb 100644 --- a/go.mod +++ b/go.mod @@ -8,10 +8,10 @@ require ( github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 github.com/edwarnicke/grpcfd v1.1.4 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677 - github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f + github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e + github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 github.com/networkservicemesh/sdk-k8s v0.0.0-20240814134600-f9f55b43a657 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af + github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be 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-20240814134341-a23cb71779da // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d // 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 9b55c19..4788685 100644 --- a/go.sum +++ b/go.sum @@ -105,16 +105,16 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= -github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677 h1:tG5+0VSj+NUQW2zFseHn0n0nZqskXlQklF/xP/XX9Ec= -github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= -github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f h1:ntNPiVMUTljkkVDdzoJwJihU5udtbsYqyiYdHLm4/LM= -github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f/go.mod h1:Tg63o7jzlUWAnD4DAbgbPb2TIbJ/KAP0/DAgl7rS5xk= +github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e h1:Fs34ZZN+bujq5OQEQUpxm0gYQ3g7uSCkcKcoUt70Be0= +github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= +github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 h1:O4v2cZ78hnnUmDMsQVNfAZuRnHd5ms2cJ3psCWTI65Q= +github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426/go.mod h1:D/CFLQOWMeHTYtKF8KgZmBNaNOfzBclWJj3BIPve7Hk= github.com/networkservicemesh/sdk-k8s v0.0.0-20240814134600-f9f55b43a657 h1:X0kVqTn7VQPVo+wVvGrXo+OpnTC7ZWDKmqQX5q8Vrmg= github.com/networkservicemesh/sdk-k8s v0.0.0-20240814134600-f9f55b43a657/go.mod h1:ZEJ1hRzewm/DPddS7m6I6ht2tzLwOwaZ2cfaLiXlXWg= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da h1:HRtMdCX/uPkGdNI1IKxcCV9cuMNXK5ZdbCVpJzk9jBY= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da/go.mod h1:OshyujtCIpXdJJAJlkGQCuJYL9q0H9ywMFVNe8+6kNE= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af h1:VUcTY0VUfRsgmHwlzIA1boapj569Y5lSKAD51VIp0nc= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af/go.mod h1:e64mVG2JVZ1DV9AJR4Jj9Rv0HMdzrNyIy86M7Mu/i7E= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d h1:XN2hpFJSaKx+nsVUIA7+a0JTWtb1kqe+Oq98bnfjFMA= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d/go.mod h1:GQTRVlJsnLyJdOVHTEtgPNgDWnjFAfvClUESbjucJWw= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be h1:kdIYTeHmKOhYTZKbPovxgqkvicKEqmsRXec/HVVbnLk= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be/go.mod h1:Aa7XbMZ31Rtw1wrr93tw99130HA1KCf4YV0EU2g+OKE= 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 6ec7d4c4098bbd994556265300d9544b036ce7f0 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 15 Aug 2024 20:59:08 +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 06a35bf..b423add 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af + github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be 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 554ce65..7b00328 100644 --- a/go.sum +++ b/go.sum @@ -111,10 +111,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 h1:O4v2cZ github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426/go.mod h1:D/CFLQOWMeHTYtKF8KgZmBNaNOfzBclWJj3BIPve7Hk= github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381 h1:sr/MDtfwEJhjZ7BCWov9RKRE21hlsYI4MRw2Xdw7dOQ= github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381/go.mod h1:uAVWHLnJh/By4osotqPSiIZVSr51Ou4ramwBVtg9mh0= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da h1:HRtMdCX/uPkGdNI1IKxcCV9cuMNXK5ZdbCVpJzk9jBY= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da/go.mod h1:OshyujtCIpXdJJAJlkGQCuJYL9q0H9ywMFVNe8+6kNE= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af h1:VUcTY0VUfRsgmHwlzIA1boapj569Y5lSKAD51VIp0nc= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af/go.mod h1:e64mVG2JVZ1DV9AJR4Jj9Rv0HMdzrNyIy86M7Mu/i7E= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d h1:XN2hpFJSaKx+nsVUIA7+a0JTWtb1kqe+Oq98bnfjFMA= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d/go.mod h1:GQTRVlJsnLyJdOVHTEtgPNgDWnjFAfvClUESbjucJWw= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be h1:kdIYTeHmKOhYTZKbPovxgqkvicKEqmsRXec/HVVbnLk= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be/go.mod h1:Aa7XbMZ31Rtw1wrr93tw99130HA1KCf4YV0EU2g+OKE= 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=