diff --git a/pkg/controller/podautoscaler/replica_calculator.go b/pkg/controller/podautoscaler/replica_calculator.go index 4f77fbb53ea..1acd9c439e8 100644 --- a/pkg/controller/podautoscaler/replica_calculator.go +++ b/pkg/controller/podautoscaler/replica_calculator.go @@ -425,6 +425,7 @@ func calculatePodRequests(pods []*v1.Pod, container string, resource v1.Resource requests := make(map[string]int64, len(pods)) for _, pod := range pods { podSum := int64(0) + // Calculate all regular containers and restartable init containers requests. containers := append([]v1.Container{}, pod.Spec.Containers...) for _, c := range pod.Spec.InitContainers { if c.RestartPolicy != nil && *c.RestartPolicy == v1.ContainerRestartPolicyAlways { diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 0a40d172691..1789ad1f2cb 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -2021,7 +2021,7 @@ func TestCalculatePodRequests(t *testing.T) { expectedError: nil, }, { - name: "one pod", + name: "pod with regular containers", pods: []*v1.Pod{{ ObjectMeta: metav1.ObjectMeta{ Name: testPod, @@ -2059,7 +2059,7 @@ func TestCalculatePodRequests(t *testing.T) { expectedError: nil, }, { - name: "pod missing requests", + name: "container missing requests", pods: []*v1.Pod{{ ObjectMeta: metav1.ObjectMeta{ 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), }, { - name: "pod with sidecar containers", + name: "pod with restartable init containers", pods: []*v1.Pod{{ ObjectMeta: metav1.ObjectMeta{ Name: testPod, @@ -2089,7 +2089,7 @@ func TestCalculatePodRequests(t *testing.T) { }, InitContainers: []v1.Container{ {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)}}}, }, }, }},