From 70ffd5f7095b042d85404a56e48419585d91087a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:00:52 +0000 Subject: [PATCH] rebase: Bump the github-dependencies group with 1 update Bumps the github-dependencies group with 1 update: [github.com/ceph/go-ceph](https://github.com/ceph/go-ceph). - [Release notes](https://github.com/ceph/go-ceph/releases) - [Changelog](https://github.com/ceph/go-ceph/blob/master/docs/release-process.md) - [Commits](https://github.com/ceph/go-ceph/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: github.com/ceph/go-ceph dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- .../ceph/go-ceph/cephfs/admin/fsadmin.go | 23 ------------------- vendor/github.com/ceph/go-ceph/rbd/locks.go | 4 ++-- vendor/github.com/ceph/go-ceph/rbd/mirror.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 7 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 83ec3576ce2..ba3549cee11 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 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.23.0 + github.com/ceph/go-ceph v0.24.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 bdf556deba5..0982fc9f2f3 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.23.0 h1:b/glx9y7vXQJd5m6VqfNv9krYHny7W/+Zc3fNyTbIIo= -github.com/ceph/go-ceph v0.23.0/go.mod h1:QDYBF+MBdj9B5nSAvevZOrh5WSOflN15t/tZ67b17Qw= +github.com/ceph/go-ceph v0.24.0 h1:ab1pQCTiNrwjJJJ3bebwQM9tjDQ4tXGKfXAZBNdFiYI= +github.com/ceph/go-ceph v0.24.0/go.mod h1:gdL5+ewDeHcbV4ZsfD3EH3na35trT07YaTVD1hhJWEg= 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/fsadmin.go b/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go index 8ff2327edbd..80b7a4c89a8 100644 --- a/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go +++ b/vendor/github.com/ceph/go-ceph/cephfs/admin/fsadmin.go @@ -17,29 +17,6 @@ type FSAdmin struct { conn RadosCommander } -// New creates an FSAdmin automatically based on the default ceph -// configuration file. If more customization is needed, create a -// *rados.Conn as you see fit and use NewFromConn to use that -// connection with these administrative functions. -// -// Deprecated: Use NewFromConn instead of New. The New function does not expose -// the rados connection and therefore can not be deterministically cleaned up. -func New() (*FSAdmin, error) { - conn, err := rados.NewConn() - if err != nil { - return nil, err - } - err = conn.ReadDefaultConfigFile() - if err != nil { - return nil, err - } - err = conn.Connect() - if err != nil { - return nil, err - } - return NewFromConn(conn), nil -} - // NewFromConn creates an FSAdmin management object from a preexisting // rados connection. The existing connection can be rados.Conn or any // type implementing the RadosCommander interface. This may be useful diff --git a/vendor/github.com/ceph/go-ceph/rbd/locks.go b/vendor/github.com/ceph/go-ceph/rbd/locks.go index b4c9c097b6e..e5537c15789 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/locks.go +++ b/vendor/github.com/ceph/go-ceph/rbd/locks.go @@ -1,5 +1,5 @@ -//go:build !nautilus && ceph_preview -// +build !nautilus,ceph_preview +//go:build !nautilus +// +build !nautilus package rbd diff --git a/vendor/github.com/ceph/go-ceph/rbd/mirror.go b/vendor/github.com/ceph/go-ceph/rbd/mirror.go index cb4f438a512..bd85536b0ea 100644 --- a/vendor/github.com/ceph/go-ceph/rbd/mirror.go +++ b/vendor/github.com/ceph/go-ceph/rbd/mirror.go @@ -717,7 +717,7 @@ func mirrorImageGlobalStatusList( } for i := 0; i < int(length); i++ { results[i].ID = C.GoString(ids[i]) - results[i].Status = newGlobalMirrorImageStatus(&images[0]) + results[i].Status = newGlobalMirrorImageStatus(&images[i]) } C.rbd_mirror_image_global_status_list_cleanup( &ids[0], diff --git a/vendor/modules.txt b/vendor/modules.txt index 29e16cce01b..a7910f13bce 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.23.0 +# github.com/ceph/go-ceph v0.24.0 ## explicit; go 1.19 github.com/ceph/go-ceph/cephfs/admin github.com/ceph/go-ceph/common/admin/manager