Switch e2e test with feature flag to use framework.WithFeatureGate #8684
+101
−75
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,8 +25,10 @@ import ( | |
|
|
||
| apiv1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| utilfeature "k8s.io/apiserver/pkg/util/feature" | ||
| "k8s.io/autoscaler/vertical-pod-autoscaler/e2e/utils" | ||
| vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" | ||
| "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features" | ||
| "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/test" | ||
| "k8s.io/kubernetes/test/e2e/framework" | ||
| podsecurity "k8s.io/pod-security-admission/api" | ||
|
|
@@ -35,20 +37,28 @@ import ( | |
| "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| func init() { | ||
| // Dynamically register feature gates from the VPA's versioned feature gate configuration | ||
| // This ensures consistency with the main VPA feature gate definitions | ||
| if err := utilfeature.DefaultMutableFeatureGate.Add(features.MutableFeatureGate.GetAll()); err != nil { | ||
| panic(fmt.Sprintf("Failed to add VPA feature gates: %v", err)) | ||
| } | ||
| } | ||
|
|
||
| const ( | ||
| webhookConfigName = "vpa-webhook-config" | ||
| webhookName = "vpa.k8s.io" | ||
| ) | ||
|
|
||
| var _ = AdmissionControllerE2eDescribe("Admission-controller", func() { | ||
| f := framework.NewDefaultFramework("vertical-pod-autoscaling") | ||
| f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline | ||
|
|
||
| ginkgo.BeforeEach(func() { | ||
| waitForVpaWebhookRegistration(f) | ||
| }) | ||
|
|
||
| f.It("starts pods with new recommended request with InPlaceOrRecreate mode", framework.WithFeatureGate(features.InPlaceOrRecreate), func() { | ||
| d := NewHamsterDeploymentWithResources(f, ParseQuantityOrDie("100m") /*cpu*/, ParseQuantityOrDie("100Mi") /*memory*/) | ||
|
|
||
| ginkgo.By("Setting up a VPA CRD") | ||
|
|
@@ -878,33 +888,49 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", ginkgo.Label("FG: | |
| expectedErr string | ||
| }{ | ||
| { | ||
| name: "Invalid minAllowed (invalid requests field)", | ||
| vpaJSON: `{ | ||
| "apiVersion": "autoscaling.k8s.io/v1", | ||
| "kind": "VerticalPodAutoscaler", | ||
| "metadata": {"name": "hamster-vpa-invalid"}, | ||
| "spec": { | ||
| "targetRef": { | ||
| "apiVersion": "apps/v1", | ||
| "kind": "Deployment", | ||
| "name": "hamster" | ||
| }, | ||
| "resourcePolicy": { | ||
| "containerPolicies": [{ | ||
| "containerName": "*", | ||
| "minAllowed": { | ||
| "requests": { | ||
| "cpu": "50m" | ||
| } | ||
| } | ||
| }] | ||
| } | ||
| } | ||
| }`, | ||
|
There was a problem hiding this comment. I'm a little confused on this change of the test. Is this feature deprecated, or am I getting confused by a this git diff, or something else? There was a problem hiding this comment. Yeah, it's a bit confusing because of the diff. Basically, there are 3 steps:
Here are links to each phase, to try demonstrate it:
This also changes a few I hope that explains what I was aiming for. There was a problem hiding this comment. Ah, I see whats going on now. I haven't been keeping up with the changes to these tests that much, but I remember I gated only a subset of the admission-controller tests, and later I'm assuming we started Thanks for the explanation :-) |
||
| 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 (negative value)", | ||
| vpaJSON: `{ | ||
| "apiVersion": "autoscaling.k8s.io/v1", | ||
| "kind": "VerticalPodAutoscaler", | ||
|
|
@@ -921,16 +947,16 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", ginkgo.Label("FG: | |
| "resourcePolicy": { | ||
| "containerPolicies": [{ | ||
| "containerName": "*", | ||
| "oomBumpUpRatio": -1, | ||
| "oomMinBumpUp": 104857600 | ||
| }] | ||
| } | ||
| } | ||
| }`, | ||
| expectedErr: "admission webhook \"vpa.k8s.io\" denied the request: oomBumpUpRatio must be greater than or equal to 1.0, got -1", | ||
| }, | ||
| { | ||
| name: "Invalid oomBumpUpRatio (string value)", | ||
| vpaJSON: `{ | ||
| "apiVersion": "autoscaling.k8s.io/v1", | ||
| "kind": "VerticalPodAutoscaler", | ||
|
|
@@ -947,16 +973,16 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", ginkgo.Label("FG: | |
| "resourcePolicy": { | ||
| "containerPolicies": [{ | ||
| "containerName": "*", | ||
| "oomBumpUpRatio": "not-a-number", | ||
| "oomMinBumpUp": 104857600 | ||
| }] | ||
| } | ||
| } | ||
| }`, | ||
| expectedErr: "admission webhook \"vpa\\.k8s\\.io\" denied the request: quantities must match the regular expression", | ||
| }, | ||
| { | ||
| name: "Invalid oomBumpUpRatio (less than 1)", | ||
| vpaJSON: `{ | ||
| "apiVersion": "autoscaling.k8s.io/v1", | ||
| "kind": "VerticalPodAutoscaler", | ||
|
|
@@ -973,45 +999,45 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", ginkgo.Label("FG: | |
| "resourcePolicy": { | ||
| "containerPolicies": [{ | ||
| "containerName": "*", | ||
| "oomBumpUpRatio": 0.5, | ||
| "oomMinBumpUp": 104857600 | ||
| }] | ||
| } | ||
| } | ||
| }`, | ||
| expectedErr: "admission webhook \"vpa.k8s.io\" denied the request: oomBumpUpRatio must be greater than or equal to 1.0, got 0.5", | ||
| }, | ||
| { | ||
| name: "Invalid oomMinBumpUp (negative value)", | ||
| vpaJSON: `{ | ||
| "apiVersion": "autoscaling.k8s.io/v1", | ||
| "kind": "VerticalPodAutoscaler", | ||
| "metadata": {"name": "oom-test-vpa"}, | ||
| "spec": { | ||
| "targetRef": { | ||
| "apiVersion": "apps/v1", | ||
| "kind": "Deployment", | ||
| "name": "oom-test" | ||
| }, | ||
| "updatePolicy": { | ||
| "updateMode": "Auto" | ||
| }, | ||
| "resourcePolicy": { | ||
| "containerPolicies": [{ | ||
| "containerName": "*", | ||
| "oomBumpUpRatio": 2, | ||
| "oomMinBumpUp": -1 | ||
| }] | ||
| } | ||
| } | ||
| }`, | ||
| 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(), fmt.Sprintf("Invalid VPA object accepted, name: \"%s\"", tc.name)) | ||
| gomega.Expect(err.Error()).To(gomega.MatchRegexp(tc.expectedErr)) | ||
| } | ||
| }) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these labels just removed then? Does the
WithFeatureGatefunction add something like this for us?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Correct, it adds these:
For beta it just adds the FeatureGate and Beta, it doesn't add an "[Feature:OnByDefault]"