From 5605ec007b2dfa973c9ff2114a0acb53e3b5a974 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Sun, 26 Oct 2025 16:45:06 +0200 Subject: [PATCH] Set all PSa labels during VPA tests --- vertical-pod-autoscaler/e2e/integration/recommender.go | 2 +- vertical-pod-autoscaler/e2e/v1/actuation.go | 2 +- vertical-pod-autoscaler/e2e/v1/admission_controller.go | 2 +- vertical-pod-autoscaler/e2e/v1/full_vpa.go | 8 ++++---- vertical-pod-autoscaler/e2e/v1/recommender.go | 10 +++++----- vertical-pod-autoscaler/e2e/v1/updater.go | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vertical-pod-autoscaler/e2e/integration/recommender.go b/vertical-pod-autoscaler/e2e/integration/recommender.go index 4ccb1a685ed0..ccce5fa93dab 100644 --- a/vertical-pod-autoscaler/e2e/integration/recommender.go +++ b/vertical-pod-autoscaler/e2e/integration/recommender.go @@ -35,7 +35,7 @@ import ( var _ = utils.RecommenderE2eDescribe("Flags", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline var vpaClientSet vpa_clientset.Interface var hamsterNamespace string diff --git a/vertical-pod-autoscaler/e2e/v1/actuation.go b/vertical-pod-autoscaler/e2e/v1/actuation.go index f2d334d351a6..d45962ef8632 100644 --- a/vertical-pod-autoscaler/e2e/v1/actuation.go +++ b/vertical-pod-autoscaler/e2e/v1/actuation.go @@ -54,7 +54,7 @@ import ( var _ = ActuationSuiteE2eDescribe("Actuation", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.It("still applies recommendations on restart when update mode is InPlaceOrRecreate", func() { ginkgo.By("Setting up a hamster deployment") diff --git a/vertical-pod-autoscaler/e2e/v1/admission_controller.go b/vertical-pod-autoscaler/e2e/v1/admission_controller.go index d6d8e03d4121..2fa12fdc4a6b 100644 --- a/vertical-pod-autoscaler/e2e/v1/admission_controller.go +++ b/vertical-pod-autoscaler/e2e/v1/admission_controller.go @@ -52,7 +52,7 @@ const ( var _ = AdmissionControllerE2eDescribe("Admission-controller", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.BeforeEach(func() { waitForVpaWebhookRegistration(f) diff --git a/vertical-pod-autoscaler/e2e/v1/full_vpa.go b/vertical-pod-autoscaler/e2e/v1/full_vpa.go index 3c73fab1c900..38b25604e624 100644 --- a/vertical-pod-autoscaler/e2e/v1/full_vpa.go +++ b/vertical-pod-autoscaler/e2e/v1/full_vpa.go @@ -70,7 +70,7 @@ var _ = FullVpaE2eDescribe("Pods under VPA", func() { // This schedules AfterEach block that needs to run after the AfterEach above and // BeforeEach that needs to run before the BeforeEach below - thus the order of these matters. f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline f.Describe("with InPlaceOrRecreate update mode", framework.WithFeatureGate(features.InPlaceOrRecreate), func() { ginkgo.BeforeEach(func() { @@ -229,7 +229,7 @@ var _ = FullVpaE2eDescribe("Pods under VPA with default recommender explicitly c // This schedules AfterEach block that needs to run after the AfterEach above and // BeforeEach that needs to run before the BeforeEach below - thus the order of these matters. f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.BeforeEach(func() { ns := f.Namespace.Name @@ -299,7 +299,7 @@ var _ = FullVpaE2eDescribe("Pods under VPA with non-recognized recommender expli // This schedules AfterEach block that needs to run after the AfterEach above and // BeforeEach that needs to run before the BeforeEach below - thus the order of these matters. f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.BeforeEach(func() { ns := f.Namespace.Name @@ -360,7 +360,7 @@ var _ = FullVpaE2eDescribe("OOMing pods under VPA", func() { const replicas = 3 f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.BeforeEach(func() { ns := f.Namespace.Name diff --git a/vertical-pod-autoscaler/e2e/v1/recommender.go b/vertical-pod-autoscaler/e2e/v1/recommender.go index b0329cc8e0ff..735e56efb26a 100644 --- a/vertical-pod-autoscaler/e2e/v1/recommender.go +++ b/vertical-pod-autoscaler/e2e/v1/recommender.go @@ -132,7 +132,7 @@ func getVpaObserver(vpaClientSet vpa_clientset.Interface, namespace string) *obs var _ = utils.RecommenderE2eDescribe("Checkpoints", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.It("with missing VPA objects are garbage collected", func() { ns := f.Namespace.Name @@ -172,7 +172,7 @@ var _ = utils.RecommenderE2eDescribe("Checkpoints", func() { var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline ginkgo.It("serves recommendation for CronJob", func() { ginkgo.By("Setting up hamster CronJob") @@ -205,7 +205,7 @@ var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() { var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline var ( vpaCRD *vpa_types.VerticalPodAutoscaler @@ -284,7 +284,7 @@ var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() { var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline var ( vpaClientSet vpa_clientset.Interface @@ -361,7 +361,7 @@ func getMilliCpu(resources apiv1.ResourceList) int64 { var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline var vpaClientSet vpa_clientset.Interface diff --git a/vertical-pod-autoscaler/e2e/v1/updater.go b/vertical-pod-autoscaler/e2e/v1/updater.go index d955139a8c13..19327021c8e0 100644 --- a/vertical-pod-autoscaler/e2e/v1/updater.go +++ b/vertical-pod-autoscaler/e2e/v1/updater.go @@ -37,7 +37,7 @@ import ( var _ = UpdaterE2eDescribe("Updater", func() { f := framework.NewDefaultFramework("vertical-pod-autoscaling") - f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline + f.NamespacePodSecurityLevel = podsecurity.LevelBaseline // Sets up a lease object updated periodically to signal - requires WithSerial() framework.It("evicts pods when Admission Controller status available", framework.WithSerial(), func() {