Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 2255328: Update minimum ceph version required for ceph-exporter daemon #551

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Bug 2255328: Update minimum ceph version required for ceph-exporter daemon #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkg/operator/ceph/cluster/nodedaemon/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ const (
)

var (
MinVersionForCephExporter = cephver.CephVersion{Major: 18, Minor: 0, Extra: 0}
MinVersionForCephExporter = cephver.CephVersion{Major: 17, Minor: 2, Extra: 6}
)

// 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) {
// 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(MinVersionForCephExporter) {
logger.Infof("Skipping exporter reconcile on ceph version %q", cephVersion.String())
return controllerutil.OperationResultNone, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/ceph/cluster/nodedaemon/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func TestCreateOrUpdateCephExporter(t *testing.T) {
}
cephCluster.Spec.Labels = cephv1.LabelsSpec{}
cephCluster.Spec.PriorityClassNames = cephv1.PriorityClassNamesSpec{}
cephVersion := &cephver.CephVersion{Major: 18, Minor: 0, Extra: 0}
cephVersion := &cephver.CephVersion{Major: 17, Minor: 2, Extra: 6}
ctx := context.TODO()
context := &clusterd.Context{
Clientset: test.New(t, 1),
Expand Down
2 changes: 0 additions & 2 deletions pkg/operator/ceph/cluster/nodedaemon/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,6 @@ func (r *ReconcileNode) createOrUpdateNodeDaemons(node corev1.Node, tolerations
return errors.Wrapf(err, "ceph exporter reconcile failed on op %q", op)
}
} else {
// 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(MinVersionForCephExporter) {
logger.Debugf("ceph exporter successfully reconciled for node %q. operation: %q", node.Name, op)
// create the metrics service
Expand Down
Loading