diff --git a/pkg/operator/ceph/cluster/osd/key_rotation.go b/pkg/operator/ceph/cluster/osd/key_rotation.go index ae10ca7b6..6171972bd 100644 --- a/pkg/operator/ceph/cluster/osd/key_rotation.go +++ b/pkg/operator/ceph/cluster/osd/key_rotation.go @@ -265,7 +265,7 @@ func (c *Cluster) reconcileKeyRotationCronJob() error { return errors.Errorf("pvc name label %q for osd %q is empty", OSDOverPVCLabelKey, osdDep.Name) } - osdProps, err := c.getOSDPropsForPVC(pvcName, osd.DeviceClass) + osdProps, err := c.getOSDPropsForPVC(pvcName) if err != nil { return errors.Wrapf(err, "failed to generate config for osd %q", osdDep.Name) } diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index 4eeb1bb29..0189446c7 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -408,7 +408,7 @@ func deploymentOnNode(c *Cluster, osd *OSDInfo, nodeName string, config *provisi func deploymentOnPVC(c *Cluster, osd *OSDInfo, pvcName string, config *provisionConfig) (*appsv1.Deployment, error) { osdLongName := fmt.Sprintf("OSD %d on PVC %q", osd.ID, pvcName) - osdProps, err := c.getOSDPropsForPVC(pvcName, osd.DeviceClass) + osdProps, err := c.getOSDPropsForPVC(pvcName) if err != nil { return nil, errors.Wrapf(err, "failed to generate config for %s", osdLongName) } @@ -468,7 +468,7 @@ func (c *Cluster) getOSDPropsForNode(nodeName, deviceClass string) (osdPropertie return osdProps, nil } -func (c *Cluster) getOSDPropsForPVC(pvcName, osdDeviceClass string) (osdProperties, error) { +func (c *Cluster) getOSDPropsForPVC(pvcName string) (osdProperties, error) { for _, deviceSet := range c.deviceSets { // The data PVC template is required. dataSource, dataOK := deviceSet.PVCSources[bluestorePVCData] @@ -491,7 +491,7 @@ func (c *Cluster) getOSDPropsForPVC(pvcName, osdDeviceClass string) (osdProperti } if deviceSet.Resources.Limits == nil && deviceSet.Resources.Requests == nil { - deviceSet.Resources = cephv1.GetOSDResources(c.spec.Resources, osdDeviceClass) + deviceSet.Resources = cephv1.GetOSDResources(c.spec.Resources, deviceSet.CrushDeviceClass) } osdProps := osdProperties{