From ef8ef454c3975b1ec261605aa5dd0b8b9e1f8ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 21 Jan 2020 14:37:28 +0100 Subject: [PATCH] ceph: fix resources for prepare job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now, we purely rely on what the user puts in the CR and apply it. Prior to this commit we were putting 0 if not declared, this was not the intentional. Closes: https://github.com/rook/rook/issues/4713 Signed-off-by: Sébastien Han --- pkg/operator/ceph/cluster/osd/spec.go | 23 +--------------------- pkg/operator/ceph/cluster/osd/spec_test.go | 6 ++---- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/pkg/operator/ceph/cluster/osd/spec.go b/pkg/operator/ceph/cluster/osd/spec.go index efb84b16f..f4c029146 100644 --- a/pkg/operator/ceph/cluster/osd/spec.go +++ b/pkg/operator/ceph/cluster/osd/spec.go @@ -37,7 +37,6 @@ import ( apps "k8s.io/api/apps/v1" batch "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -879,7 +878,7 @@ func (c *Cluster) provisionOSDContainer(osdProps osdProperties, copyBinariesMoun RunAsNonRoot: &runAsNonRoot, ReadOnlyRootFilesystem: &readOnlyRootFilesystem, }, - Resources: c.osdPrepareResources(osdProps.pvc.ClaimName), + Resources: c.prepareResources, } return osdProvisionContainer @@ -1031,26 +1030,6 @@ func (c *Cluster) getOSDLabels(osdID int, failureDomainValue string, portable bo } } -func (c *Cluster) osdPrepareResources(osdClaimName string) v1.ResourceRequirements { - var cpuLimit, cpuRequest, memoryLimit, memoryRequest int64 - - cpuLimit = c.prepareResources.Limits.Cpu().Value() - cpuRequest = c.prepareResources.Requests.Cpu().Value() - memoryLimit = c.prepareResources.Limits.Memory().Value() - memoryRequest = c.prepareResources.Requests.Memory().Value() - - return v1.ResourceRequirements{ - Limits: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(cpuLimit, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(memoryLimit, resource.BinarySI), - }, - Requests: v1.ResourceList{ - v1.ResourceCPU: *resource.NewMilliQuantity(cpuRequest, resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(memoryRequest, resource.BinarySI), - }, - } -} - func cephVolumeEnvVar() []v1.EnvVar { return []v1.EnvVar{ {Name: "CEPH_VOLUME_DEBUG", Value: "1"}, diff --git a/pkg/operator/ceph/cluster/osd/spec_test.go b/pkg/operator/ceph/cluster/osd/spec_test.go index 4fbcab122..4f717f687 100644 --- a/pkg/operator/ceph/cluster/osd/spec_test.go +++ b/pkg/operator/ceph/cluster/osd/spec_test.go @@ -362,8 +362,6 @@ func TestOsdOnSDNFlag(t *testing.T) { } func TestOsdPrepareResources(t *testing.T) { - var osdClaimName string - clientset := fake.NewSimpleClientset() c := New(&cephconfig.ClusterInfo{}, &clusterd.Context{Clientset: clientset, ConfigDir: "/var/lib/rook", Executor: &exectest.MockExecutor{}}, "ns", "myversion", cephv1.CephVersionSpec{}, rookalpha.StorageScopeSpec{}, "", rookalpha.Placement{}, rookalpha.Annotations{}, cephv1.NetworkSpec{}, v1.ResourceRequirements{}, v1.ResourceRequirements{}, "my-priority-class", metav1.OwnerReference{}, false, false, false) @@ -379,8 +377,8 @@ func TestOsdPrepareResources(t *testing.T) { } c.prepareResources = rr - r := c.osdPrepareResources(osdClaimName) - assert.Equal(t, "2", r.Limits.Cpu().String(), rr.Limits.Cpu().String()) + r := c.prepareResources + assert.Equal(t, "2000", r.Limits.Cpu().String(), rr.Limits.Cpu().String()) assert.Equal(t, "0", r.Requests.Cpu().String()) assert.Equal(t, "0", r.Limits.Memory().String()) assert.Equal(t, "250", r.Requests.Memory().String())