From 6969b459f7ceb90a14d046013bc22eaac8a4c807 Mon Sep 17 00:00:00 2001 From: avanthakkar Date: Thu, 13 Apr 2023 02:03:52 +0530 Subject: [PATCH] core: disable exporter for Ceph v17.2.6 The expected ceph version for exporter is changed temporarily because some regression was detected in Ceph version 17.2.6. Thus, disabling ceph-exporter for now until all the regression are fixed. Signed-off-by: avanthakkar (cherry picked from commit 3e46522423466757ff885ffed83a6905682a7625) --- pkg/operator/ceph/cluster/nodedaemon/exporter.go | 4 +++- pkg/operator/ceph/cluster/nodedaemon/exporter_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/cluster/nodedaemon/exporter.go b/pkg/operator/ceph/cluster/nodedaemon/exporter.go index c039dc6d7..54818f531 100644 --- a/pkg/operator/ceph/cluster/nodedaemon/exporter.go +++ b/pkg/operator/ceph/cluster/nodedaemon/exporter.go @@ -51,7 +51,9 @@ const ( // createOrUpdateCephExporter is a wrapper around controllerutil.CreateOrUpdate func (r *ReconcileNode) createOrUpdateCephExporter(node corev1.Node, tolerations []corev1.Toleration, cephCluster cephv1.CephCluster, cephVersion *cephver.CephVersion) (controllerutil.OperationResult, error) { - if !cephVersion.IsAtLeast(cephver.CephVersion{Major: 17, Minor: 2, Extra: 5}) { + // CephVersion change is done temporarily, as some regression was detected in Ceph version 17.2.6 which is summarised here https://github.com/ceph/ceph/pull/50718#issuecomment-1505608312. + // Thus, disabling ceph-exporter for now until all the regression are fixed. + if !cephVersion.IsAtLeast(cephver.CephVersion{Major: 18, Minor: 0, Extra: 0}) { logger.Infof("Skipping exporter reconcile on ceph version %q", cephVersion.String()) return controllerutil.OperationResultNone, nil } diff --git a/pkg/operator/ceph/cluster/nodedaemon/exporter_test.go b/pkg/operator/ceph/cluster/nodedaemon/exporter_test.go index bfd977fff..173ff6738 100644 --- a/pkg/operator/ceph/cluster/nodedaemon/exporter_test.go +++ b/pkg/operator/ceph/cluster/nodedaemon/exporter_test.go @@ -44,7 +44,7 @@ func TestCreateOrUpdateCephExporter(t *testing.T) { } cephCluster.Spec.Labels = cephv1.LabelsSpec{} cephCluster.Spec.PriorityClassNames = cephv1.PriorityClassNamesSpec{} - cephVersion := &cephver.CephVersion{Major: 17, Minor: 2, Extra: 5} + cephVersion := &cephver.CephVersion{Major: 18, Minor: 0, Extra: 0} ctx := context.TODO() context := &clusterd.Context{ Clientset: test.New(t, 1),