VPA: move inplace and eviction logic into separate files

This commit refactors inplace logic outside of the pods eviction restriction and separates them into their own files.
Also this commit adds PatchResourceTarget to calculators to allow them to explictly specify to the caller which
resource/subresource they should be patched to. This commit also creates a utils subpackage in order to prevent
dependency cycles in the unit tests.

Signed-off-by: Max Cao <[email protected]>

Author: maxcao13

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/handler_test.go

@@ -54,6 +54,10 @@ type fakePatchCalculator struct {
 	err     error
 }
 
+func (*fakePatchCalculator) PatchResourceTarget() patch.PatchResourceTarget {
+	return patch.Spec
+}
+
 func (c *fakePatchCalculator) CalculatePatches(_ *apiv1.Pod, _ *vpa_types.VerticalPodAutoscaler) (
 	[]resource_admission.PatchRecord, error) {
 	return c.patches, c.err

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/calculator.go

@@ -23,7 +23,21 @@ import (
 	vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 )
 
+// PatchResourceTarget is the type of resource that can be patched.
+type PatchResourceTarget string
+
+const (
+	// Spec refers to the spec of the pod.
+	Spec PatchResourceTarget = "Spec"
+	// Status refers to the status subresource of the pod.
+	Status PatchResourceTarget = "Status"
+	// Resize refers to the resize subresource of the pod.
+	Resize PatchResourceTarget = "Resize"
+)
+
 // Calculator is capable of calculating required patches for pod.
 type Calculator interface {
 	CalculatePatches(pod *core.Pod, vpa *vpa_types.VerticalPodAutoscaler) ([]resource.PatchRecord, error)
+	// PatchResourceTarget returns the resource this calculator should calculate patches for.
+	PatchResourceTarget() PatchResourceTarget
 }

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/observed_containers.go

@@ -31,6 +31,10 @@ func (*observedContainers) CalculatePatches(pod *core.Pod, _ *vpa_types.Vertical
 	return []resource_admission.PatchRecord{GetAddAnnotationPatch(annotations.VpaObservedContainersLabel, vpaObservedContainersValue)}, nil
 }
 
+func (*observedContainers) PatchResourceTarget() PatchResourceTarget {
+	return Spec
+}
+
 // NewObservedContainersCalculator returns calculator for
 // observed containers patches.
 func NewObservedContainersCalculator() Calculator {

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/resource_updates.go

@@ -73,6 +73,10 @@ func (c *resourcesUpdatesPatchCalculator) CalculatePatches(pod *core.Pod, vpa *v
 	return result, nil
 }
 
+func (*resourcesUpdatesPatchCalculator) PatchResourceTarget() PatchResourceTarget {
+	return Spec
+}
+
 func getContainerPatch(pod *core.Pod, i int, annotationsPerContainer vpa_api_util.ContainerToAnnotationsMap, containerResources vpa_api_util.ContainerResources) ([]resource_admission.PatchRecord, string) {
 	var patches []resource_admission.PatchRecord
 	// Add empty resources object if missing.