d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

remove cpu mem limits of container (#429)

Browse Source
This commit is contained in:
shidao-ytt
2018-12-22 05:38:41 +08:00
committed by Robbie Zhang
parent 0d14914e85
commit 966f7a807b
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
providers/alicloud/eci.go
View File

@@ -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}) c.EnvironmentVars = append(c.EnvironmentVars, eci.EnvironmentVar{Key: e.Name, Value: e.Value})
} }
// ECI CPU request must be times of 10m
cpuRequest := 1.00 cpuRequest := 1.00
if _, ok := container.Resources.Requests[v1.ResourceCPU]; ok { if _, ok := container.Resources.Requests[v1.ResourceCPU]; ok {
cpuRequest = float64(container.Resources.Requests.Cpu().MilliValue()) / 1000.00 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 memoryRequest := 2.0
if _, ok := container.Resources.Requests[v1.ResourceMemory]; ok { if _, ok := container.Resources.Requests[v1.ResourceMemory]; ok {
memoryRequest = float64(container.Resources.Requests.Memory().Value()) / 1000000000.0 memoryRequest = float64(container.Resources.Requests.Memory().Value()) / 1024.0 / 1024.0 / 1024.0
if memoryRequest < 2.0 {
memoryRequest = 2.0
}
} }
c.Memory = requests.Float(fmt.Sprintf("%.1f", memoryRequest)) c.Memory = requests.Float(fmt.Sprintf("%.3f", memoryRequest))
c.ImagePullPolicy = string(container.ImagePullPolicy) c.ImagePullPolicy = string(container.ImagePullPolicy)
c.WorkingDir = container.WorkingDir c.WorkingDir = container.WorkingDir