diff --git a/go.mod b/go.mod index 6c8e19d7f..c7a90ee57 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 - github.com/longhorn/backupstore v0.0.0-20240706152841-78e2c8892f4e - github.com/longhorn/go-common-libs v0.0.0-20240707062002-b9354601827e - github.com/longhorn/go-iscsi-helper v0.0.0-20240706152726-9dbb9c7bdf30 + github.com/longhorn/backupstore v0.0.0-20240709004445-1cadf9073de3 + github.com/longhorn/go-common-libs v0.0.0-20240718091042-aff867b55212 + github.com/longhorn/go-iscsi-helper v0.0.0-20240708025845-7cc78e60866a github.com/longhorn/sparse-tools v0.0.0-20240703010727-92451e38077a github.com/longhorn/types v0.0.0-20240706151541-33cb010c3544 github.com/moby/moby v26.1.4+incompatible @@ -25,7 +25,7 @@ require ( google.golang.org/protobuf v1.34.2 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/cheggaaa/pb.v2 v2.0.7 - k8s.io/mount-utils v0.30.2 + k8s.io/mount-utils v0.30.3 ) require ( diff --git a/go.sum b/go.sum index f3c199ff5..093305564 100644 --- a/go.sum +++ b/go.sum @@ -68,12 +68,12 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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-20240706152841-78e2c8892f4e h1:UtuNgcxi6YSdlY711WXEa5lHqET6p3QL+4ZkAJnVl9w= -github.com/longhorn/backupstore v0.0.0-20240706152841-78e2c8892f4e/go.mod h1:X9DZ+xqReDQfSsGCxRnNViBxoxSbHezjfejwTPp17NI= -github.com/longhorn/go-common-libs v0.0.0-20240707062002-b9354601827e h1:0SiyvTuovYc9kLJbjagTSxv3sOfCCU9FQJasRo7bgzU= -github.com/longhorn/go-common-libs v0.0.0-20240707062002-b9354601827e/go.mod h1:vX53A9KF4RHC1UTbEGouZHsZO6bwT3zk63l1hvwF5T8= -github.com/longhorn/go-iscsi-helper v0.0.0-20240706152726-9dbb9c7bdf30 h1:tTHysoIMIUt53dRqLtIo7AH0RRMr2P5Jy8DAMxDISO8= -github.com/longhorn/go-iscsi-helper v0.0.0-20240706152726-9dbb9c7bdf30/go.mod h1:Y4SlLQTYuOOMWlJNdFhTkM3MsXTmY/jkWj8jbuU7kOE= +github.com/longhorn/backupstore v0.0.0-20240709004445-1cadf9073de3 h1:DCNyiGtXlYKMdXBm7p3l86pXEaP0klFpes+BtLYleQc= +github.com/longhorn/backupstore v0.0.0-20240709004445-1cadf9073de3/go.mod h1:IJ7rVDB0l5J8YBFgvbYRM0dCF9pLhnIToia+4PDzNqY= +github.com/longhorn/go-common-libs v0.0.0-20240718091042-aff867b55212 h1:6GXy1BNS5oIayZTqdudS0JY+XohMgS6c+CWYZRxSPBE= +github.com/longhorn/go-common-libs v0.0.0-20240718091042-aff867b55212/go.mod h1:vX53A9KF4RHC1UTbEGouZHsZO6bwT3zk63l1hvwF5T8= +github.com/longhorn/go-iscsi-helper v0.0.0-20240708025845-7cc78e60866a h1:8FYqfmKkssHYiZqgpnodiyzjPkYmqSViEjXdCvij3rQ= +github.com/longhorn/go-iscsi-helper v0.0.0-20240708025845-7cc78e60866a/go.mod h1:ZP3plRH+n4J+t16PdgQ8c8QGhoR1OZAs+/1mhPnpyP4= 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= @@ -234,7 +234,7 @@ k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg= k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/mount-utils v0.30.2 h1:2KDVY9hXyDyRw9EO4lmox4+Nn5atVOq+4ffZ/br2aAU= -k8s.io/mount-utils v0.30.2/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo= +k8s.io/mount-utils v0.30.3 h1:8Z3wSW5+GSvGNtlDhtoZrBCKLMIf5z/9tf8pie+G06s= +k8s.io/mount-utils v0.30.3/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/vendor/github.com/longhorn/go-common-libs/backup/types.go b/vendor/github.com/longhorn/go-common-libs/backup/types.go index 3b77f4675..f12d78559 100644 --- a/vendor/github.com/longhorn/go-common-libs/backup/types.go +++ b/vendor/github.com/longhorn/go-common-libs/backup/types.go @@ -8,3 +8,8 @@ const ( LonghornBackupModeFull = LonghornBackupMode("full") LonghornBackupModeIncremental = LonghornBackupMode("incremental") ) + +const ( + LonghornBackupBackingImageParameterSecret = "secret" + LonghornBackupBackingImageParameterSecretNamespace = "secret-namespace" +) diff --git a/vendor/modules.txt b/vendor/modules.txt index ae4f99be4..22c64f6c2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/kr/pretty # github.com/kr/text v0.2.0 ## explicit github.com/kr/text -# github.com/longhorn/backupstore v0.0.0-20240706152841-78e2c8892f4e +# github.com/longhorn/backupstore v0.0.0-20240709004445-1cadf9073de3 ## explicit; go 1.22.0 github.com/longhorn/backupstore github.com/longhorn/backupstore/azblob @@ -144,7 +144,7 @@ github.com/longhorn/backupstore/systembackup github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util github.com/longhorn/backupstore/vfs -# github.com/longhorn/go-common-libs v0.0.0-20240707062002-b9354601827e +# github.com/longhorn/go-common-libs v0.0.0-20240718091042-aff867b55212 ## explicit; go 1.22.0 github.com/longhorn/go-common-libs/backup github.com/longhorn/go-common-libs/exec @@ -156,7 +156,7 @@ github.com/longhorn/go-common-libs/sync github.com/longhorn/go-common-libs/sys github.com/longhorn/go-common-libs/types github.com/longhorn/go-common-libs/utils -# github.com/longhorn/go-iscsi-helper v0.0.0-20240706152726-9dbb9c7bdf30 +# github.com/longhorn/go-iscsi-helper v0.0.0-20240708025845-7cc78e60866a ## explicit; go 1.22.0 github.com/longhorn/go-iscsi-helper/iscsi github.com/longhorn/go-iscsi-helper/iscsidev @@ -416,7 +416,7 @@ 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/mount-utils v0.30.2 +# k8s.io/mount-utils v0.30.3 ## explicit; go 1.22.0 k8s.io/mount-utils # k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0