diff --git a/go.mod b/go.mod index d296bb5a4a..a4c51bebc3 100644 --- a/go.mod +++ b/go.mod @@ -47,9 +47,9 @@ require ( github.com/longhorn/backing-image-manager v1.4.0-rc1.0.20230521151917-38ff27cc2cbb github.com/longhorn/backupstore v0.0.0-20230620040003-393d5122a38c github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712 - github.com/longhorn/go-spdk-helper v0.0.0-20230620021725-56fd696a7431 + github.com/longhorn/go-spdk-helper v0.0.0-20230620105912-7fdb56e276a6 github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230612073917-0896a6f78315 - github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620043941-e1fa76231793 + github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620170109-89cbf322e315 github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.0 @@ -126,7 +126,7 @@ require ( github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect - github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620042318-efec96993250 // indirect + github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620162131-a9d08b7b13b6 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect diff --git a/go.sum b/go.sum index c8de9a3be5..45c315b309 100644 --- a/go.sum +++ b/go.sum @@ -503,16 +503,16 @@ github.com/longhorn/backupstore v0.0.0-20230620040003-393d5122a38c h1:uul+kPFHTH github.com/longhorn/backupstore v0.0.0-20230620040003-393d5122a38c/go.mod h1:wiEYTbvxEAIUxAAY1DmvMeuFuGqwWmJTzfVhZiBKlNo= github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712 h1:IOBWtvr2ZdpQs3Fy8ecre3vZOBvmLJXme9qB6sqWdlw= github.com/longhorn/go-iscsi-helper v0.0.0-20230529082528-4c3270590712/go.mod h1:hxy8Ra38KtX4MFmXZRAZUpJZSYcaI1pmnWmKA3ICA2c= -github.com/longhorn/go-spdk-helper v0.0.0-20230620021725-56fd696a7431 h1:LbHR6kVmymOB+4cJ5fu30ikZ16+QCZh7MgzZU9e2+Ks= -github.com/longhorn/go-spdk-helper v0.0.0-20230620021725-56fd696a7431/go.mod h1:XoGXOYHw1KW3qdvTSimwY+Anyg5cPl6EVkjXxS25Upg= +github.com/longhorn/go-spdk-helper v0.0.0-20230620105912-7fdb56e276a6 h1:SmofHsRBP6hgRmdRYIDri4FT7A9eryMgpOsKneG9LNs= +github.com/longhorn/go-spdk-helper v0.0.0-20230620105912-7fdb56e276a6/go.mod h1:XoGXOYHw1KW3qdvTSimwY+Anyg5cPl6EVkjXxS25Upg= github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230612073917-0896a6f78315 h1:PC8jKa2J3TF2oG3rY55oc7ILOOV29g2dJ20fGllK+SA= github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230612073917-0896a6f78315/go.mod h1:ZxJFbQH6KUFHVf34RpfNloMqZuebpRyHCFasYX1bUaM= -github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620043941-e1fa76231793 h1:nkXrFYSrKytaL5/iX1skGe671/rIKjbKDgBVgv76YgY= -github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620043941-e1fa76231793/go.mod h1:Vd03kB7OrSSstVpRTga4vFNQ+62Xg9k7f3ZBVyzUGFg= +github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620170109-89cbf322e315 h1:H1Vg/NhjmftQgtMQnvThzK38ohFe5HfOTQ/lpdHO9KU= +github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620170109-89cbf322e315/go.mod h1:37ZZTj5XjoyOepYdapbYU6xjLQG/oDC6WkLI2JkcEUQ= github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6 h1:v+3TcQuWtUphsYWJ4Hr+PeEjEPHUVVOSnk1DMNSFI1E= github.com/longhorn/longhorn-share-manager v1.4.0-rc1.0.20230531125701-c996c5a415b6/go.mod h1:Kq3D8tu8J1SED7XiVM6Yco6qkizxCjVhYzR78bqhUUI= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620042318-efec96993250 h1:rrzP4RFICaU4TrxnQxJyhoAF+6XfxZxbOrDkuwLxjLc= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620042318-efec96993250/go.mod h1:c+ksJvR8qQc3AwiLTjvMhfNTlzFyJ7NzG2rLY9BPfDA= +github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620162131-a9d08b7b13b6 h1:10UWfxYgduAgfO2tROaf2JPm/J/EPilEBIiT4TT3DAE= +github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620162131-a9d08b7b13b6/go.mod h1:NMc/HiloU8MI7T5nqF8Zx/ngOgdrexvumVdU1K8qbNs= github.com/longhorn/nsfilelock v0.0.0-20200723175406-fa7c83ad0003/go.mod h1:0CLeXlf59Lg6C0kjLSDf47ft73Dh37CwymYRKWwAn04= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= diff --git a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/disk.go b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/disk.go index 3414a3e68c..e662534e3b 100644 --- a/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/disk.go +++ b/vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/disk.go @@ -28,7 +28,7 @@ func (c *DiskServiceClient) Close() error { return c.cc.Close() } -func (c *DiskServiceClient) getControllerServiceClient() rpc.DiskServiceClient { +func (c *DiskServiceClient) getDiskServiceClient() rpc.DiskServiceClient { return c.service } @@ -86,7 +86,7 @@ func (c *DiskServiceClient) DiskCreate(diskType, diskName, diskUUID, diskPath st return nil, fmt.Errorf("failed to get disk info: invalid disk type %v", diskType) } - client := c.getControllerServiceClient() + client := c.getDiskServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) defer cancel() @@ -126,7 +126,7 @@ func (c *DiskServiceClient) DiskGet(diskType, diskName, diskPath string) (*api.D return nil, fmt.Errorf("failed to get disk info: invalid disk type %v", diskType) } - client := c.getControllerServiceClient() + client := c.getDiskServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) defer cancel() @@ -159,7 +159,7 @@ func (c *DiskServiceClient) DiskDelete(diskType, diskName, diskUUID string) erro return fmt.Errorf("failed to delete disk: missing required parameters") } - client := c.getControllerServiceClient() + client := c.getDiskServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) defer cancel() @@ -176,7 +176,7 @@ func (c *DiskServiceClient) DiskReplicaInstanceList(diskType, diskName string) ( return nil, fmt.Errorf("failed to list replica instances on disk: missing required parameter") } - client := c.getControllerServiceClient() + client := c.getDiskServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) defer cancel() @@ -209,7 +209,7 @@ func (c *DiskServiceClient) DiskReplicaInstanceDelete(diskType, diskName, diskUU return fmt.Errorf("failed to delete replica instance on disk: missing required parameters") } - client := c.getControllerServiceClient() + client := c.getDiskServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) defer cancel() @@ -225,7 +225,7 @@ func (c *DiskServiceClient) DiskReplicaInstanceDelete(diskType, diskName, diskUU // VersionGet returns the disk service version. func (c *DiskServiceClient) VersionGet() (*meta.DiskServiceVersionOutput, error) { - client := c.getControllerServiceClient() + client := c.getDiskServiceClient() ctx, cancel := context.WithTimeout(context.Background(), types.GRPCServiceTimeout) defer cancel() diff --git a/vendor/modules.txt b/vendor/modules.txt index 71e78a9312..62cf01e0cc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -230,7 +230,7 @@ github.com/longhorn/backupstore/util 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-20230620021725-56fd696a7431 +# github.com/longhorn/go-spdk-helper v0.0.0-20230620105912-7fdb56e276a6 ## explicit; go 1.17 github.com/longhorn/go-spdk-helper/pkg/types # github.com/longhorn/longhorn-engine v1.4.0-rc1.0.20230612073917-0896a6f78315 @@ -240,7 +240,7 @@ 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-engine/proto/ptypes -# github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620043941-e1fa76231793 +# github.com/longhorn/longhorn-instance-manager v1.4.0-rc1.0.20230620170109-89cbf322e315 ## explicit; go 1.20 github.com/longhorn/longhorn-instance-manager/pkg/api github.com/longhorn/longhorn-instance-manager/pkg/client @@ -258,7 +258,7 @@ github.com/longhorn/longhorn-share-manager/pkg/server/nfs github.com/longhorn/longhorn-share-manager/pkg/types github.com/longhorn/longhorn-share-manager/pkg/util github.com/longhorn/longhorn-share-manager/pkg/volume -# github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620042318-efec96993250 +# github.com/longhorn/longhorn-spdk-engine v0.0.0-20230620162131-a9d08b7b13b6 ## explicit; go 1.17 github.com/longhorn/longhorn-spdk-engine/pkg/types github.com/longhorn/longhorn-spdk-engine/proto/spdkrpc