Merge branch 'v1.5.x' into mergify/bp/v1.5.x/pr-2026

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/longhorn-engine v1.5.0-rc2
-	github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230620053808-7d08b6e28f9d
+	github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36
+	github.com/longhorn/longhorn-engine v1.5.0-rc2.0.20230626084001-d82e290abcc9
+	github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230626085618-b35c18699f21
 	github.com/longhorn/longhorn-share-manager v1.5.0-rc2
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.15.0
@@ -131,7 +131,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-20230626073013-4d74edb3633a // 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

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/longhorn-engine v1.5.0-rc2 h1:4eDiMrAgKbrPZ0Y9yQoiSRMxagvsLvIv1Jl1hu5iBwM=
-github.com/longhorn/longhorn-engine v1.5.0-rc2/go.mod h1:ZxJFbQH6KUFHVf34RpfNloMqZuebpRyHCFasYX1bUaM=
-github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230620053808-7d08b6e28f9d h1:yh85yw9HW05mPD0oWCN6YiVUwoi/kwg7eiwuGlCQok4=
-github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230620053808-7d08b6e28f9d/go.mod h1:XZnugze2wdVbLhPAIA96U7oQufXyLW+4Aw3m+7vOPT0=
+github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36 h1:wUaSMEhkoB+ZFH1Bru5wgxrFruE4NDkl5bXXDVciqQY=
+github.com/longhorn/go-spdk-helper v0.0.0-20230626041832-c611b61f6b36/go.mod h1:XoGXOYHw1KW3qdvTSimwY+Anyg5cPl6EVkjXxS25Upg=
+github.com/longhorn/longhorn-engine v1.5.0-rc2.0.20230626084001-d82e290abcc9 h1:ck5FqZdAW7irhFY09G/ZGq8eU+6DBkw0VTnogMe1rbs=
+github.com/longhorn/longhorn-engine v1.5.0-rc2.0.20230626084001-d82e290abcc9/go.mod h1:g/dipfdkEwgu1WczQ7NIR2pncYOUacExQgFwwFMUvps=
+github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230626085618-b35c18699f21 h1:p4nSk95r1mn0Ikln5YLgK9IJAKKQbqw2ZNV99pvgmEY=
+github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230626085618-b35c18699f21/go.mod h1:iGBXSI9+kdDuX7ZQYmT7fia6xHFVCxn9bqopmMtZFe4=
 github.com/longhorn/longhorn-share-manager v1.5.0-rc2 h1:kzyxv4xEDB/z7L6YjJTGl2R88goPKT8GNeimgMaZ5sw=
 github.com/longhorn/longhorn-share-manager v1.5.0-rc2/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-20230626073013-4d74edb3633a h1:tz229Pfu/jcTXOfih/sryPPyvD83Lbc7hxJzCMWkbPI=
+github.com/longhorn/longhorn-spdk-engine v0.0.0-20230626073013-4d74edb3633a/go.mod h1:yZawDOljQHgh+ZzPCIL+xr5VXzK85bps8J42HJXHnyg=
 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=

vendor/modules.txt

@@ -230,17 +230,17 @@ 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-20230626041832-c611b61f6b36
 ## explicit; go 1.17
 github.com/longhorn/go-spdk-helper/pkg/types
-# github.com/longhorn/longhorn-engine v1.5.0-rc2
+# github.com/longhorn/longhorn-engine v1.5.0-rc2.0.20230626084001-d82e290abcc9
 ## explicit; go 1.20
 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-engine/proto/ptypes
-# github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230620053808-7d08b6e28f9d
+# github.com/longhorn/longhorn-instance-manager v1.5.0-rc2.0.20230626085618-b35c18699f21
 ## 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-20230626073013-4d74edb3633a
 ## explicit; go 1.17
 github.com/longhorn/longhorn-spdk-engine/pkg/types
 github.com/longhorn/longhorn-spdk-engine/proto/spdkrpc