diff --git a/pkg/operator/ceph/file/controller.go b/pkg/operator/ceph/file/controller.go index 689b1fccf..d25cc6d19 100644 --- a/pkg/operator/ceph/file/controller.go +++ b/pkg/operator/ceph/file/controller.go @@ -195,7 +195,7 @@ func (r *ReconcileCephFilesystem) reconcile(request reconcile.Request) (reconcil daemon := string(opconfig.MonType) currentCephVersion, err := cephclient.LeastUptodateDaemonVersion(r.context, r.clusterInfo.Name, daemon) if err != nil { - logger.Errorf("failed to retrieve current ceph %q version. %v", daemon, err) + return reconcile.Result{}, errors.Wrapf(err, "failed to retrieve current ceph %q version", daemon) } r.clusterInfo.CephVersion = currentCephVersion diff --git a/pkg/operator/ceph/file/controller_test.go b/pkg/operator/ceph/file/controller_test.go index 180b186eb..1a27a78f5 100644 --- a/pkg/operator/ceph/file/controller_test.go +++ b/pkg/operator/ceph/file/controller_test.go @@ -133,6 +133,12 @@ const ( "id":1 }` mdsCephAuthGetOrCreateKey = `{"key":"AQCvzWBeIV9lFRAAninzm+8XFxbSfTiPwoX50g=="}` + dummyVersionsRaw = ` + { + "mon": { + "ceph version 14.2.8 (3a54b2b6d167d4a2a19e003a705696d4fe619afc) nautilus (stable)": 3 + } + }` ) var ( @@ -181,6 +187,9 @@ func TestCephObjectStoreController(t *testing.T) { if args[0] == "auth" && args[1] == "get-or-create-key" { return mdsCephAuthGetOrCreateKey, nil } + if args[0] == "versions" { + return dummyVersionsRaw, nil + } return "", nil }, } diff --git a/pkg/operator/ceph/object/controller.go b/pkg/operator/ceph/object/controller.go index f073c9e49..ec9c417bb 100644 --- a/pkg/operator/ceph/object/controller.go +++ b/pkg/operator/ceph/object/controller.go @@ -195,7 +195,7 @@ func (r *ReconcileCephObjectStore) reconcile(request reconcile.Request) (reconci daemon := string(opconfig.MonType) currentCephVersion, err := cephclient.LeastUptodateDaemonVersion(r.context, r.clusterInfo.Name, daemon) if err != nil { - logger.Errorf("failed to retrieve current ceph %q version. %v", daemon, err) + return reconcile.Result{}, errors.Wrapf(err, "failed to retrieve current ceph %q version", daemon) } r.clusterInfo.CephVersion = currentCephVersion diff --git a/pkg/operator/ceph/object/controller_test.go b/pkg/operator/ceph/object/controller_test.go index dce63a5a2..292892156 100644 --- a/pkg/operator/ceph/object/controller_test.go +++ b/pkg/operator/ceph/object/controller_test.go @@ -131,6 +131,12 @@ const ( "realm_id": "" }` rgwCephAuthGetOrCreateKey = `{"key":"AQCvzWBeIV9lFRAAninzm+8XFxbSfTiPwoX50g=="}` + dummyVersionsRaw = ` + { + "mon": { + "ceph version 14.2.8 (3a54b2b6d167d4a2a19e003a705696d4fe619afc) nautilus (stable)": 3 + } + }` ) var ( @@ -173,6 +179,9 @@ func TestCephObjectStoreController(t *testing.T) { if args[0] == "auth" && args[1] == "get-or-create-key" { return rgwCephAuthGetOrCreateKey, nil } + if args[0] == "versions" { + return dummyVersionsRaw, nil + } return "", nil }, MockExecuteCommandWithOutput: func(command string, args ...string) (string, error) {