Update use of Quantity in other classes

This commit is contained in:
Clayton Coleman
2016-05-17 00:36:56 -04:00
parent b2a01d4d94
commit 5e4308f91d
37 changed files with 204 additions and 242 deletions

View File

@@ -44,10 +44,7 @@ func newPVC(name string) api.PersistentVolumeClaim {
Spec: api.PersistentVolumeClaimSpec{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceStorage: resource.Quantity{
Amount: dec(1, 0),
Format: resource.BinarySI,
},
api.ResourceStorage: *resource.NewQuantity(1, resource.BinarySI),
},
},
},

View File

@@ -237,7 +237,7 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
}
statusList.Items = append(statusList.Items, extensions.CustomMetricCurrentStatus{
Name: customMetricTarget.Name,
CurrentValue: *quantity,
CurrentValue: quantity,
})
}
byteStatusList, err := json.Marshal(statusList)

View File

@@ -129,8 +129,7 @@ func (h *HeapsterMetricsClient) GetCpuConsumptionAndRequestInMillis(namespace st
podNames = append(podNames, pod.Name)
for _, container := range pod.Spec.Containers {
containerRequest := container.Resources.Requests[api.ResourceCPU]
if containerRequest.Amount != nil {
if containerRequest, ok := container.Resources.Requests[api.ResourceCPU]; ok {
requestSum += containerRequest.MilliValue()
} else {
missing = true