cephfs/admin: promote preview API for release v0.23.0

Signed-off-by: Sven Anderson <sven@redhat.com>
ceph · Aug 14, 2023 · f5c0b08 · f5c0b08
1 parent 5875e7f
commit f5c0b08
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 31 deletions.
diff --git a/cephfs/admin/pin.go b/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/cephfs/admin/pin_test.go b/cephfs/admin/pin_test.go
@@ -1,5 +1,5 @@
-//go:build !nautilus && ceph_preview
-// +build !nautilus,ceph_preview
+//go:build !nautilus
+// +build !nautilus
 
 package admin
 

diff --git a/cephfs/admin/volume_info.go b/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/cephfs/admin/volume_info_test.go b/cephfs/admin/volume_info_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 admin
 

diff --git a/docs/api-status.json b/docs/api-status.json
@@ -594,36 +594,35 @@
         "comment": "ListSnapshotMetadata lists custom metadata (key-value pairs) set on the subvolume\nsnapshot in a volume belonging to an optional subvolume group.\n\nSimilar To:\n\n\tceph fs subvolume snapshot metadata ls <vol_name> <sub_name> <snap_name> [--group_name <subvol_group_name>]\n",
         "added_in_version": "v0.20.0",
         "became_stable_version": "v0.22.0"
-      }
-    ],
-    "deprecated_api": [
-      {
-        "name": "New",
-        "comment": "New creates an FSAdmin automatically based on the default ceph\nconfiguration file. If more customization is needed, create a\n*rados.Conn as you see fit and use NewFromConn to use that\nconnection with these administrative functions.\n\nDeprecated: Use NewFromConn instead of New. The New function does not expose\nthe rados connection and therefore can not be deterministically cleaned up.\n",
-        "deprecated_in_version": "v0.21.0",
-        "expected_remove_version": "v0.24.0"
-      }
-    ],
-    "preview_api": [
+      },
       {
         "name": "FSAdmin.PinSubVolume",
         "comment": "PinSubVolume pins subvolume to ranks according to policies. A valid pin\nsetting value depends on the type of pin as described in the docs from\nhttps://docs.ceph.com/en/latest/cephfs/multimds/#cephfs-pinning and\nhttps://docs.ceph.com/en/latest/cephfs/multimds/#setting-subtree-partitioning-policies\n\nSimilar To:\n\n\tceph fs subvolume pin <vol_name> <sub_name> <pin_type> <pin_setting>\n",
         "added_in_version": "v0.21.0",
-        "expected_stable_version": "v0.23.0"
+        "became_stable_version": "v0.23.0"
       },
       {
         "name": "FSAdmin.PinSubVolumeGroup",
         "comment": "PinSubVolumeGroup pins subvolume to ranks according to policies. A valid pin\nsetting value depends on the type of pin as described in the docs from\nhttps://docs.ceph.com/en/latest/cephfs/multimds/#cephfs-pinning and\nhttps://docs.ceph.com/en/latest/cephfs/multimds/#setting-subtree-partitioning-policies\n\nSimilar To:\n\n\tceph fs subvolumegroup pin <vol_name> <group_name> <pin_type> <pin_setting>\n",
         "added_in_version": "v0.21.0",
-        "expected_stable_version": "v0.23.0"
+        "became_stable_version": "v0.23.0"
       },
       {
         "name": "FSAdmin.FetchVolumeInfo",
         "comment": "FetchVolumeInfo fetches the information of a CephFS volume.\n\nSimilar To:\n\n\tceph fs volume info <vol_name>\n",
         "added_in_version": "v0.21.0",
-        "expected_stable_version": "v0.23.0"
+        "became_stable_version": "v0.23.0"
       }
-    ]
+    ],
+    "deprecated_api": [
+      {
+        "name": "New",
+        "comment": "New creates an FSAdmin automatically based on the default ceph\nconfiguration file. If more customization is needed, create a\n*rados.Conn as you see fit and use NewFromConn to use that\nconnection with these administrative functions.\n\nDeprecated: Use NewFromConn instead of New. The New function does not expose\nthe rados connection and therefore can not be deterministically cleaned up.\n",
+        "deprecated_in_version": "v0.21.0",
+        "expected_remove_version": "v0.24.0"
+      }
+    ],
+    "preview_api": []
   },
   "rados": {
     "stable_api": [

diff --git a/docs/api-status.md b/docs/api-status.md
@@ -15,14 +15,6 @@ MountInfo.Futimes | v0.22.0 | v0.24.0 |
 
 ## Package: cephfs/admin
 
-### Preview APIs
-
-Name | Added in Version | Expected Stable Version | 
----- | ---------------- | ----------------------- | 
-FSAdmin.PinSubVolume | v0.21.0 | v0.23.0 | 
-FSAdmin.PinSubVolumeGroup | v0.21.0 | v0.23.0 | 
-FSAdmin.FetchVolumeInfo | v0.21.0 | v0.23.0 | 
-
 ### Deprecated APIs
 
 Name | Deprecated in Version | Expected Removal Version |