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

[Azure] Fix the Resource.Requests/Limits Parsing Issue (#183)

Browse Source 
* Fix the Resource.Requests/Limits Parsing Issue

* Do not run test in docker build
This commit is contained in:
Robbie Zhang
2018-04-30 17:21:15 -07:00
committed by GitHub
parent 2ffd18df9f
commit f6835d9e89
4 changed files with 227 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
providers/azure/aci.go
View File

@@ -758,16 +758,20 @@ func containerGroupToPod(cg *aci.ContainerGroup) (*v1.Pod, error) {
Image: c.Image,
Command: c.Command,
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse(fmt.Sprintf("%d", int64(c.Resources.Limits.CPU))),
v1.ResourceMemory: resource.MustParse(fmt.Sprintf("%gG", c.Resources.Limits.MemoryInGB)),
},
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse(fmt.Sprintf("%d", int64(c.Resources.Requests.CPU))),
v1.ResourceCPU: resource.MustParse(fmt.Sprintf("%g", c.Resources.Requests.CPU)),
v1.ResourceMemory: resource.MustParse(fmt.Sprintf("%gG", c.Resources.Requests.MemoryInGB)),
},
},
}
if c.Resources.Limits != nil {
container.Resources.Limits = v1.ResourceList{
v1.ResourceCPU: resource.MustParse(fmt.Sprintf("%g", c.Resources.Limits.CPU)),
v1.ResourceMemory: resource.MustParse(fmt.Sprintf("%gG", c.Resources.Limits.MemoryInGB)),
}
}
containers = append(containers, container)
containerStatus := v1.ContainerStatus{
Name: c.Name,