diff --git a/go.mod b/go.mod index 62175806..3beb235d 100644 --- a/go.mod +++ b/go.mod @@ -3,36 +3,36 @@ module github.com/longhorn/longhorn-share-manager go 1.21 replace ( - k8s.io/api => k8s.io/api v0.29.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.29.2 - k8s.io/apiserver => k8s.io/apiserver v0.29.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2 - k8s.io/client-go => k8s.io/client-go v0.29.2 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.2 - k8s.io/code-generator => k8s.io/code-generator v0.29.2 - k8s.io/component-base => k8s.io/component-base v0.29.2 - k8s.io/component-helpers => k8s.io/component-helpers v0.29.2 - k8s.io/controller-manager => k8s.io/controller-manager v0.29.2 - k8s.io/cri-api => k8s.io/cri-api v0.29.2 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.2 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.2 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.2 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.2 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.2 - k8s.io/kubectl => k8s.io/kubectl v0.29.2 - k8s.io/kubelet => k8s.io/kubelet v0.29.2 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.2 - k8s.io/metrics => k8s.io/metrics v0.29.2 - k8s.io/mount-utils => k8s.io/mount-utils v0.29.2 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.2 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.2 + k8s.io/api => k8s.io/api v0.29.3 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3 + k8s.io/apimachinery => k8s.io/apimachinery v0.29.3 + k8s.io/apiserver => k8s.io/apiserver v0.29.3 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.3 + k8s.io/client-go => k8s.io/client-go v0.29.3 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.3 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.3 + k8s.io/code-generator => k8s.io/code-generator v0.29.3 + k8s.io/component-base => k8s.io/component-base v0.29.3 + k8s.io/component-helpers => k8s.io/component-helpers v0.29.3 + k8s.io/controller-manager => k8s.io/controller-manager v0.29.3 + k8s.io/cri-api => k8s.io/cri-api v0.29.3 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.3 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.3 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.3 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.3 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.3 + k8s.io/kubectl => k8s.io/kubectl v0.29.3 + k8s.io/kubelet => k8s.io/kubelet v0.29.3 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.3 + k8s.io/metrics => k8s.io/metrics v0.29.3 + k8s.io/mount-utils => k8s.io/mount-utils v0.29.3 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.3 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.3 ) require ( github.com/google/fscrypt v0.3.4 - github.com/longhorn/go-common-libs v0.0.0-20240307063052-6e77996eda29 + github.com/longhorn/go-common-libs v0.0.0-20240315062830-5aa0ac1dac62 github.com/mitchellh/go-ps v1.0.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 @@ -41,8 +41,8 @@ require ( golang.org/x/sys v0.18.0 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 - k8s.io/kubernetes v1.29.2 - k8s.io/mount-utils v0.29.2 + k8s.io/kubernetes v1.29.3 + k8s.io/mount-utils v0.29.3 k8s.io/utils v0.0.0-20240310230437-4693a0247e57 ) @@ -52,7 +52,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-logr/logr v1.3.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/opencontainers/selinux v1.11.0 // indirect diff --git a/go.sum b/go.sum index 099de52c..7c7eb868 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,8 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/fscrypt v0.3.4 h1:XGSVMIsQFooj82aRRfYn3JpgU/4fOTnzXPnjhxC8uH8= github.com/google/fscrypt v0.3.4/go.mod h1:BRpw7vaeDitXGRvXa281i/ivQszAdBIiUYDWHjVTkcs= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -34,6 +36,8 @@ 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/go-common-libs v0.0.0-20240307063052-6e77996eda29 h1:tyzIDCMjQGQzhqAtdJaeEMAaNUZJD/sHERXp+tYc+ms= github.com/longhorn/go-common-libs v0.0.0-20240307063052-6e77996eda29/go.mod h1:ePLGb2r/PJBUIVoVhLOt4bLOeu0S72ZB+fWDWwC8H28= +github.com/longhorn/go-common-libs v0.0.0-20240315062830-5aa0ac1dac62 h1:ovotrq4HvaSRFgLozlNyUAvJp2eykdOwfpz4VIYZGIY= +github.com/longhorn/go-common-libs v0.0.0-20240315062830-5aa0ac1dac62/go.mod h1:ePLGb2r/PJBUIVoVhLOt4bLOeu0S72ZB+fWDWwC8H28= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= @@ -147,12 +151,18 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.3.0/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70= k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kubernetes v1.29.2 h1:8hh1cntqdulanjQt7wSSSsJfBgOyx6fUdFWslvGL5m0= k8s.io/kubernetes v1.29.2/go.mod h1:xZPKU0yO0CBbLTnbd+XGyRmmtmaVuJykDb8gNCkeeUE= +k8s.io/kubernetes v1.29.3 h1:EuOAKN4zpiP+kBx/0e9yS5iBkPSyLml19juOqZxBtDw= +k8s.io/kubernetes v1.29.3/go.mod h1:CP+Z+S9haxyB7J+nV6ywYry4dqlphArPXjcc0CsBVXc= k8s.io/mount-utils v0.29.2 h1:FrUfgvOo63nqJRPXKoqN/DW1lMnR/y0pzpFErKh6p2o= k8s.io/mount-utils v0.29.2/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y= +k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0= +k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= 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 99c035d3..e67b01dd 100644 --- a/vendor/github.com/longhorn/go-common-libs/types/file.go +++ b/vendor/github.com/longhorn/go-common-libs/types/file.go @@ -9,11 +9,14 @@ var FileLockDefaultTimeout = 24 * time.Hour type DiskDriver string const ( - DiskDriverNone = DiskDriver("") - DiskDriverAio = DiskDriver("aio") - DiskDriverNvme = DiskDriver("nvme") - DiskDriverVirtioScsi = DiskDriver("virtio-scsi") - DiskDriverVirtioBlk = DiskDriver("virtio-blk") + DiskDriverNone = DiskDriver("") + DiskDriverAuto = DiskDriver("auto") + DiskDriverAio = DiskDriver("aio") + DiskDriverNvme = DiskDriver("nvme") + DiskDriverVirtioScsi = DiskDriver("virtio-scsi") + DiskDriverVirtioBlk = DiskDriver("virtio-blk") + DiskDriverVirtioPci = DiskDriver("virtio-pci") + DiskDriverUioPciGeneric = DiskDriver("uio_pci_generic") ) type DiskStat struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 92074288..27e87a9b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -15,8 +15,8 @@ github.com/go-logr/logr/slogr ## explicit; go 1.12 github.com/go-ole/go-ole github.com/go-ole/go-ole/oleutil -# github.com/golang/protobuf v1.5.3 -## explicit; go 1.9 +# github.com/golang/protobuf v1.5.4 +## explicit; go 1.17 github.com/golang/protobuf/proto # github.com/google/fscrypt v0.3.4 ## explicit; go 1.16 @@ -26,7 +26,7 @@ github.com/google/fscrypt/util # github.com/google/uuid v1.6.0 ## explicit github.com/google/uuid -# github.com/longhorn/go-common-libs v0.0.0-20240307063052-6e77996eda29 +# github.com/longhorn/go-common-libs v0.0.0-20240315062830-5aa0ac1dac62 ## explicit; go 1.21 github.com/longhorn/go-common-libs/exec github.com/longhorn/go-common-libs/io @@ -187,7 +187,7 @@ google.golang.org/protobuf/types/known/anypb google.golang.org/protobuf/types/known/durationpb google.golang.org/protobuf/types/known/emptypb google.golang.org/protobuf/types/known/timestamppb -# k8s.io/apimachinery v0.0.0 => k8s.io/apimachinery v0.29.2 +# k8s.io/apimachinery v0.0.0 => k8s.io/apimachinery v0.29.3 ## explicit; go 1.21 k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/wait @@ -200,11 +200,11 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kubernetes v1.29.2 +# k8s.io/kubernetes v1.29.3 ## explicit; go 1.21 k8s.io/kubernetes/pkg/util/filesystem k8s.io/kubernetes/pkg/volume/util/hostutil -# k8s.io/mount-utils v0.29.2 => k8s.io/mount-utils v0.29.2 +# k8s.io/mount-utils v0.29.3 => k8s.io/mount-utils v0.29.3 ## explicit; go 1.21 k8s.io/mount-utils # k8s.io/utils v0.0.0-20240310230437-4693a0247e57 @@ -214,28 +214,28 @@ k8s.io/utils/exec k8s.io/utils/io k8s.io/utils/keymutex k8s.io/utils/path -# k8s.io/api => k8s.io/api v0.29.2 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2 -# k8s.io/apimachinery => k8s.io/apimachinery v0.29.2 -# k8s.io/apiserver => k8s.io/apiserver v0.29.2 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2 -# k8s.io/client-go => k8s.io/client-go v0.29.2 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.2 -# k8s.io/code-generator => k8s.io/code-generator v0.29.2 -# k8s.io/component-base => k8s.io/component-base v0.29.2 -# k8s.io/component-helpers => k8s.io/component-helpers v0.29.2 -# k8s.io/controller-manager => k8s.io/controller-manager v0.29.2 -# k8s.io/cri-api => k8s.io/cri-api v0.29.2 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.2 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.2 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.2 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.2 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.2 -# k8s.io/kubectl => k8s.io/kubectl v0.29.2 -# k8s.io/kubelet => k8s.io/kubelet v0.29.2 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.2 -# k8s.io/metrics => k8s.io/metrics v0.29.2 -# k8s.io/mount-utils => k8s.io/mount-utils v0.29.2 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.2 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.2 +# k8s.io/api => k8s.io/api v0.29.3 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3 +# k8s.io/apimachinery => k8s.io/apimachinery v0.29.3 +# k8s.io/apiserver => k8s.io/apiserver v0.29.3 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.3 +# k8s.io/client-go => k8s.io/client-go v0.29.3 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.3 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.3 +# k8s.io/code-generator => k8s.io/code-generator v0.29.3 +# k8s.io/component-base => k8s.io/component-base v0.29.3 +# k8s.io/component-helpers => k8s.io/component-helpers v0.29.3 +# k8s.io/controller-manager => k8s.io/controller-manager v0.29.3 +# k8s.io/cri-api => k8s.io/cri-api v0.29.3 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.3 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.3 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.3 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.3 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.3 +# k8s.io/kubectl => k8s.io/kubectl v0.29.3 +# k8s.io/kubelet => k8s.io/kubelet v0.29.3 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.3 +# k8s.io/metrics => k8s.io/metrics v0.29.3 +# k8s.io/mount-utils => k8s.io/mount-utils v0.29.3 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.3 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.3