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

fix test name

Browse Source
This commit is contained in:
qingwave 2023-08-19 03:31:34 +00:00
parent f07a3a3f26
commit 7f805dc935
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/podautoscaler/replica_calculator.go
View File

@ -425,6 +425,7 @@ func calculatePodRequests(pods []*v1.Pod, container string, resource v1.Resource
requests := make(map[string]int64, len(pods)) requests := make(map[string]int64, len(pods))
for _, pod := range pods { for _, pod := range pods {
podSum := int64(0) podSum := int64(0)
// Calculate all regular containers and restartable init containers requests.
containers := append([]v1.Container{}, pod.Spec.Containers...) containers := append([]v1.Container{}, pod.Spec.Containers...)
for _, c := range pod.Spec.InitContainers { for _, c := range pod.Spec.InitContainers {
if c.RestartPolicy != nil && *c.RestartPolicy == v1.ContainerRestartPolicyAlways { if c.RestartPolicy != nil && *c.RestartPolicy == v1.ContainerRestartPolicyAlways {

8
pkg/controller/podautoscaler/replica_calculator_test.go
View File

@ -2021,7 +2021,7 @@ func TestCalculatePodRequests(t *testing.T) {
expectedError: nil, expectedError: nil,
}, },
{ {
name: "one pod", name: "pod with regular containers",
pods: []*v1.Pod{{ pods: []*v1.Pod{{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: testPod, Name: testPod,
@ -2059,7 +2059,7 @@ func TestCalculatePodRequests(t *testing.T) {
expectedError: nil, expectedError: nil,
}, },
{ {
name: "pod missing requests", name: "container missing requests",
pods: []*v1.Pod{{ pods: []*v1.Pod{{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: testPod, Name: testPod,
@ -2077,7 +2077,7 @@ func TestCalculatePodRequests(t *testing.T) {
expectedError: fmt.Errorf("missing request for %s in container %s of Pod %s", v1.ResourceCPU, "container1", testPod), expectedError: fmt.Errorf("missing request for %s in container %s of Pod %s", v1.ResourceCPU, "container1", testPod),
}, },
{ {
name: "pod with sidecar containers", name: "pod with restartable init containers",
pods: []*v1.Pod{{ pods: []*v1.Pod{{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: testPod, Name: testPod,
@ -2089,7 +2089,7 @@ func TestCalculatePodRequests(t *testing.T) {
}, },
InitContainers: []v1.Container{ InitContainers: []v1.Container{
{Name: "init-container1", Resources: v1.ResourceRequirements{Requests: v1.ResourceList{v1.ResourceCPU: *resource.NewMilliQuantity(20, resource.DecimalSI)}}}, {Name: "init-container1", Resources: v1.ResourceRequirements{Requests: v1.ResourceList{v1.ResourceCPU: *resource.NewMilliQuantity(20, resource.DecimalSI)}}},
{Name: "sidecar1", RestartPolicy: &containerRestartPolicyAlways, Resources: v1.ResourceRequirements{Requests: v1.ResourceList{v1.ResourceCPU: *resource.NewMilliQuantity(50, resource.DecimalSI)}}}, {Name: "restartable-container1", RestartPolicy: &containerRestartPolicyAlways, Resources: v1.ResourceRequirements{Requests: v1.ResourceList{v1.ResourceCPU: *resource.NewMilliQuantity(50, resource.DecimalSI)}}},
}, },
}, },
}}, }},