mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 18:53:35 +00:00
Fresh dep ensure
This commit is contained in:
Mike Cronce
6
vendor/k8s.io/kubernetes/pkg/api/resource/BUILD
generated
vendored
6
vendor/k8s.io/kubernetes/pkg/api/resource/BUILD
generated
vendored
@ -12,7 +12,7 @@ go_library(
|
||||
importpath = "k8s.io/kubernetes/pkg/api/resource",
|
||||
deps = [
|
||||
"//pkg/apis/core:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
@ -35,6 +35,8 @@ go_test(
|
||||
embed = [":go_default_library"],
|
||||
deps = [
|
||||
"//pkg/apis/core:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
71
vendor/k8s.io/kubernetes/pkg/api/resource/helpers.go
generated
vendored
71
vendor/k8s.io/kubernetes/pkg/api/resource/helpers.go
generated
vendored
@ -25,50 +25,45 @@ import (
|
||||
api "k8s.io/kubernetes/pkg/apis/core"
|
||||
)
|
||||
|
||||
// PodRequestsAndLimits returns a dictionary of all defined resources summed up for all
|
||||
// containers of the pod.
|
||||
func PodRequestsAndLimits(pod *api.Pod) (reqs map[api.ResourceName]resource.Quantity, limits map[api.ResourceName]resource.Quantity) {
|
||||
reqs, limits = map[api.ResourceName]resource.Quantity{}, map[api.ResourceName]resource.Quantity{}
|
||||
for _, container := range pod.Spec.Containers {
|
||||
for name, quantity := range container.Resources.Requests {
|
||||
if value, ok := reqs[name]; !ok {
|
||||
reqs[name] = *quantity.Copy()
|
||||
} else {
|
||||
value.Add(quantity)
|
||||
reqs[name] = value
|
||||
}
|
||||
// addResourceList adds the resources in newList to list
|
||||
func addResourceList(list, new api.ResourceList) {
|
||||
for name, quantity := range new {
|
||||
if value, ok := list[name]; !ok {
|
||||
list[name] = *quantity.Copy()
|
||||
} else {
|
||||
value.Add(quantity)
|
||||
list[name] = value
|
||||
}
|
||||
for name, quantity := range container.Resources.Limits {
|
||||
if value, ok := limits[name]; !ok {
|
||||
limits[name] = *quantity.Copy()
|
||||
} else {
|
||||
value.Add(quantity)
|
||||
limits[name] = value
|
||||
}
|
||||
}
|
||||
|
||||
// maxResourceList sets list to the greater of list/newList for every resource
|
||||
// either list
|
||||
func maxResourceList(list, new api.ResourceList) {
|
||||
for name, quantity := range new {
|
||||
if value, ok := list[name]; !ok {
|
||||
list[name] = *quantity.Copy()
|
||||
continue
|
||||
} else {
|
||||
if quantity.Cmp(value) > 0 {
|
||||
list[name] = *quantity.Copy()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// PodRequestsAndLimits returns a dictionary of all defined resources summed up for all
|
||||
// containers of the pod.
|
||||
func PodRequestsAndLimits(pod *api.Pod) (reqs api.ResourceList, limits api.ResourceList) {
|
||||
reqs, limits = api.ResourceList{}, api.ResourceList{}
|
||||
for _, container := range pod.Spec.Containers {
|
||||
addResourceList(reqs, container.Resources.Requests)
|
||||
addResourceList(limits, container.Resources.Limits)
|
||||
}
|
||||
// init containers define the minimum of any resource
|
||||
for _, container := range pod.Spec.InitContainers {
|
||||
for name, quantity := range container.Resources.Requests {
|
||||
value, ok := reqs[name]
|
||||
if !ok {
|
||||
reqs[name] = *quantity.Copy()
|
||||
continue
|
||||
}
|
||||
if quantity.Cmp(value) > 0 {
|
||||
reqs[name] = *quantity.Copy()
|
||||
}
|
||||
}
|
||||
for name, quantity := range container.Resources.Limits {
|
||||
value, ok := limits[name]
|
||||
if !ok {
|
||||
limits[name] = *quantity.Copy()
|
||||
continue
|
||||
}
|
||||
if quantity.Cmp(value) > 0 {
|
||||
limits[name] = *quantity.Copy()
|
||||
}
|
||||
}
|
||||
maxResourceList(reqs, container.Resources.Requests)
|
||||
maxResourceList(limits, container.Resources.Limits)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
184
vendor/k8s.io/kubernetes/pkg/api/resource/helpers_test.go
generated
vendored
184
vendor/k8s.io/kubernetes/pkg/api/resource/helpers_test.go
generated
vendored
@ -17,9 +17,12 @@ limitations under the License.
|
||||
package resource
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/uuid"
|
||||
api "k8s.io/kubernetes/pkg/apis/core"
|
||||
)
|
||||
|
||||
@ -60,3 +63,184 @@ func TestDefaultResourceHelpers(t *testing.T) {
|
||||
t.Errorf("expected %v, actual %v", resource.BinarySI, resourceList.Memory().Format)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPodRequestsAndLimits(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
pod *api.Pod
|
||||
expectreqs map[api.ResourceName]resource.Quantity
|
||||
expectlimits map[api.ResourceName]resource.Quantity
|
||||
}{
|
||||
{
|
||||
name: "InitContainers resource < Containers resource",
|
||||
pod: &api.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
UID: uuid.NewUUID(),
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
InitContainers: []api.Container{
|
||||
makeContainer("100m", "200m", "100Mi", "200Mi"),
|
||||
},
|
||||
Containers: []api.Container{
|
||||
makeContainer("100m", "400m", "100Mi", "400Mi"),
|
||||
makeContainer("100m", "200m", "100Mi", "200Mi"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectreqs: map[api.ResourceName]resource.Quantity{
|
||||
api.ResourceCPU: resource.MustParse("200m"),
|
||||
api.ResourceMemory: resource.MustParse("200Mi"),
|
||||
},
|
||||
expectlimits: map[api.ResourceName]resource.Quantity{
|
||||
api.ResourceCPU: resource.MustParse("600m"),
|
||||
api.ResourceMemory: resource.MustParse("600Mi"),
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "InitContainers resource > Containers resource",
|
||||
pod: &api.Pod{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
UID: uuid.NewUUID(),
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
InitContainers: []api.Container{
|
||||
makeContainer("500m", "500m", "500Mi", "500Mi"),
|
||||
makeContainer("100m", "200m", "100Mi", "200Mi"),
|
||||
},
|
||||
Containers: []api.Container{
|
||||
makeContainer("100m", "200m", "100Mi", "200Mi"),
|
||||
makeContainer("100m", "200m", "100Mi", "200Mi"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectreqs: map[api.ResourceName]resource.Quantity{
|
||||
api.ResourceCPU: resource.MustParse("500m"),
|
||||
api.ResourceMemory: resource.MustParse("500Mi"),
|
||||
},
|
||||
expectlimits: map[api.ResourceName]resource.Quantity{
|
||||
api.ResourceCPU: resource.MustParse("500m"),
|
||||
api.ResourceMemory: resource.MustParse("500Mi"),
|
||||
},
|
||||
},
|
||||
}
|
||||
for i, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
requests, limits := PodRequestsAndLimits(test.pod)
|
||||
for name, quantity := range test.expectreqs {
|
||||
if value, ok := requests[name]; !ok {
|
||||
t.Errorf("case[%d]: Error to get value of key=%s from requests result", i, name)
|
||||
} else if quantity.Cmp(value) != 0 {
|
||||
t.Errorf("case[%d]: Expected value of key=%s from requests result:%v, Got:%v", i, name, quantity, value)
|
||||
}
|
||||
}
|
||||
for name, quantity := range test.expectlimits {
|
||||
if value, ok := limits[name]; !ok {
|
||||
t.Errorf("case[%d]: Error to get value of key=%s from limits result", i, name)
|
||||
} else if quantity.Cmp(value) != 0 {
|
||||
t.Errorf("case[%d]: Expected value of key=%s from limits result:%v, Got:%v", i, name, quantity, value)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestExtractContainerResourceValue(t *testing.T) {
|
||||
testcontainer := &api.Container{
|
||||
Name: string(uuid.NewUUID()),
|
||||
Resources: api.ResourceRequirements{
|
||||
Limits: api.ResourceList{
|
||||
api.ResourceCPU: resource.MustParse("200m"),
|
||||
api.ResourceMemory: resource.MustParse("200Mi"),
|
||||
api.ResourceStorage: resource.MustParse("2G"),
|
||||
api.ResourceEphemeralStorage: resource.MustParse("2G"),
|
||||
},
|
||||
Requests: api.ResourceList{
|
||||
api.ResourceCPU: resource.MustParse("100m"),
|
||||
api.ResourceMemory: resource.MustParse("100Mi"),
|
||||
api.ResourceStorage: resource.MustParse("1G"),
|
||||
api.ResourceEphemeralStorage: resource.MustParse("300Mi"),
|
||||
},
|
||||
},
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
filed *api.ResourceFieldSelector
|
||||
expectresult string
|
||||
expecterr string
|
||||
}{
|
||||
{
|
||||
name: "get limits cpu",
|
||||
filed: &api.ResourceFieldSelector{Resource: "limits.cpu", Divisor: resource.MustParse("1m")},
|
||||
expectresult: "200",
|
||||
expecterr: "",
|
||||
},
|
||||
{
|
||||
name: "get limits memory",
|
||||
filed: &api.ResourceFieldSelector{Resource: "limits.memory"},
|
||||
expectresult: "209715200",
|
||||
expecterr: "",
|
||||
},
|
||||
{
|
||||
name: "get limits ephemeral-storage",
|
||||
filed: &api.ResourceFieldSelector{Resource: "limits.ephemeral-storage", Divisor: resource.MustParse("1G")},
|
||||
expectresult: "2",
|
||||
expecterr: "",
|
||||
},
|
||||
{
|
||||
name: "get requests cpu",
|
||||
filed: &api.ResourceFieldSelector{Resource: "requests.cpu", Divisor: resource.MustParse("1m")},
|
||||
expectresult: "100",
|
||||
expecterr: "",
|
||||
},
|
||||
{
|
||||
name: "get requests memory",
|
||||
filed: &api.ResourceFieldSelector{Resource: "requests.memory", Divisor: resource.MustParse("1G")},
|
||||
expectresult: "1",
|
||||
expecterr: "",
|
||||
},
|
||||
{
|
||||
name: "get requests ephemeral-storage",
|
||||
filed: &api.ResourceFieldSelector{Resource: "requests.ephemeral-storage"},
|
||||
expectresult: "314572800",
|
||||
expecterr: "",
|
||||
},
|
||||
{
|
||||
name: "get limits storage",
|
||||
filed: &api.ResourceFieldSelector{Resource: "limits.storage", Divisor: resource.MustParse("1G")},
|
||||
expectresult: "",
|
||||
expecterr: "unsupported container resource",
|
||||
},
|
||||
}
|
||||
|
||||
for i, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
result, err := ExtractContainerResourceValue(test.filed, testcontainer)
|
||||
if test.expecterr != "" {
|
||||
if !strings.Contains(err.Error(), test.expecterr) {
|
||||
t.Errorf("case[%d]:%s Expected err:%s, Got err:%s", i, test.name, test.expecterr, err.Error())
|
||||
}
|
||||
} else if err != nil {
|
||||
t.Errorf("case[%d]:%s Expected no err, Got err:%s", i, test.name, err.Error())
|
||||
}
|
||||
if result != test.expectresult {
|
||||
t.Errorf("case[%d]:%s Expected result:%s, Got result:%s", i, test.name, test.expectresult, result)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func makeContainer(cpuReq, cpuLim, memReq, memLim string) api.Container {
|
||||
return api.Container{
|
||||
Name: string(uuid.NewUUID()),
|
||||
Resources: api.ResourceRequirements{
|
||||
Limits: api.ResourceList{
|
||||
api.ResourceCPU: resource.MustParse(cpuLim),
|
||||
api.ResourceMemory: resource.MustParse(memLim),
|
||||
},
|
||||
Requests: api.ResourceList{
|
||||
api.ResourceCPU: resource.MustParse(cpuReq),
|
||||
api.ResourceMemory: resource.MustParse(memReq),
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user