From 87f8bd6c61286ff924e8d0ce5ec2de27da8eb11d Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Thu, 31 Jul 2025 11:07:23 +0000 Subject: [PATCH] fmt & fix e2e Signed-off-by: Omer Aplatony --- vertical-pod-autoscaler/e2e/v1/full_vpa.go | 2 +- vertical-pod-autoscaler/e2e/v1/recommender.go | 5 +++-- vertical-pod-autoscaler/pkg/features/features.go | 1 - vertical-pod-autoscaler/pkg/features/versioned_features.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vertical-pod-autoscaler/e2e/v1/full_vpa.go b/vertical-pod-autoscaler/e2e/v1/full_vpa.go index 7f44b04e56..ec1467f58a 100644 --- a/vertical-pod-autoscaler/e2e/v1/full_vpa.go +++ b/vertical-pod-autoscaler/e2e/v1/full_vpa.go @@ -433,4 +433,4 @@ func waitForResourceRequestInRangeInPods(f *framework.Framework, timeout time.Du return fmt.Errorf("error waiting for %s request in range of (%v,%v) for pods: %+v", resourceName, lowerBound, upperBound, listOptions) } return nil -} \ No newline at end of file +} diff --git a/vertical-pod-autoscaler/e2e/v1/recommender.go b/vertical-pod-autoscaler/e2e/v1/recommender.go index bf621ed3d6..70542351b1 100644 --- a/vertical-pod-autoscaler/e2e/v1/recommender.go +++ b/vertical-pod-autoscaler/e2e/v1/recommender.go @@ -24,6 +24,7 @@ import ( autoscaling "k8s.io/api/autoscaling/v1" apiv1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" @@ -446,7 +447,7 @@ var _ = RecommenderE2eDescribe("OOM with custom config", func() { WithNamespace(f.Namespace.Name). WithTargetRef(targetRef). WithContainer(containerName). - WithOOMBumpUpRatio(2). + WithOOMBumpUpRatio(resource.NewQuantity(2, resource.DecimalSI)). Get() InstallVPA(f, vpaCRD) }) @@ -465,7 +466,7 @@ var _ = RecommenderE2eDescribe("OOM with custom config", func() { gomega.Expect(vpa.Status.Recommendation.ContainerRecommendations).Should(gomega.HaveLen(1)) currentMemory := vpa.Status.Recommendation.ContainerRecommendations[0].Target.Memory().Value() - oomReplicationControllerRequestLimit := int64(1024 * 1024 * 1024) // from runOomingReplicationController + oomReplicationControllerRequestLimit := int64(1024 * 1024 * 1024) // from runOomingReplicationController defaultBumpMemory := float64(oomReplicationControllerRequestLimit) * 1.2 // DefaultOOMBumpUpRatio customBumpMemory := float64(oomReplicationControllerRequestLimit) * 2.0 // Custom ratio from VPA config diff --git a/vertical-pod-autoscaler/pkg/features/features.go b/vertical-pod-autoscaler/pkg/features/features.go index 0d8ee7bcff..908dfe80dc 100644 --- a/vertical-pod-autoscaler/pkg/features/features.go +++ b/vertical-pod-autoscaler/pkg/features/features.go @@ -54,7 +54,6 @@ const ( // optimization strategies to be applied to different workloads within the // same cluster. PerVPAConfig featuregate.Feature = "PerVPAConfig" - ) // MutableFeatureGate is a mutable, versioned, global FeatureGate. diff --git a/vertical-pod-autoscaler/pkg/features/versioned_features.go b/vertical-pod-autoscaler/pkg/features/versioned_features.go index 65bc404b6a..32e4a57d4d 100644 --- a/vertical-pod-autoscaler/pkg/features/versioned_features.go +++ b/vertical-pod-autoscaler/pkg/features/versioned_features.go @@ -30,7 +30,7 @@ var defaultVersionedFeatureGates = map[featuregate.Feature]featuregate.Versioned InPlaceOrRecreate: { {Version: version.MustParse("1.4"), Default: false, PreRelease: featuregate.Alpha}, }, - PerVPAConfig : { + PerVPAConfig: { {Version: version.MustParse("1.5"), Default: true, PreRelease: featuregate.Alpha}, }, }