From f1f4bcccf730a9cac71079be69bd16745597ffc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 2 Apr 2019 17:26:35 +0200 Subject: [PATCH] ceph: add support octopus version detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now we are able to detect a Ceph Octopus version. Signed-off-by: Sébastien Han --- pkg/operator/ceph/version/version.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/operator/ceph/version/version.go b/pkg/operator/ceph/version/version.go index 589a473e7..4ccb27338 100644 --- a/pkg/operator/ceph/version/version.go +++ b/pkg/operator/ceph/version/version.go @@ -17,9 +17,14 @@ const ( ) var ( + // Luminous Ceph version Luminous = CephVersion{12, 0, 0} - Mimic = CephVersion{13, 0, 0} + // Mimic Ceph version + Mimic = CephVersion{13, 0, 0} + // Nautilus Ceph version Nautilus = CephVersion{14, 0, 0} + // Octopus Ceph version + Octopus = CephVersion{15, 0, 0} // supportedVersions are production-ready versions that rook supports supportedVersions = []CephVersion{Luminous, Mimic} @@ -36,8 +41,11 @@ func (v *CephVersion) String() string { v.Major, v.Minor, v.Extra, v.ReleaseName()) } +// ReleaseName is the name of the Ceph release func (v *CephVersion) ReleaseName() string { switch v.Major { + case Octopus.Major: + return "octopus" case Nautilus.Major: return "nautilus" case Mimic.Major: @@ -109,6 +117,11 @@ func (v *CephVersion) IsAtLeast(other CephVersion) bool { return true } +// IsAtLeastOctopus check that the Ceph version is at least Octopus +func (v *CephVersion) IsAtLeastOctopus() bool { + return v.IsAtLeast(Octopus) +} + func (v *CephVersion) IsAtLeastNautilus() bool { return v.IsAtLeast(Nautilus) }