From 22fb2cc27a3221dd49c1c924c08fb94c45fd4068 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Sat, 18 May 2024 18:40:18 +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/595 Commit: 53551c7 Author: Network Service Mesh Bot Date: 2024-05-18 13:39:18 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#595) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/664 Commit: 9502001 Author: Network Service Mesh Bot Date: 2024-05-18 13:35:42 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#664) PR link: https://github.com/networkservicemesh/sdk/pull/1626 Commit: 7b51d9c Author: Vladislav Byrgazov Date: 2024-05-19 02:33:13 +0800 Message: - Fix memory leak in metrics chain element (#1626) * Fix memory leak in metrics chain element * Fix lint issues * Added check is opentelemetry enabled and fixed copyrights * Fix metrics memory leak by storing temp connection data in metadata * Added copyright * Address review comments * Fixed import --------- Signed-off-by: Vladislav Byrgazov Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index d5ee7374..2baf0fbe 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/edwarnicke/grpcfd v1.1.2 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.20240516075535-3b79590e3be7 + github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 github.com/networkservicemesh/sdk-k8s v0.0.0-20240516080058-ad6911f0796e - github.com/networkservicemesh/sdk-sriov v0.0.0-20240516080540-7fee1a70fe69 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 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-20240516080148-6a362bb51ec7 // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 // 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 3c823634..e51d9e48 100644 --- a/go.sum +++ b/go.sum @@ -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.20240516075535-3b79590e3be7 h1:TuBrBMCTgFWLWvhoCp7gwjjrZcwLj/pu0KoLpgMVedY= -github.com/networkservicemesh/sdk v0.5.1-0.20240516075535-3b79590e3be7/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= +github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 h1:nC7dOI5zxRH3AXOpJWlLthEzYXraaRO6zXY8bTQXjm0= +github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= github.com/networkservicemesh/sdk-k8s v0.0.0-20240516080058-ad6911f0796e h1:FYwU2okf17zNlwHVijgCge1DOgScS7WfG8ri63JN4Gk= github.com/networkservicemesh/sdk-k8s v0.0.0-20240516080058-ad6911f0796e/go.mod h1:T5fZNz+UxIqk31tdMQ7QPjm4A0RWAJElYm4bynMYMYM= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240516080148-6a362bb51ec7 h1:xtlh9H3aF9XEyS8apbmc9jhqogVPNjz8liDK71KIhos= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240516080148-6a362bb51ec7/go.mod h1:4SPwGPRxnBOW/40a7wdPBw7glUFzV9NZ4O9WIF4WwAw= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240516080540-7fee1a70fe69 h1:YynrqY13mLr6gQhYEvuusNzkuhOTBLmKilcRicIP63Y= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240516080540-7fee1a70fe69/go.mod h1:1bIeUNVBjOhbpVgJkj4qIpgq28PvkMUlrIAbVHx3ZMA= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 h1:6hoJ2RU7aEk8hFVSum9IlbxB8VxJHbRoZS1XxdgR7oQ= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051/go.mod h1:xnlVO69cVAz/Pn8JzL5gGAwaSOzskDvVvXW+C8/91Hg= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 h1:cs3m7ZDCpYa/6ZWKfHvqz9l40qksloE+qaT6uIRYzN0= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301/go.mod h1:OdUhoA+qBkBkcsCIKXar496Qpl+GRlM4/Qt8NsUhCWc= 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 37ccd6f3e54f1f0adb67a106609d2c365e03e45c Mon Sep 17 00:00:00 2001 From: NSMBot Date: Sat, 18 May 2024 18:43:31 +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 d66757fa..b5cbb059 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.20240518183313-7b51d9c9b5d0 github.com/networkservicemesh/sdk-k8s v0.0.0-20240518183743-3fe77ab18ac3 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240516080540-7fee1a70fe69 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 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 5e94146e..01ef8d1b 100644 --- a/go.sum +++ b/go.sum @@ -111,10 +111,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 h1:nC7dOI github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= github.com/networkservicemesh/sdk-k8s v0.0.0-20240518183743-3fe77ab18ac3 h1:XkIdeN4ivjoBntbLatzlfgcdGCuuGT/lTfsrAJZuLhM= github.com/networkservicemesh/sdk-k8s v0.0.0-20240518183743-3fe77ab18ac3/go.mod h1:IfLjQG2IUD3Z6jg11xjyXSajKLXgVHDoCbrXck5Unc0= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240516080148-6a362bb51ec7 h1:xtlh9H3aF9XEyS8apbmc9jhqogVPNjz8liDK71KIhos= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240516080148-6a362bb51ec7/go.mod h1:4SPwGPRxnBOW/40a7wdPBw7glUFzV9NZ4O9WIF4WwAw= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240516080540-7fee1a70fe69 h1:YynrqY13mLr6gQhYEvuusNzkuhOTBLmKilcRicIP63Y= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240516080540-7fee1a70fe69/go.mod h1:1bIeUNVBjOhbpVgJkj4qIpgq28PvkMUlrIAbVHx3ZMA= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 h1:6hoJ2RU7aEk8hFVSum9IlbxB8VxJHbRoZS1XxdgR7oQ= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051/go.mod h1:xnlVO69cVAz/Pn8JzL5gGAwaSOzskDvVvXW+C8/91Hg= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 h1:cs3m7ZDCpYa/6ZWKfHvqz9l40qksloE+qaT6uIRYzN0= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301/go.mod h1:OdUhoA+qBkBkcsCIKXar496Qpl+GRlM4/Qt8NsUhCWc= 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=