diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 65659bc16..43d5e1b30 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -7,6 +7,7 @@ ### Ceph +- The job for detecting the Ceph version can be started with node affinity or tolerations according to the same settings in the Cluster CR as the mons. - A new CR property `skipUpgradeChecks` has been added, which allows you force an upgrade by skipping daemon checks. Use this at **YOUR OWN RISK**, only if you know what you're doing. To understand Rook's upgrade process of Ceph, read the [upgrade doc](Documentation/ceph-upgrade.html#ceph-version-upgrades). - Ceph OSD's admin socket is now placed under Ceph's default system location `/run/ceph`. diff --git a/pkg/operator/ceph/cluster/cluster.go b/pkg/operator/ceph/cluster/cluster.go index 33583910f..3ec5bf25b 100755 --- a/pkg/operator/ceph/cluster/cluster.go +++ b/pkg/operator/ceph/cluster/cluster.go @@ -104,6 +104,9 @@ func (c *cluster) detectCephVersion(rookImage, cephImage string, timeout time.Du job := versionReporter.Job() job.Spec.Template.Spec.ServiceAccountName = "rook-ceph-cmd-reporter" + // Apply the same node selector and tolerations for the ceph version detection as the mon daemons + cephv1.GetMonPlacement(c.Spec.Placement).ApplyToPodSpec(&job.Spec.Template.Spec) + stdout, stderr, retcode, err := versionReporter.Run(timeout) if err != nil { return nil, fmt.Errorf("failed to complete ceph version job. %+v", err)