From 966f7a807b375a9865d182101645e19fa45e1e99 Mon Sep 17 00:00:00 2001 From: shidao-ytt <43381136+shidao-ytt@users.noreply.github.com> Date: Sat, 22 Dec 2018 05:38:41 +0800 Subject: [PATCH] remove cpu mem limits of container (#429) --- providers/alicloud/eci.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/providers/alicloud/eci.go b/providers/alicloud/eci.go index ef396171c..12ed7eb56 100644 --- a/providers/alicloud/eci.go +++ b/providers/alicloud/eci.go @@ -590,27 +590,19 @@ func (p *ECIProvider) getContainers(pod *v1.Pod, init bool) ([]eci.CreateContain c.EnvironmentVars = append(c.EnvironmentVars, eci.EnvironmentVar{Key: e.Name, Value: e.Value}) } - // ECI CPU request must be times of 10m cpuRequest := 1.00 if _, ok := container.Resources.Requests[v1.ResourceCPU]; ok { cpuRequest = float64(container.Resources.Requests.Cpu().MilliValue()) / 1000.00 - if cpuRequest < 0.01 { - cpuRequest = 0.01 - } } - c.Cpu = requests.Float(fmt.Sprintf("%.2f", cpuRequest)) + c.Cpu = requests.Float(fmt.Sprintf("%.3f", cpuRequest)) - // ECI memory request must be times of 0.1 GB memoryRequest := 2.0 if _, ok := container.Resources.Requests[v1.ResourceMemory]; ok { - memoryRequest = float64(container.Resources.Requests.Memory().Value()) / 1000000000.0 - if memoryRequest < 2.0 { - memoryRequest = 2.0 - } + memoryRequest = float64(container.Resources.Requests.Memory().Value()) / 1024.0 / 1024.0 / 1024.0 } - c.Memory = requests.Float(fmt.Sprintf("%.1f", memoryRequest)) + c.Memory = requests.Float(fmt.Sprintf("%.3f", memoryRequest)) c.ImagePullPolicy = string(container.ImagePullPolicy) c.WorkingDir = container.WorkingDir