kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete duplicate resource.Quantity.Copy() 

Kubernetes-commit: 49f50484b898f55c1db1e25b2a9c2bb76fb45a5d
This commit is contained in:
Tim Allclair 2019-08-19 17:23:14 -07:00 committed by Kubernetes Publisher
parent 586c708feb
commit f6a4bcd4ac
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/describe/versioned/describe.go
View File

@ -3373,7 +3373,7 @@ func getPodsTotalRequestsAndLimits(podList *corev1.PodList) (reqs map[corev1.Res
podReqs, podLimits := resourcehelper.PodRequestsAndLimits(&pod) podReqs, podLimits := resourcehelper.PodRequestsAndLimits(&pod)
for podReqName, podReqValue := range podReqs { for podReqName, podReqValue := range podReqs {
if value, ok := reqs[podReqName]; !ok { if value, ok := reqs[podReqName]; !ok {
reqs[podReqName] = *podReqValue.Copy() reqs[podReqName] = podReqValue.DeepCopy()
} else { } else {
value.Add(podReqValue) value.Add(podReqValue)
reqs[podReqName] = value reqs[podReqName] = value
@ -3381,7 +3381,7 @@ func getPodsTotalRequestsAndLimits(podList *corev1.PodList) (reqs map[corev1.Res
} }
for podLimitName, podLimitValue := range podLimits { for podLimitName, podLimitValue := range podLimits {
if value, ok := limits[podLimitName]; !ok { if value, ok := limits[podLimitName]; !ok {
limits[podLimitName] = *podLimitValue.Copy() limits[podLimitName] = podLimitValue.DeepCopy()
} else { } else {
value.Add(podLimitValue) value.Add(podLimitValue)
limits[podLimitName] = value limits[podLimitName] = value

12
pkg/util/qos/qos.go
View File

@ -44,12 +44,12 @@ func GetPodQOS(pod *corev1.Pod) corev1.PodQOSClass {
continue continue
} }
if quantity.Cmp(zeroQuantity) == 1 { if quantity.Cmp(zeroQuantity) == 1 {
delta := quantity.Copy() delta := quantity.DeepCopy()
if _, exists := requests[name]; !exists { if _, exists := requests[name]; !exists {
requests[name] = *delta requests[name] = delta
} else { } else {
delta.Add(requests[name]) delta.Add(requests[name])
requests[name] = *delta requests[name] = delta
} }
} }
} }
@ -61,12 +61,12 @@ func GetPodQOS(pod *corev1.Pod) corev1.PodQOSClass {
} }
if quantity.Cmp(zeroQuantity) == 1 { if quantity.Cmp(zeroQuantity) == 1 {
qosLimitsFound.Insert(string(name)) qosLimitsFound.Insert(string(name))
delta := quantity.Copy() delta := quantity.DeepCopy()
if _, exists := limits[name]; !exists { if _, exists := limits[name]; !exists {
limits[name] = *delta limits[name] = delta
} else { } else {
delta.Add(limits[name]) delta.Add(limits[name])
limits[name] = *delta limits[name] = delta
} }
} }
} }

6
pkg/util/resource/resource.go
View File

@ -47,7 +47,7 @@ func PodRequestsAndLimits(pod *corev1.Pod) (reqs, limits corev1.ResourceList) {
func addResourceList(list, new corev1.ResourceList) { func addResourceList(list, new corev1.ResourceList) {
for name, quantity := range new { for name, quantity := range new {
if value, ok := list[name]; !ok { if value, ok := list[name]; !ok {
list[name] = *quantity.Copy() list[name] = quantity.DeepCopy()
} else { } else {
value.Add(quantity) value.Add(quantity)
list[name] = value list[name] = value
@ -60,11 +60,11 @@ func addResourceList(list, new corev1.ResourceList) {
func maxResourceList(list, new corev1.ResourceList) { func maxResourceList(list, new corev1.ResourceList) {
for name, quantity := range new { for name, quantity := range new {
if value, ok := list[name]; !ok { if value, ok := list[name]; !ok {
list[name] = *quantity.Copy() list[name] = quantity.DeepCopy()
continue continue
} else { } else {
if quantity.Cmp(value) > 0 { if quantity.Cmp(value) > 0 {
list[name] = *quantity.Copy() list[name] = quantity.DeepCopy()
} }
} }
} }