Merge pull request #4728 from leseb/fix-4713

ceph: fix resources for prepare job
This commit is contained in:
Sébastien Han authored and GitHub committed 2020-01-21 17:08:18 +01:00
commit b73f1fe073
2 files changed
+3 -26

No files matched your search

+1 -22
View File
@@ -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"},
+2 -4
View File
@@ -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())