Split out features.PerVPAConfig tests

Author: adrianmoisey

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

@@ -888,33 +888,49 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", func() {
 			expectedErr string
 		}{
 			{
-				name: "Invalid oomBumpUpRatio (negative value)",
+				name: "Invalid minAllowed (invalid requests field)",
 				vpaJSON: `{
             "apiVersion": "autoscaling.k8s.io/v1",
             "kind": "VerticalPodAutoscaler",
-            "metadata": {"name": "oom-test-vpa"},
+            "metadata": {"name": "hamster-vpa-invalid"},
             "spec": {
                 "targetRef": {
                     "apiVersion": "apps/v1",
                     "kind": "Deployment",
-                    "name": "oom-test"
-                },
-                "updatePolicy": {
-                    "updateMode": "Auto"
+                    "name": "hamster"
                 },
                 "resourcePolicy": {
                     "containerPolicies": [{
                         "containerName": "*",
-                        "oomBumpUpRatio": -1,
-                        "oomMinBumpUp": 104857600
+                        "minAllowed": {
+                            "requests": {
+                                "cpu": "50m"
+                            }
+                        }
                     }]
                 }
             }
         }`,
-				expectedErr: "spec.resourcePolicy.containerPolicies[0].oomBumpUpRatio: Invalid value: -1: spec.resourcePolicy.containerPolicies[0].oomBumpUpRatio in body should be greater than or equal to 1",
+				expectedErr: "admission webhook .*vpa.* denied the request:",
 			},
+		}
+		for _, tc := range testCases {
+			ginkgo.By(fmt.Sprintf("Testing %s", tc.name))
+			err := InstallRawVPA(f, []byte(tc.vpaJSON))
+			gomega.Expect(err).To(gomega.HaveOccurred(), "Invalid VPA object accepted")
+			gomega.Expect(err.Error()).To(gomega.MatchRegexp(tc.expectedErr))
+		}
+	})
+
+	f.It("accepts valid and rejects invalid VPA object with features.PerVPAConfig enabled", framework.WithFeatureGate(features.PerVPAConfig), func() {
+		ginkgo.By("Setting up invalid VPA objects")
+		testCases := []struct {
+			name        string
+			vpaJSON     string
+			expectedErr string
+		}{
 			{
-				name: "Invalid oomBumpUpRatio (string value)",
+				name: "Invalid oomBumpUpRatio (negative value)",
 				vpaJSON: `{
             "apiVersion": "autoscaling.k8s.io/v1",
             "kind": "VerticalPodAutoscaler",
@@ -931,16 +947,16 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", func() {
                 "resourcePolicy": {
                     "containerPolicies": [{
                         "containerName": "*",
-                        "oomBumpUpRatio": "12",
+                        "oomBumpUpRatio": -1,
                         "oomMinBumpUp": 104857600
                     }]
                 }
             }
         }`,
-				expectedErr: "json: cannot unmarshal string into Go struct field ContainerResourcePolicy.spec.resourcePolicy.containerPolicies.oomBumpUpRatio of type float64",
+				expectedErr: "admission webhook \"vpa.k8s.io\" denied the request: oomBumpUpRatio must be greater than or equal to 1.0, got -1",
 			},
 			{
-				name: "Invalid oomBumpUpRatio (less than 1)",
+				name: "Invalid oomBumpUpRatio (string value)",
 				vpaJSON: `{
             "apiVersion": "autoscaling.k8s.io/v1",
             "kind": "VerticalPodAutoscaler",
@@ -957,16 +973,16 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", func() {
                 "resourcePolicy": {
                     "containerPolicies": [{
                         "containerName": "*",
-                        "oomBumpUpRatio": 0.5,
+                        "oomBumpUpRatio": "not-a-number",
                         "oomMinBumpUp": 104857600
                     }]
                 }
             }
         }`,
-				expectedErr: "spec.resourcePolicy.containerPolicies[0].oomBumpUpRatio: Invalid value: 0.5: spec.resourcePolicy.containerPolicies[0].oomBumpUpRatio in body should be greater than or equal to 1",
+				expectedErr: "admission webhook \"vpa\\.k8s\\.io\" denied the request: quantities must match the regular expression",
 			},
 			{
-				name: "Invalid oomMinBumpUp (negative value)",
+				name: "Invalid oomBumpUpRatio (less than 1)",
 				vpaJSON: `{
             "apiVersion": "autoscaling.k8s.io/v1",
             "kind": "VerticalPodAutoscaler",
@@ -983,45 +999,45 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", func() {
                 "resourcePolicy": {
                     "containerPolicies": [{
                         "containerName": "*",
-                        "oomBumpUpRatio": 2,
-                        "oomMinBumpUp": -1
+                        "oomBumpUpRatio": 0.5,
+                        "oomMinBumpUp": 104857600
                     }]
                 }
             }
         }`,
-				expectedErr: "spec.resourcePolicy.containerPolicies[0].oomMinBumpUp: Invalid value: -1: spec.resourcePolicy.containerPolicies[0].oomMinBumpUp in body should be greater than or equal to 0",
+				expectedErr: "admission webhook \"vpa.k8s.io\" denied the request: oomBumpUpRatio must be greater than or equal to 1.0, got 0.5",
 			},
 			{
-				name: "Invalid minAllowed (invalid requests field)",
+				name: "Invalid oomMinBumpUp (negative value)",
 				vpaJSON: `{
             "apiVersion": "autoscaling.k8s.io/v1",
             "kind": "VerticalPodAutoscaler",
-            "metadata": {"name": "hamster-vpa-invalid"},
+            "metadata": {"name": "oom-test-vpa"},
             "spec": {
                 "targetRef": {
                     "apiVersion": "apps/v1",
                     "kind": "Deployment",
-                    "name": "hamster"
+                    "name": "oom-test"
+                },
+                "updatePolicy": {
+                    "updateMode": "Auto"
                 },
                 "resourcePolicy": {
                     "containerPolicies": [{
                         "containerName": "*",
-                        "minAllowed": {
-                            "requests": {
-                                "cpu": "50m"
-                            }
-                        }
+                        "oomBumpUpRatio": 2,
+                        "oomMinBumpUp": -1
                     }]
                 }
             }
         }`,
-				expectedErr: "admission webhook .*vpa.* denied the request:",
+				expectedErr: "admission webhook \"vpa.k8s.io\" denied the request: oomMinBumpUp must be greater than or equal to 0, got -1 bytes",
 			},
 		}
 		for _, tc := range testCases {
 			ginkgo.By(fmt.Sprintf("Testing %s", tc.name))
 			err := InstallRawVPA(f, []byte(tc.vpaJSON))
-			gomega.Expect(err).To(gomega.HaveOccurred(), "Invalid VPA object accepted")
+			gomega.Expect(err).To(gomega.HaveOccurred(), fmt.Sprintf("Invalid VPA object accepted, name: \"%s\"", tc.name))
 			gomega.Expect(err.Error()).To(gomega.MatchRegexp(tc.expectedErr))
 		}
 	})