diff --git a/go.mod b/go.mod index 9061b9dfa8a..142c803635b 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 // TODO: API for managing subvolume metadata and snapshot metadata requires `ceph_ci_untested` build-tag - github.com/ceph/go-ceph v0.22.0 + github.com/ceph/go-ceph v0.23.0 github.com/container-storage-interface/spec v1.8.0 github.com/csi-addons/replication-lib-utils v0.2.0 github.com/csi-addons/spec v0.2.1-0.20230606140122-d20966d2e444 diff --git a/go.sum b/go.sum index 7999e80a1de..fe240a4aa6f 100644 --- a/go.sum +++ b/go.sum @@ -761,8 +761,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod h1:C0rtzmGXgN78pYR0tGJFhtHgkbAs0lIbHwkB81VxDQE= -github.com/ceph/go-ceph v0.22.0 h1:neClxdgly+Bb2IfmC3vP4Rihh//BM0YpJW/685T+yT4= -github.com/ceph/go-ceph v0.22.0/go.mod h1:vyoYT04bHOlrjFfu1NmmtqKdH5uRBVKPKq7viyUL4sc= +github.com/ceph/go-ceph v0.23.0 h1:b/glx9y7vXQJd5m6VqfNv9krYHny7W/+Zc3fNyTbIIo= +github.com/ceph/go-ceph v0.23.0/go.mod h1:QDYBF+MBdj9B5nSAvevZOrh5WSOflN15t/tZ67b17Qw= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/pin.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/pin.go index 5c29d91aa29..104c3cce0ec 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/pin.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/pin.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package admin diff --git a/vendor/github.com/ceph/go-ceph/cephfs/admin/volume_info.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/volume_info.go index 039a8f781c2..b45e00a6d29 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/volume_info.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/volume_info.go @@ -1,5 +1,5 @@ -//go:build !(nautilus || octopus) && ceph_preview -// +build !nautilus,!octopus,ceph_preview +//go:build !(nautilus || octopus) +// +build !nautilus,!octopus package admin diff --git a/vendor/github.com/ceph/go-ceph/rbd/mirror_desc_status.go b/vendor/github.com/ceph/go-ceph/rbd/mirror_desc_status.go index 94b1b1d931e..58bd4b39003 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/mirror_desc_status.go +++ b/vendor/github.com/ceph/go-ceph/rbd/mirror_desc_status.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package rbd @@ -61,7 +61,8 @@ func (s *SiteMirrorImageStatus) UnmarshalDescriptionJSON(v interface{}) error { // the image status description field if available. If the embedded status JSON // is not found or fails to parse and error will be returned. func (s *SiteMirrorImageStatus) DescriptionReplayStatus() ( - *MirrorDescriptionReplayStatus, error) { + *MirrorDescriptionReplayStatus, error, +) { // --- mdrs := MirrorDescriptionReplayStatus{} if err := s.UnmarshalDescriptionJSON(&mdrs); err != nil { diff --git a/vendor/github.com/ceph/go-ceph/rbd/mirror_peer_site.go b/vendor/github.com/ceph/go-ceph/rbd/mirror_peer_site.go index 05b08111d5e..6fa44a5ec33 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/mirror_peer_site.go +++ b/vendor/github.com/ceph/go-ceph/rbd/mirror_peer_site.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package rbd @@ -26,8 +26,8 @@ import ( // const char *site_name, // const char *client_name); func AddMirrorPeerSite(ioctx *rados.IOContext, siteName string, clientName string, - direction MirrorPeerDirection) (string, error) { - + direction MirrorPeerDirection, +) (string, error) { var ( err error buf []byte @@ -78,7 +78,6 @@ func RemoveMirrorPeerSite(ioctx *rados.IOContext, uuid string) error { // size_t *max_key_len, char *values, size_t *max_val_len, // size_t *key_value_count); func GetAttributesMirrorPeerSite(ioctx *rados.IOContext, uuid string) (map[string]string, error) { - var ( err error keys []byte diff --git a/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go b/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go index dc28db293b4..f81e8d9a951 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go +++ b/vendor/github.com/ceph/go-ceph/rbd/snapshot_nautilus.go @@ -67,8 +67,12 @@ func (image *Image) GetParentInfo(pool, name, snapname []byte) error { // ImageSpec represents the image information. type ImageSpec struct { - ImageName string - PoolName string + ImageName string + ImageID string + PoolName string + PoolNamespace string + PoolID uint64 + Trash bool } // SnapSpec represents the snapshot infomation. @@ -104,8 +108,12 @@ func (image *Image) GetParent() (*ParentInfo, error) { defer C.rbd_snap_spec_cleanup(&parentSnap) imageSpec := ImageSpec{ - ImageName: C.GoString(parentImage.image_name), - PoolName: C.GoString(parentImage.pool_name), + ImageName: C.GoString(parentImage.image_name), + ImageID: C.GoString(parentImage.image_id), + PoolName: C.GoString(parentImage.pool_name), + PoolNamespace: C.GoString(parentImage.pool_namespace), + PoolID: uint64(parentImage.pool_id), + Trash: bool(parentImage.trash), } snapSpec := SnapSpec{ diff --git a/vendor/github.com/ceph/go-ceph/rbd/sparsify.go b/vendor/github.com/ceph/go-ceph/rbd/sparsify.go index 7ed6082b128..e46ca0d78a5 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/sparsify.go +++ b/vendor/github.com/ceph/go-ceph/rbd/sparsify.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package rbd @@ -56,7 +56,8 @@ type sparsifyCallbackCtx struct { // int rbd_sparsify_with_progress(rbd_image_t image, size_t sparse_size, // librbd_progress_fn_t cb, void *cbdata); func (image *Image) SparsifyWithProgress( - sparseSize uint, cb SparsifyCallback, data interface{}) error { + sparseSize uint, cb SparsifyCallback, data interface{}, +) error { // the provided callback must be a real function if cb == nil { return rbdError(C.EINVAL) @@ -80,8 +81,8 @@ func (image *Image) SparsifyWithProgress( //export sparsifyCallback func sparsifyCallback( - offset, total C.uint64_t, index uintptr) C.int { - + offset, total C.uint64_t, index uintptr, +) C.int { v := sparsifyCallbacks.Lookup(index) ctx := v.(sparsifyCallbackCtx) return C.int(ctx.callback(uint64(offset), uint64(total), ctx.data)) diff --git a/vendor/modules.txt b/vendor/modules.txt index 460008fc2c1..015f3865722 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -135,7 +135,7 @@ github.com/ceph/ceph-csi/api/deploy/kubernetes/cephfs github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd github.com/ceph/ceph-csi/api/deploy/ocp -# github.com/ceph/go-ceph v0.22.0 +# github.com/ceph/go-ceph v0.23.0 ## explicit; go 1.19 github.com/ceph/go-ceph/cephfs/admin github.com/ceph/go-ceph/common/admin/manager