Skip to content

Commit 8ff8d91

Browse files
authored
Merge pull request #8693 from adrianmoisey/reduce-warnings
Set all PSa labels during VPA tests
2 parents f7fc231 + 5605ec0 commit 8ff8d91

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

vertical-pod-autoscaler/e2e/integration/recommender.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535

3636
var _ = utils.RecommenderE2eDescribe("Flags", func() {
3737
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
38-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
38+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
3939

4040
var vpaClientSet vpa_clientset.Interface
4141
var hamsterNamespace string

vertical-pod-autoscaler/e2e/v1/actuation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import (
5454

5555
var _ = ActuationSuiteE2eDescribe("Actuation", func() {
5656
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
57-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
57+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
5858

5959
ginkgo.It("still applies recommendations on restart when update mode is InPlaceOrRecreate", func() {
6060
ginkgo.By("Setting up a hamster deployment")

vertical-pod-autoscaler/e2e/v1/admission_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const (
5252

5353
var _ = AdmissionControllerE2eDescribe("Admission-controller", func() {
5454
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
55-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
55+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
5656

5757
ginkgo.BeforeEach(func() {
5858
waitForVpaWebhookRegistration(f)

vertical-pod-autoscaler/e2e/v1/full_vpa.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var _ = FullVpaE2eDescribe("Pods under VPA", func() {
7070
// This schedules AfterEach block that needs to run after the AfterEach above and
7171
// BeforeEach that needs to run before the BeforeEach below - thus the order of these matters.
7272
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
73-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
73+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
7474

7575
f.Describe("with InPlaceOrRecreate update mode", framework.WithFeatureGate(features.InPlaceOrRecreate), func() {
7676
ginkgo.BeforeEach(func() {
@@ -229,7 +229,7 @@ var _ = FullVpaE2eDescribe("Pods under VPA with default recommender explicitly c
229229
// This schedules AfterEach block that needs to run after the AfterEach above and
230230
// BeforeEach that needs to run before the BeforeEach below - thus the order of these matters.
231231
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
232-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
232+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
233233

234234
ginkgo.BeforeEach(func() {
235235
ns := f.Namespace.Name
@@ -299,7 +299,7 @@ var _ = FullVpaE2eDescribe("Pods under VPA with non-recognized recommender expli
299299
// This schedules AfterEach block that needs to run after the AfterEach above and
300300
// BeforeEach that needs to run before the BeforeEach below - thus the order of these matters.
301301
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
302-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
302+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
303303

304304
ginkgo.BeforeEach(func() {
305305
ns := f.Namespace.Name
@@ -360,7 +360,7 @@ var _ = FullVpaE2eDescribe("OOMing pods under VPA", func() {
360360
const replicas = 3
361361

362362
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
363-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
363+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
364364

365365
ginkgo.BeforeEach(func() {
366366
ns := f.Namespace.Name

vertical-pod-autoscaler/e2e/v1/recommender.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func getVpaObserver(vpaClientSet vpa_clientset.Interface, namespace string) *obs
132132

133133
var _ = utils.RecommenderE2eDescribe("Checkpoints", func() {
134134
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
135-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
135+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
136136

137137
ginkgo.It("with missing VPA objects are garbage collected", func() {
138138
ns := f.Namespace.Name
@@ -172,7 +172,7 @@ var _ = utils.RecommenderE2eDescribe("Checkpoints", func() {
172172

173173
var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
174174
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
175-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
175+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
176176

177177
ginkgo.It("serves recommendation for CronJob", func() {
178178
ginkgo.By("Setting up hamster CronJob")
@@ -205,7 +205,7 @@ var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
205205

206206
var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
207207
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
208-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
208+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
209209

210210
var (
211211
vpaCRD *vpa_types.VerticalPodAutoscaler
@@ -284,7 +284,7 @@ var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
284284

285285
var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
286286
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
287-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
287+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
288288

289289
var (
290290
vpaClientSet vpa_clientset.Interface
@@ -361,7 +361,7 @@ func getMilliCpu(resources apiv1.ResourceList) int64 {
361361

362362
var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
363363
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
364-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
364+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
365365

366366
var vpaClientSet vpa_clientset.Interface
367367

vertical-pod-autoscaler/e2e/v1/updater.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737

3838
var _ = UpdaterE2eDescribe("Updater", func() {
3939
f := framework.NewDefaultFramework("vertical-pod-autoscaling")
40-
f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
40+
f.NamespacePodSecurityLevel = podsecurity.LevelBaseline
4141

4242
// Sets up a lease object updated periodically to signal - requires WithSerial()
4343
framework.It("evicts pods when Admission Controller status available", framework.WithSerial(), func() {

0 commit comments

Comments
 (0)