github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 14:11:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81627 from tallclair/copy

Browse Source 
Delete duplicate resource.Quantity.Copy()
This commit is contained in:
Kubernetes Prow Robot
2019-08-22 11:13:13 -07:00
committed by GitHub
parent ca3e86e662 49f50484b8
commit 6b47754740
20 changed files with 88 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/v1/resource/helpers.go
View File

@@ -31,7 +31,7 @@ import (
func addResourceList(list, newList v1.ResourceList) {
for name, quantity := range newList {
if value, ok := list[name]; !ok {
list[name] = *quantity.Copy()
list[name] = quantity.DeepCopy()
} else {
value.Add(quantity)
list[name] = value
@@ -44,11 +44,11 @@ func addResourceList(list, newList v1.ResourceList) {
func maxResourceList(list, new v1.ResourceList) {
for name, quantity := range new {
if value, ok := list[name]; !ok {
list[name] = *quantity.Copy()
list[name] = quantity.DeepCopy()
continue
} else {
if quantity.Cmp(value) > 0 {
list[name] = *quantity.Copy()
list[name] = quantity.DeepCopy()
}
}
}
@@ -243,7 +243,7 @@ func MergeContainerResourceLimits(container *v1.Container,
for _, resource := range []v1.ResourceName{v1.ResourceCPU, v1.ResourceMemory, v1.ResourceEphemeralStorage} {
if quantity, exists := container.Resources.Limits[resource]; !exists || quantity.IsZero() {
if cap, exists := allocatable[resource]; exists {
container.Resources.Limits[resource] = *cap.Copy()
container.Resources.Limits[resource] = cap.DeepCopy()
}
}
}