From 94f1c7b8a4fd5dcecdcce3dead26f2dce207ba3f Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 17 Oct 2022 12:50:20 -0400 Subject: [PATCH] nfs admin: make core nfs admin apis stable As per the api stability doc, the NFS admin apis are due to be stable in 0.18. Signed-off-by: John Mulligan --- common/admin/nfs/admin.go | 4 ++-- common/admin/nfs/export.go | 4 ++-- common/admin/nfs/export_test.go | 4 ++-- docs/api-status.json | 23 ++++++++++++----------- docs/api-status.md | 5 ----- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/common/admin/nfs/admin.go b/common/admin/nfs/admin.go index e109f88..43a7302 100644 --- a/common/admin/nfs/admin.go +++ b/common/admin/nfs/admin.go @@ -1,5 +1,5 @@ -//go:build !(nautilus || octopus) && ceph_preview -// +build !nautilus,!octopus,ceph_preview +//go:build !(nautilus || octopus) +// +build !nautilus,!octopus package nfs diff --git a/common/admin/nfs/export.go b/common/admin/nfs/export.go index fd379ed..6b981b7 100644 --- a/common/admin/nfs/export.go +++ b/common/admin/nfs/export.go @@ -1,5 +1,5 @@ -//go:build !(nautilus || octopus) && ceph_preview -// +build !nautilus,!octopus,ceph_preview +//go:build !(nautilus || octopus) +// +build !nautilus,!octopus package nfs diff --git a/common/admin/nfs/export_test.go b/common/admin/nfs/export_test.go index 3e3d453..2d9232d 100644 --- a/common/admin/nfs/export_test.go +++ b/common/admin/nfs/export_test.go @@ -1,5 +1,5 @@ -//go:build !(nautilus || octopus) && ceph_preview -// +build !nautilus,!octopus,ceph_preview +//go:build !(nautilus || octopus) +// +build !nautilus,!octopus package nfs diff --git a/docs/api-status.json b/docs/api-status.json index 7b2cc89..cc1e6fb 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -1921,36 +1921,37 @@ ] }, "common/admin/nfs": { - "preview_api": [ + "preview_api": [], + "stable_api": [ { "name": "NewFromConn", - "comment": "NewFromConn creates an new management object from a preexisting\nrados connection. The existing connection can be rados.Conn or any\ntype implementing the RadosCommander interface.\n PREVIEW\n", + "comment": "NewFromConn creates an new management object from a preexisting\nrados connection. The existing connection can be rados.Conn or any\ntype implementing the RadosCommander interface.\n", "added_in_version": "v0.16.0", - "expected_stable_version": "v0.18.0" + "became_stable_version": "v0.18.0" }, { "name": "Admin.CreateCephFSExport", - "comment": "CreateCephFSExport will create a new NFS export for a CephFS file system.\n PREVIEW\n\nSimilar To:\n ceph nfs export create cephfs\n", + "comment": "CreateCephFSExport will create a new NFS export for a CephFS file system.\n\nSimilar To:\n ceph nfs export create cephfs\n", "added_in_version": "v0.16.0", - "expected_stable_version": "v0.18.0" + "became_stable_version": "v0.18.0" }, { "name": "Admin.RemoveExport", - "comment": "RemoveExport will remove an NFS export based on the pseudo-path of the export.\n PREVIEW\n\nSimilar To:\n ceph nfs export rm\n", + "comment": "RemoveExport will remove an NFS export based on the pseudo-path of the export.\n\nSimilar To:\n ceph nfs export rm\n", "added_in_version": "v0.16.0", - "expected_stable_version": "v0.18.0" + "became_stable_version": "v0.18.0" }, { "name": "Admin.ListDetailedExports", - "comment": "ListDetailedExports will return a list of exports with details.\n PREVIEW\n\nSimilar To:\n ceph nfs export ls --detailed\n", + "comment": "ListDetailedExports will return a list of exports with details.\n\nSimilar To:\n ceph nfs export ls --detailed\n", "added_in_version": "v0.16.0", - "expected_stable_version": "v0.18.0" + "became_stable_version": "v0.18.0" }, { "name": "Admin.ExportInfo", - "comment": "ExportInfo will return a structure describing the export specified by it's\npseudo-path.\n PREVIEW\n\nSimilar To:\n ceph nfs export info\n", + "comment": "ExportInfo will return a structure describing the export specified by it's\npseudo-path.\n\nSimilar To:\n ceph nfs export info\n", "added_in_version": "v0.16.0", - "expected_stable_version": "v0.18.0" + "became_stable_version": "v0.18.0" } ] } diff --git a/docs/api-status.md b/docs/api-status.md index c1e12f7..d206c9f 100644 --- a/docs/api-status.md +++ b/docs/api-status.md @@ -74,9 +74,4 @@ No Preview/Deprecated APIs found. All APIs are considered stable. Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -NewFromConn | v0.16.0 | v0.18.0 | -Admin.CreateCephFSExport | v0.16.0 | v0.18.0 | -Admin.RemoveExport | v0.16.0 | v0.18.0 | -Admin.ListDetailedExports | v0.16.0 | v0.18.0 | -Admin.ExportInfo | v0.16.0 | v0.18.0 |