From 26f59c03820c9a7a0676623d57e709fbdfc9d3b8 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 18 Aug 2020 21:55:17 -0600 Subject: [PATCH 1/2] ceph: remove redundant check for encrypted osds This is simply a code simplification to remove an extra check for whether the OSDs are encrypted. There is no change in functionality. Signed-off-by: Travis Nielsen --- pkg/operator/ceph/cluster/osd/osd.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index a327d369b..af7e8dba3 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -252,18 +252,15 @@ func (c *Cluster) startProvisioningOverPVCs(config *provisionConfig) { logger.Debugf("osdProps are %+v", osdProps) - // If the deviceSet template has "encrypted" but the Ceph version is not compatible if osdProps.encrypted { + // If the deviceSet template has "encrypted" but the Ceph version is not compatible if !c.isCephVolumeRawModeSupported() { errMsg := fmt.Sprintf("failed to validate storageClassDeviceSet %q. min required ceph version to support encryption is %q or %q", volume.Name, cephVolumeRawEncryptionModeMinNautilusCephVersion.String(), cephVolumeRawEncryptionModeMinOctopusCephVersion.String()) config.addError(errMsg) continue } - } - // create encryption Kubernetes Secret if the PVC is encrypted - if osdProps.encrypted { - // Generate dmcrypt key + // create encryption Kubernetes Secret if the PVC is encrypted key, err := generateDmCryptKey() if err != nil { errMsg := fmt.Sprintf("failed to generate dmcrypt key for osd claim %q. %v", osdProps.pvc.ClaimName, err) From 18d39d909e6bf3faa81d8437f8dd86572a5038f7 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 18 Aug 2020 22:46:49 -0600 Subject: [PATCH 2/2] ceph: set the osd prepare resources The osd prepare resources were only being set on the main container while the init containers either did not have resources set, or were inheriting the resource settings from the device set resources for osds. Now the osd prepare resources will be consistently set based on the prepareosd resources in the main section of the cluster CR. Signed-off-by: Travis Nielsen --- .../examples/kubernetes/ceph/cluster-on-pvc.yaml | 9 +++++++++ pkg/operator/ceph/cluster/osd/provision_spec.go | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml b/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml index fcabe9339..0ef66056b 100644 --- a/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml @@ -96,6 +96,7 @@ spec: - rook-ceph-osd - rook-ceph-osd-prepare resources: + # These are the OSD daemon limits. For OSD prepare limits, see the separate section below for "prepareosd" resources # limits: # cpu: "500m" # memory: "4Gi" @@ -145,6 +146,14 @@ spec: # - ReadWriteOnce # Scheduler name for OSD pod placement # schedulerName: osd-scheduler + resources: + # prepareosd: + # limits: + # cpu: "200m" + # memory: "200Mi" + # requests: + # cpu: "200m" + # memory: "200Mi" disruptionManagement: managePodBudgets: false osdMaintenanceTimeout: 30 diff --git a/pkg/operator/ceph/cluster/osd/provision_spec.go b/pkg/operator/ceph/cluster/osd/provision_spec.go index 01d0138dd..8ed25f151 100644 --- a/pkg/operator/ceph/cluster/osd/provision_spec.go +++ b/pkg/operator/ceph/cluster/osd/provision_spec.go @@ -72,9 +72,22 @@ func (c *Cluster) makeJob(osdProps osdProperties, provisionConfig *provisionConf k8sutil.AddRookVersionLabelToJob(job) controller.AddCephVersionLabelToJob(c.clusterInfo.CephVersion, job) k8sutil.SetOwnerRef(&job.ObjectMeta, &c.clusterInfo.OwnerRef) + + // override the resources of all the init containers and main container with the expected osd prepare resources + c.applyResourcesToAllContainers(&podSpec.Spec, cephv1.GetPrepareOSDResources(c.spec.Resources)) return job, nil } +// applyResourcesToAllContainers applies consistent resource requests for all containers and all init containers in the pod +func (c *Cluster) applyResourcesToAllContainers(spec *v1.PodSpec, resources v1.ResourceRequirements) { + for i := range spec.InitContainers { + spec.InitContainers[i].Resources = resources + } + for i := range spec.Containers { + spec.Containers[i].Resources = resources + } +} + func (c *Cluster) provisionPodTemplateSpec(osdProps osdProperties, restart v1.RestartPolicy, provisionConfig *provisionConfig) (*v1.PodTemplateSpec, error) { copyBinariesVolume, copyBinariesContainer := c.getCopyBinariesContainer()