diff --git a/go.mod b/go.mod index 7b6937fe9f..a234294d2c 100644 --- a/go.mod +++ b/go.mod @@ -46,14 +46,14 @@ require ( github.com/gorilla/websocket v1.5.1 github.com/jinzhu/copier v0.3.5 github.com/kubernetes-csi/csi-lib-utils v0.6.1 - github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427134432-3faadca8ae5a - github.com/longhorn/backupstore v0.0.0-20240426093637-ac3867f121c0 - github.com/longhorn/go-common-libs v0.0.0-20240426033718-77710d2242df + github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427164523-e68bcc993c87 + github.com/longhorn/backupstore v0.0.0-20240427164602-c8721e8ea31a + github.com/longhorn/go-common-libs v0.0.0-20240427164621-70d1933bfa90 github.com/longhorn/go-iscsi-helper v0.0.0-20240417063713-e20db15bb989 - github.com/longhorn/go-spdk-helper v0.0.0-20240426112700-a797602bf7fe + github.com/longhorn/go-spdk-helper v0.0.0-20240427164640-8cb919fb8e53 github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20240418025706-519598108463 - github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427142826-1cafc504af22 - github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427131147-d2b5741fb515 + github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427190954-4897cf9deeb0 + github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427171835-87b6d7870567 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.18.0 github.com/rancher/dynamiclistener v0.3.6 @@ -91,7 +91,7 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect github.com/jonboulle/clockwork v0.4.0 // indirect - github.com/longhorn/types v0.0.0-20240424162824-4995e1e42438 // indirect + github.com/longhorn/types v0.0.0-20240427164854-38dbed8528d3 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/shirou/gopsutil/v3 v3.24.3 // indirect diff --git a/go.sum b/go.sum index 1329de0903..9ab1000f71 100644 --- a/go.sum +++ b/go.sum @@ -1055,16 +1055,22 @@ github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427022236-28c011d018 github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427022236-28c011d018c1/go.mod h1:LdAzkDOAgSwXjY6ansWyPhauJHejs7bbnDuxV6EBsCk= github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427134432-3faadca8ae5a h1:CioDzB9StwJJoLObyNsSKRUBzJ7x6We3e9hA+p1Or0M= github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427134432-3faadca8ae5a/go.mod h1:LUjmnsvxsUFtSlNn2rKjHJiog0by3Iunz2AlGUV0lSU= +github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427164523-e68bcc993c87 h1:/Y4EAYvkR6wVoDakS/WYyMRb1iy+weevjTdcxQT85XM= +github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427164523-e68bcc993c87/go.mod h1:LUjmnsvxsUFtSlNn2rKjHJiog0by3Iunz2AlGUV0lSU= github.com/longhorn/backupstore v0.0.0-20240417071544-3bd377eeefeb h1:GkAG0P7QI32PYgjLBV6VvaEAM/Z9dKyPohccU1js+Uk= github.com/longhorn/backupstore v0.0.0-20240417071544-3bd377eeefeb/go.mod h1:4cbJWtlrD2cGTQxQLtdlPTYopiJiusXH7CpOBrn/s3k= github.com/longhorn/backupstore v0.0.0-20240426093637-ac3867f121c0 h1:sb9HK8uWApqrBbpjnxlNSmIB5f4oi3UqfeRHVniPcqo= github.com/longhorn/backupstore v0.0.0-20240426093637-ac3867f121c0/go.mod h1:NlOHCyQiGjn9TS1HUfQlBESttDPzi9x1Vs38geRV9SU= +github.com/longhorn/backupstore v0.0.0-20240427164602-c8721e8ea31a h1:cwHDzWi0zkgg/SHtvEhWIYLvZHJvCp5twS8qBOUt/Nc= +github.com/longhorn/backupstore v0.0.0-20240427164602-c8721e8ea31a/go.mod h1:NlOHCyQiGjn9TS1HUfQlBESttDPzi9x1Vs38geRV9SU= github.com/longhorn/go-common-libs v0.0.0-20240411093823-b8862efb8e03 h1:RN7mq4FrbHcAeemI5tDha9u4X+RSRrPugD1cY1FHdvo= github.com/longhorn/go-common-libs v0.0.0-20240411093823-b8862efb8e03/go.mod h1:7onp+E4hSg2DnB40dJU0Y7adrvykGg6jHxOb48imPGg= github.com/longhorn/go-common-libs v0.0.0-20240422073843-1578e42a50bd h1:Jjg8nogQ04/DaofTXsHWCRrBEf4g2ufwfzrsAP4SgrQ= github.com/longhorn/go-common-libs v0.0.0-20240422073843-1578e42a50bd/go.mod h1:qppGSy9WsxH1C9T6yhSMvG53ynpasyKOH/n9e1jr8mw= github.com/longhorn/go-common-libs v0.0.0-20240426033718-77710d2242df h1:q2a/IL7zoPkYxIMsz46E6uWDamu9z4k+h/4u4pHsdqE= github.com/longhorn/go-common-libs v0.0.0-20240426033718-77710d2242df/go.mod h1:qppGSy9WsxH1C9T6yhSMvG53ynpasyKOH/n9e1jr8mw= +github.com/longhorn/go-common-libs v0.0.0-20240427164621-70d1933bfa90 h1:uBVee6AulPsgSvsvaxdj4xIdgkIvjIqA0j7ZD+Hg/Mc= +github.com/longhorn/go-common-libs v0.0.0-20240427164621-70d1933bfa90/go.mod h1:qppGSy9WsxH1C9T6yhSMvG53ynpasyKOH/n9e1jr8mw= github.com/longhorn/go-iscsi-helper v0.0.0-20240329081212-26b6406b3b2b h1:Cp8eBy4tKAaqOfycyLcCKIzhJd+K04/WfE9/OIALOaA= github.com/longhorn/go-iscsi-helper v0.0.0-20240329081212-26b6406b3b2b/go.mod h1:tynRAH865oFPQQw4rY4wgL7a/JEYQsAhy+DXglx51eI= github.com/longhorn/go-iscsi-helper v0.0.0-20240417063713-e20db15bb989 h1:4ddaq015o2NoMQeNqlKOZArN/aSr1IEbK9hExDCVFVM= @@ -1075,6 +1081,8 @@ github.com/longhorn/go-spdk-helper v0.0.0-20240424110116-b282f131d75a h1:LhDh8Qb github.com/longhorn/go-spdk-helper v0.0.0-20240424110116-b282f131d75a/go.mod h1:CiKgQ6CKWCE4CrAUgQx7inzRT7Xzbo6JuDhdRTpaVkY= github.com/longhorn/go-spdk-helper v0.0.0-20240426112700-a797602bf7fe h1:RWugaxgHq79c9o62bSdBBlvoE90eIGb7YkJFu9NZDR8= github.com/longhorn/go-spdk-helper v0.0.0-20240426112700-a797602bf7fe/go.mod h1:CiKgQ6CKWCE4CrAUgQx7inzRT7Xzbo6JuDhdRTpaVkY= +github.com/longhorn/go-spdk-helper v0.0.0-20240427164640-8cb919fb8e53 h1:7JOAKtVr0zOBvBcKJw76IJjbiyJZLI7x5O6GFAifUm0= +github.com/longhorn/go-spdk-helper v0.0.0-20240427164640-8cb919fb8e53/go.mod h1:CiKgQ6CKWCE4CrAUgQx7inzRT7Xzbo6JuDhdRTpaVkY= 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/longhorn-instance-manager v1.7.0-dev.0.20240418070517-74c78b7744c3 h1:8WDveKerBMXFNX6JhiRsGBSSY7Sk7Oa5SFsQMXYxX/w= @@ -1087,6 +1095,8 @@ github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427052252-a4b926 github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427052252-a4b926b28b1f/go.mod h1:DuEiU4jngt5loaFxs15D48x1GnAeedVGKWHP1zemW2k= github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427142826-1cafc504af22 h1:QWq47LqsRgO28TidAVPeYrCN/Dk9Np6pAwObSFfWVgE= github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427142826-1cafc504af22/go.mod h1:/66vp3RCJQJkw6a8mlK/0N+60ZThFq+rej3IYkkD6cc= +github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427190954-4897cf9deeb0 h1:w81fNVAm54Bh3YQkyDoiOzYZa2ApRjm0rfmffC7lfFk= +github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427190954-4897cf9deeb0/go.mod h1:sqWw/fUB00Y8QRtVgW/15nYdylOWndzP6LtY/TI9iKE= github.com/longhorn/longhorn-share-manager v0.0.0-20240418035326-c6bd5823a659 h1:xGXCh78i3V20gjRCGrdvrD8wwGm711Eqor8jyddkNa4= github.com/longhorn/longhorn-share-manager v0.0.0-20240418035326-c6bd5823a659/go.mod h1:iFrl89P0XolTpBpOYODCvR1c6DXFXXvHugSDMJEJsVo= github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240420130308-5b297774fe5d h1:uflrWURkd3cIMVQXd1k5kEK6DQcYxRM7thTAMuXYkFo= @@ -1097,10 +1107,14 @@ github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427042921-96cdd7f05 github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427042921-96cdd7f05166/go.mod h1:2XwhtpbLNmNRq0LF3wk76HUYqFvNymj5aixjSeC6kcg= github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427131147-d2b5741fb515 h1:hkhEgxTPi8lfzE28hKHciI+b8I/j5rUVRtMeL6bd3D4= github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427131147-d2b5741fb515/go.mod h1:UMqrcCVCKAwNldhkdtE7cB1andiDtw7ugaBCE701ODA= +github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427171835-87b6d7870567 h1:zvWfdUJbvlybIXw21DZuQRwDidRDzHwGj06bouWY1lE= +github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427171835-87b6d7870567/go.mod h1:5uXI08YSR+UrBi4Zh+IsrEbYG1CYl6lP6x5g6gxcw/8= github.com/longhorn/types v0.0.0-20240417112740-a0d8514936b8 h1:M9TQLN379VNN3JsuLuKHDRIy/11jYeIuxYLFuekjcPw= github.com/longhorn/types v0.0.0-20240417112740-a0d8514936b8/go.mod h1:pqT+7B8T+nkyUZYe8tL3CwPDCHjkbe3mHUDY5ntJFyQ= github.com/longhorn/types v0.0.0-20240424162824-4995e1e42438 h1:nSuJa62e6F9YsP06Js4jnKr0AsvEMGwBRLm9fXTlmns= github.com/longhorn/types v0.0.0-20240424162824-4995e1e42438/go.mod h1:pqT+7B8T+nkyUZYe8tL3CwPDCHjkbe3mHUDY5ntJFyQ= +github.com/longhorn/types v0.0.0-20240427164854-38dbed8528d3 h1:7YDGJTwro/kCcMmnCWM1UIL4JgervR6MT++71PvcbGY= +github.com/longhorn/types v0.0.0-20240427164854-38dbed8528d3/go.mod h1:pqT+7B8T+nkyUZYe8tL3CwPDCHjkbe3mHUDY5ntJFyQ= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= diff --git a/vendor/modules.txt b/vendor/modules.txt index 95654dfb50..6dfe846d76 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -218,14 +218,14 @@ github.com/kubernetes-csi/csi-lib-utils/protosanitizer # github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de ## explicit github.com/liggitt/tabwriter -# github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427134432-3faadca8ae5a +# github.com/longhorn/backing-image-manager v1.7.0-dev.0.20240427164523-e68bcc993c87 ## explicit; go 1.21 github.com/longhorn/backing-image-manager/api github.com/longhorn/backing-image-manager/pkg/client github.com/longhorn/backing-image-manager/pkg/meta github.com/longhorn/backing-image-manager/pkg/types github.com/longhorn/backing-image-manager/pkg/util -# github.com/longhorn/backupstore v0.0.0-20240426093637-ac3867f121c0 +# github.com/longhorn/backupstore v0.0.0-20240427164602-c8721e8ea31a ## explicit; go 1.21 github.com/longhorn/backupstore github.com/longhorn/backupstore/backupbackingimage @@ -234,7 +234,7 @@ github.com/longhorn/backupstore/logging github.com/longhorn/backupstore/systembackup github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util -# github.com/longhorn/go-common-libs v0.0.0-20240426033718-77710d2242df +# github.com/longhorn/go-common-libs v0.0.0-20240427164621-70d1933bfa90 ## explicit; go 1.22 github.com/longhorn/go-common-libs/exec github.com/longhorn/go-common-libs/io @@ -250,7 +250,7 @@ github.com/longhorn/go-common-libs/utils github.com/longhorn/go-iscsi-helper/iscsi github.com/longhorn/go-iscsi-helper/types github.com/longhorn/go-iscsi-helper/util -# github.com/longhorn/go-spdk-helper v0.0.0-20240426112700-a797602bf7fe +# github.com/longhorn/go-spdk-helper v0.0.0-20240427164640-8cb919fb8e53 ## explicit; go 1.22 github.com/longhorn/go-spdk-helper/pkg/types # github.com/longhorn/longhorn-engine v1.6.0-dev-20231217.0.20240418025706-519598108463 @@ -260,18 +260,18 @@ github.com/longhorn/longhorn-engine/pkg/meta github.com/longhorn/longhorn-engine/pkg/replica/client github.com/longhorn/longhorn-engine/pkg/types github.com/longhorn/longhorn-engine/pkg/util -# github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427142826-1cafc504af22 +# github.com/longhorn/longhorn-instance-manager v1.7.0-dev.0.20240427190954-4897cf9deeb0 ## explicit; go 1.22.0 github.com/longhorn/longhorn-instance-manager/pkg/api github.com/longhorn/longhorn-instance-manager/pkg/client github.com/longhorn/longhorn-instance-manager/pkg/meta github.com/longhorn/longhorn-instance-manager/pkg/types github.com/longhorn/longhorn-instance-manager/pkg/util -# github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427131147-d2b5741fb515 +# github.com/longhorn/longhorn-share-manager v1.7.0-dev.0.20240427171835-87b6d7870567 ## explicit; go 1.22.2 github.com/longhorn/longhorn-share-manager/pkg/client github.com/longhorn/longhorn-share-manager/pkg/types -# github.com/longhorn/types v0.0.0-20240424162824-4995e1e42438 +# github.com/longhorn/types v0.0.0-20240427164854-38dbed8528d3 ## explicit; go 1.21 github.com/longhorn/types/pkg/generated/bimrpc github.com/longhorn/types/pkg/generated/enginerpc