From dd661a46fccf62de0bb09ef39355dd8b7a810bf5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 02:21:23 +0000 Subject: [PATCH] fix(deps): update patch digest dependencies --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/github.com/longhorn/go-common-libs/ns/executor.go | 4 ++-- vendor/github.com/longhorn/go-common-libs/types/file.go | 1 + vendor/modules.txt | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 4ad2821a..e276abdb 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ require ( github.com/golang/protobuf v1.5.4 github.com/gorilla/mux v1.8.1 github.com/longhorn/backupstore v0.0.0-20240720163059-56c90cd23634 - github.com/longhorn/go-common-libs v0.0.0-20240720044518-32fc527fe868 + github.com/longhorn/go-common-libs v0.0.0-20240726063909-5c0987bc30d8 github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20240418025706-519598108463 github.com/longhorn/sparse-tools v0.0.0-20240703010727-92451e38077a - github.com/longhorn/types v0.0.0-20240706151541-33cb010c3544 + github.com/longhorn/types v0.0.0-20240725040629-473d671316c4 github.com/pkg/errors v0.9.1 github.com/rancher/go-fibmap v0.0.0-20160418233256-5fc9f8c1ed47 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index a2c8751c..7d62f0c7 100644 --- a/go.sum +++ b/go.sum @@ -61,14 +61,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/longhorn/backupstore v0.0.0-20240720163059-56c90cd23634 h1:gfrFl0YwZSfyiaLdg7TFKSHtBgMJclDGDtBjUhGe0ik= github.com/longhorn/backupstore v0.0.0-20240720163059-56c90cd23634/go.mod h1:7L/qcMq6IK3S/VU52AtmeKCnOK9Tz1XmMilzo2ILEm8= -github.com/longhorn/go-common-libs v0.0.0-20240720044518-32fc527fe868 h1:B1L6EGHroqnGUC5shcoNJsLPRpfBa8c01/TPO68G0GI= -github.com/longhorn/go-common-libs v0.0.0-20240720044518-32fc527fe868/go.mod h1:o01gaAiKE5NCd8+5i6csJSU4ELlW0Yn8GQ9U7pbXG9w= +github.com/longhorn/go-common-libs v0.0.0-20240726063909-5c0987bc30d8 h1:aD1kw/MEXqdwv2Dn3RXRIvHOTyTkKKH0EYoDaZPGKM4= +github.com/longhorn/go-common-libs v0.0.0-20240726063909-5c0987bc30d8/go.mod h1:o01gaAiKE5NCd8+5i6csJSU4ELlW0Yn8GQ9U7pbXG9w= github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20240418025706-519598108463 h1:KxddgUYC9InOhe8MxfbxzOL5v9q7f5DyThxQGGKvqVw= github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20240418025706-519598108463/go.mod h1:WNiZl2l51I36/c8dewxkyWd0yBA5Anznzki0knKO88U= github.com/longhorn/sparse-tools v0.0.0-20240703010727-92451e38077a h1:+o63c0oh7ZNKeQdc0Hawfzz5vRa4LiDvLOtJYjegtnk= github.com/longhorn/sparse-tools v0.0.0-20240703010727-92451e38077a/go.mod h1:iUJCZtOKG/9xv2rfrUAYZntFTzP5dZtvy4Kwe6dMcUc= -github.com/longhorn/types v0.0.0-20240706151541-33cb010c3544 h1:U08l+0SbxCsododsraBHB5PdXrQme3TEh9iaREhRLQs= -github.com/longhorn/types v0.0.0-20240706151541-33cb010c3544/go.mod h1:KlJuZB8NfHchWshYxYgV9pPIxBKC04Vq05G2TfgMf7w= +github.com/longhorn/types v0.0.0-20240725040629-473d671316c4 h1:L2g0sIJ2fXt4BSFRYNnF6ObtKryCUFm9qLcCXHWssCk= +github.com/longhorn/types v0.0.0-20240725040629-473d671316c4/go.mod h1:KlJuZB8NfHchWshYxYgV9pPIxBKC04Vq05G2TfgMf7w= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= 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= diff --git a/vendor/github.com/longhorn/go-common-libs/ns/executor.go b/vendor/github.com/longhorn/go-common-libs/ns/executor.go index a850e771..f48898f2 100644 --- a/vendor/github.com/longhorn/go-common-libs/ns/executor.go +++ b/vendor/github.com/longhorn/go-common-libs/ns/executor.go @@ -45,7 +45,7 @@ func NewNamespaceExecutor(processName, procDirectory string, namespaces []types. return NamespaceExecutor, nil } -// prepareCommandArgs prepares the nsenter command arguments. +// prepareCommandArgs prepares the nsenter command arguments, and the environment variables are not ignored. func (nsexec *Executor) prepareCommandArgs(binary string, args, envs []string) []string { cmdArgs := []string{} for _, ns := range nsexec.namespaces { @@ -60,7 +60,7 @@ func (nsexec *Executor) prepareCommandArgs(binary string, args, envs []string) [ } } if len(envs) > 0 { - cmdArgs = append(cmdArgs, "env", "-i") + cmdArgs = append(cmdArgs, "env") cmdArgs = append(cmdArgs, envs...) } diff --git a/vendor/github.com/longhorn/go-common-libs/types/file.go b/vendor/github.com/longhorn/go-common-libs/types/file.go index e67b01dd..3f2050fb 100644 --- a/vendor/github.com/longhorn/go-common-libs/types/file.go +++ b/vendor/github.com/longhorn/go-common-libs/types/file.go @@ -17,6 +17,7 @@ const ( DiskDriverVirtioBlk = DiskDriver("virtio-blk") DiskDriverVirtioPci = DiskDriver("virtio-pci") DiskDriverUioPciGeneric = DiskDriver("uio_pci_generic") + DiskDriverVfioPci = DiskDriver("vfio_pci") ) type DiskStat struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 68d0cd1f..2f061cc9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -138,7 +138,7 @@ github.com/longhorn/backupstore/s3 github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util github.com/longhorn/backupstore/vfs -# github.com/longhorn/go-common-libs v0.0.0-20240720044518-32fc527fe868 +# github.com/longhorn/go-common-libs v0.0.0-20240726063909-5c0987bc30d8 ## explicit; go 1.22.0 github.com/longhorn/go-common-libs/backup github.com/longhorn/go-common-libs/exec @@ -162,7 +162,7 @@ github.com/longhorn/sparse-tools/sparse github.com/longhorn/sparse-tools/sparse/rest github.com/longhorn/sparse-tools/types github.com/longhorn/sparse-tools/util -# github.com/longhorn/types v0.0.0-20240706151541-33cb010c3544 +# github.com/longhorn/types v0.0.0-20240725040629-473d671316c4 ## explicit; go 1.21 github.com/longhorn/types/pkg/generated/bimrpc github.com/longhorn/types/pkg/generated/enginerpc