Skip to content

Commit b5925aa

Browse files
committed
[DNM] rebase: update go-ceph to include nfsa.ApplyExportInfo()
/!\ DO NOT MERGE This uses a personal branch for testing. Signed-off-by: Niels de Vos <ndevos@ibm.com>
1 parent 3d95b91 commit b5925aa

10 files changed

Lines changed: 73 additions & 18 deletions

File tree

go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ require (
4444
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
4545
)
4646

47+
// for nfsa.UpdateCephFSExport, github.com/nixpanic/go-ceph:nfs/export-update
48+
replace github.com/ceph/go-ceph => github.com/nixpanic/go-ceph v0.0.0-20260417074741-878fc984e61b
49+
4750
require (
4851
// sigs.k8s.io/controller-runtime wants this version, it gets replaced below
4952
k8s.io/client-go v12.0.0+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,6 @@ github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA
487487
github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
488488
github.com/ceph/ceph-nvmeof/lib/go/nvmeof v0.0.0-20260120065657-2425981cdad5 h1:giK4rX93KFW4C361EHurz46iM5nqFOKOT4EMuuroi+E=
489489
github.com/ceph/ceph-nvmeof/lib/go/nvmeof v0.0.0-20260120065657-2425981cdad5/go.mod h1:P+rCBJEUy2Yt6vOcTh7pyh9/g+o9pOZc7kyY6k/PS5U=
490-
github.com/ceph/go-ceph v0.38.0 h1:Ux0sIpl6VJNgY21hxuBZI9Z2Z8tQsBMJhjLjYBoa7s0=
491-
github.com/ceph/go-ceph v0.38.0/go.mod h1:GQVPe5YWoCMOrGnpDDieQoQZRLkB0tJmIokbqxbwPBQ=
492490
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
493491
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
494492
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -919,6 +917,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
919917
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
920918
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
921919
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
920+
github.com/nixpanic/go-ceph v0.0.0-20260417074741-878fc984e61b h1:4yk3TAir4QxFb/V4ctiGvs3yxf62qNBnOATMFyqd6xw=
921+
github.com/nixpanic/go-ceph v0.0.0-20260417074741-878fc984e61b/go.mod h1:UId58dqtDKTwnv3OY8rdpC+Ulz/AVpcvZqjXDICcd5c=
922922
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
923923
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
924924
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

vendor/github.com/ceph/go-ceph/cephfs/snap_diff.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ceph/go-ceph/common/admin/nfs/admin.go

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ceph/go-ceph/common/admin/nfs/export.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ceph/go-ceph/common/admin/nfs/export_apply.go

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ceph/go-ceph/common/admin/osd/errors.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ceph/go-ceph/common/admin/osd/osd_blocklist.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ceph/go-ceph/rbd/snapshot_remove_by_id.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ github.com/ceph/ceph-csi/api/deploy/ocp
208208
# github.com/ceph/ceph-nvmeof/lib/go/nvmeof v0.0.0-20260120065657-2425981cdad5
209209
## explicit; go 1.24.4
210210
github.com/ceph/ceph-nvmeof/lib/go/nvmeof
211-
# github.com/ceph/go-ceph v0.38.0
212-
## explicit; go 1.24.0
211+
# github.com/ceph/go-ceph v0.38.0 => github.com/nixpanic/go-ceph v0.0.0-20260417074741-878fc984e61b
212+
## explicit; go 1.25.0
213213
github.com/ceph/go-ceph/cephfs
214214
github.com/ceph/go-ceph/cephfs/admin
215215
github.com/ceph/go-ceph/common/admin/manager
@@ -1282,4 +1282,5 @@ sigs.k8s.io/structured-merge-diff/v6/value
12821282
## explicit; go 1.22
12831283
sigs.k8s.io/yaml
12841284
# github.com/ceph/ceph-csi/api => ./api
1285+
# github.com/ceph/go-ceph => github.com/nixpanic/go-ceph v0.0.0-20260417074741-878fc984e61b
12851286
# k8s.io/client-go => k8s.io/client-go v0.35.3

0 commit comments

Comments
 (0)