diff --git a/pkg/operator/ceph/version/version.go b/pkg/operator/ceph/version/version.go index 794b31713..3e18ff80b 100644 --- a/pkg/operator/ceph/version/version.go +++ b/pkg/operator/ceph/version/version.go @@ -65,14 +65,14 @@ var ( ) func (v *CephVersion) String() string { - return fmt.Sprintf("%d.%d.%d %s", - v.Major, v.Minor, v.Extra, v.ReleaseName()) + return fmt.Sprintf("%d.%d.%d-%d %s", + v.Major, v.Minor, v.Extra, v.Build, v.ReleaseName()) } // CephVersionFormatted returns the Ceph version in a human readable format func (v *CephVersion) CephVersionFormatted() string { - return fmt.Sprintf("ceph version %d.%d.%d %s", - v.Major, v.Minor, v.Extra, v.ReleaseName()) + return fmt.Sprintf("ceph version %d.%d.%d-%d %s", + v.Major, v.Minor, v.Extra, v.Build, v.ReleaseName()) } // ReleaseName is the name of the Ceph release diff --git a/pkg/operator/ceph/version/version_test.go b/pkg/operator/ceph/version/version_test.go index 207d5afcd..b3d18b6fd 100644 --- a/pkg/operator/ceph/version/version_test.go +++ b/pkg/operator/ceph/version/version_test.go @@ -24,16 +24,16 @@ import ( ) func TestToString(t *testing.T) { - assert.Equal(t, "14.0.0 nautilus", fmt.Sprintf("%s", &Nautilus)) - assert.Equal(t, "13.0.0 mimic", fmt.Sprintf("%s", &Mimic)) + assert.Equal(t, "14.0.0-0 nautilus", fmt.Sprintf("%s", &Nautilus)) + assert.Equal(t, "13.0.0-0 mimic", fmt.Sprintf("%s", &Mimic)) - expected := fmt.Sprintf("-1.0.0 %s", unknownVersionString) + expected := fmt.Sprintf("-1.0.0-0 %s", unknownVersionString) assert.Equal(t, expected, fmt.Sprintf("%s", &CephVersion{-1, 0, 0, 0})) } func TestCephVersionFormatted(t *testing.T) { - assert.Equal(t, "ceph version 14.0.0 nautilus", Nautilus.CephVersionFormatted()) - assert.Equal(t, "ceph version 13.0.0 mimic", Mimic.CephVersionFormatted()) + assert.Equal(t, "ceph version 14.0.0-0 nautilus", Nautilus.CephVersionFormatted()) + assert.Equal(t, "ceph version 13.0.0-0 mimic", Mimic.CephVersionFormatted()) } func TestReleaseName(t *testing.T) {