UPSTREAM: 8778: VPA: Allow e2e tests to reference a custom namespace

VPA: Allow e2e tests to reference a custom namespace (kubernetes#8778)

* VPA: Allow e2e tests to reference a custom namespace

Enable VPA e2e tests to use a custom namespace via the VPA_NAMESPACE environment variable, while maintaining backward compatibility with the default kube-system namespace.
This addresses issue kubernetes#8752 by making the e2e tests consistent with the VPA components' ability to run in custom namespaces.

Changes:
- Made VpaNamespace (e2e/v1/common.go) configurable via environment variable
- Made RecommenderNamespace (e2e/utils/common.go) configurable via environment variable
- Replaced hardcoded kube-system in deleteRecommender() function
- Replaced hardcoded kube-system in webhook RoleBinding operations

The implementation follows the same pattern as PR kubernetes#7654, using environment variables with sensible defaults to enable custom configurations without breaking existing tests.

* VPA: Allow e2e tests to reference a custom namespace

Changes:
- Consolidated to single VpaNamespace variable in e2e/utils/common.go
- Added VPA_NAMESPACE environment variable support with init() function
- Replaced all hardcoded namespace references in e2e tests:
- e2e/v1/recommender.go deleteRecommender() function (1 instance)
- e2e/v1/updater.go status namespace references (10 instances)
- e2e/integration/recommender.go deployment operations (3 instances)
- e2e/utils/webhook.go RoleBinding operations (2 instances)
- Removed duplicate VpaNamespac from e2e/v1/common.go

Signed-off-by: Max Cao <[email protected]>

Author: AryanBagade

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

@@ -46,15 +46,15 @@ var _ = utils.RecommenderE2eDescribe("Flags", func() {
 	})
 
 	ginkgo.AfterEach(func() {
-		f.ClientSet.AppsV1().Deployments(utils.RecommenderNamespace).Delete(context.TODO(), utils.RecommenderDeploymentName, metav1.DeleteOptions{})
+		f.ClientSet.AppsV1().Deployments(utils.VpaNamespace).Delete(context.TODO(), utils.RecommenderDeploymentName, metav1.DeleteOptions{})
 	})
 
 	ginkgo.It("starts recommender with --vpa-object-namespace parameter", func() {
 		ginkgo.By("Setting up VPA deployment")
 		ignoredNamespace, err := f.CreateNamespace(context.TODO(), "ignored-namespace", nil)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-		f.Namespace.Name = utils.RecommenderNamespace
+		f.Namespace.Name = utils.VpaNamespace
 		vpaDeployment := utils.NewVPADeployment(f, []string{
 			"--recommender-interval=10s",
 			fmt.Sprintf("--vpa-object-namespace=%s", hamsterNamespace),
@@ -69,7 +69,7 @@ var _ = utils.RecommenderE2eDescribe("Flags", func() {
 		ignoredNamespace, err := f.CreateNamespace(context.TODO(), "ignored-namespace", nil)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-		f.Namespace.Name = utils.RecommenderNamespace
+		f.Namespace.Name = utils.VpaNamespace
 		vpaDeployment := utils.NewVPADeployment(f, []string{
 			"--recommender-interval=10s",
 			fmt.Sprintf("--ignored-vpa-object-namespaces=%s", ignoredNamespace.Name),

vertical-pod-autoscaler/e2e/utils/common.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
 	"time"
 
 	ginkgo "github.com/onsi/ginkgo/v2"
@@ -44,8 +45,6 @@ const (
 
 	// RecommenderDeploymentName is VPA recommender deployment name
 	RecommenderDeploymentName = "vpa-recommender"
-	// RecommenderNamespace is namespace to deploy VPA recommender
-	RecommenderNamespace = "kube-system"
 	// PollInterval is interval for polling
 	PollInterval = 10 * time.Second
 	// PollTimeout is timeout for polling
@@ -57,6 +56,18 @@ const (
 	DefaultHamsterBackoffLimit = int32(10)
 )
 
+var (
+	// VpaNamespace is namespace to deploy VPA components.
+	// Can be overridden via VPA_NAMESPACE environment variable.
+	VpaNamespace = "kube-system"
+)
+
+func init() {
+	if ns := os.Getenv("VPA_NAMESPACE"); ns != "" {
+		VpaNamespace = ns
+	}
+}
+
 // HamsterTargetRef is CrossVersionObjectReference of hamster app
 var HamsterTargetRef = &autoscaling.CrossVersionObjectReference{
 	APIVersion: "apps/v1",

vertical-pod-autoscaler/e2e/utils/webhook.go

@@ -221,7 +221,7 @@ func waitWebhookConfigurationReady(f *framework.Framework) error {
 func CreateAuthReaderRoleBinding(f *framework.Framework, namespace string) {
 	ginkgo.By("Create role binding to let webhook read extension-apiserver-authentication")
 	client := f.ClientSet
-	_, err := client.RbacV1().RoleBindings("kube-system").Create(context.TODO(), &rbacv1.RoleBinding{
+	_, err := client.RbacV1().RoleBindings(VpaNamespace).Create(context.TODO(), &rbacv1.RoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: roleBindingName,
 			Annotations: map[string]string{
@@ -384,5 +384,5 @@ func CleanWebhookTest(client clientset.Interface, namespaceName string) {
 	_ = client.CoreV1().Services(namespaceName).Delete(context.TODO(), WebhookServiceName, metav1.DeleteOptions{})
 	_ = client.AppsV1().Deployments(namespaceName).Delete(context.TODO(), deploymentName, metav1.DeleteOptions{})
 	_ = client.CoreV1().Secrets(namespaceName).Delete(context.TODO(), WebhookServiceName, metav1.DeleteOptions{})
-	_ = client.RbacV1().RoleBindings("kube-system").Delete(context.TODO(), roleBindingName, metav1.DeleteOptions{})
+	_ = client.RbacV1().RoleBindings(VpaNamespace).Delete(context.TODO(), roleBindingName, metav1.DeleteOptions{})
 }

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

@@ -54,9 +54,6 @@ const (
 	// VpaInPlaceTimeout is a timeout for the VPA to finish in-place resizing a
 	// pod, if there are no mechanisms blocking it.
 	VpaInPlaceTimeout = 2 * time.Minute
-
-	// VpaNamespace is the default namespace that holds the all the VPA components.
-	VpaNamespace = "kube-system"
 )
 
 // UpdaterE2eDescribe describes a VPA updater e2e test.

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

@@ -413,7 +413,7 @@ var _ = utils.RecommenderE2eDescribe("VPA CRD object", func() {
 })
 
 func deleteRecommender(c clientset.Interface) error {
-	namespace := "kube-system"
+	namespace := utils.VpaNamespace
 	listOptions := metav1.ListOptions{}
 	podList, err := c.CoreV1().Pods(namespace).List(context.TODO(), listOptions)
 	if err != nil {

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

@@ -47,7 +47,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		statusUpdater := status.NewUpdater(
 			f.ClientSet,
 			status.AdmissionControllerStatusName,
-			status.AdmissionControllerStatusNamespace,
+			utils.VpaNamespace,
 			statusUpdateInterval,
 			"e2e test",
 		)
@@ -56,7 +56,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 			// Status is created outside the test namespace.
 			ginkgo.By("Deleting the Admission Controller status")
 			close(stopCh)
-			err := f.ClientSet.CoordinationV1().Leases(status.AdmissionControllerStatusNamespace).
+			err := f.ClientSet.CoordinationV1().Leases(utils.VpaNamespace).
 				Delete(context.TODO(), status.AdmissionControllerStatusName, metav1.DeleteOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
@@ -77,7 +77,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		statusUpdater := status.NewUpdater(
 			f.ClientSet,
 			status.AdmissionControllerStatusName,
-			status.AdmissionControllerStatusNamespace,
+			utils.VpaNamespace,
 			statusUpdateInterval,
 			"e2e test",
 		)
@@ -86,7 +86,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 			// Status is created outside the test namespace.
 			ginkgo.By("Deleting the Admission Controller status")
 			close(stopCh)
-			err := f.ClientSet.CoordinationV1().Leases(status.AdmissionControllerStatusNamespace).
+			err := f.ClientSet.CoordinationV1().Leases(utils.VpaNamespace).
 				Delete(context.TODO(), status.AdmissionControllerStatusName, metav1.DeleteOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
@@ -107,7 +107,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		statusUpdater := status.NewUpdater(
 			f.ClientSet,
 			status.AdmissionControllerStatusName,
-			status.AdmissionControllerStatusNamespace,
+			utils.VpaNamespace,
 			statusUpdateInterval,
 			"e2e test",
 		)
@@ -116,7 +116,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 			// Status is created outside the test namespace.
 			ginkgo.By("Deleting the Admission Controller status")
 			close(stopCh)
-			err := f.ClientSet.CoordinationV1().Leases(status.AdmissionControllerStatusNamespace).
+			err := f.ClientSet.CoordinationV1().Leases(utils.VpaNamespace).
 				Delete(context.TODO(), status.AdmissionControllerStatusName, metav1.DeleteOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
@@ -148,7 +148,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		statusUpdater := status.NewUpdater(
 			f.ClientSet,
 			status.AdmissionControllerStatusName,
-			status.AdmissionControllerStatusNamespace,
+			utils.VpaNamespace,
 			statusUpdateInterval,
 			"e2e test",
 		)
@@ -157,7 +157,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 			// Status is created outside the test namespace.
 			ginkgo.By("Deleting the Admission Controller status")
 			close(stopCh)
-			err := f.ClientSet.CoordinationV1().Leases(status.AdmissionControllerStatusNamespace).
+			err := f.ClientSet.CoordinationV1().Leases(utils.VpaNamespace).
 				Delete(context.TODO(), status.AdmissionControllerStatusName, metav1.DeleteOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
@@ -179,7 +179,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		statusUpdater := status.NewUpdater(
 			f.ClientSet,
 			status.AdmissionControllerStatusName,
-			status.AdmissionControllerStatusNamespace,
+			utils.VpaNamespace,
 			statusUpdateInterval,
 			"e2e test",
 		)
@@ -188,7 +188,7 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 			// Status is created outside the test namespace.
 			ginkgo.By("Deleting the Admission Controller status")
 			close(stopCh)
-			err := f.ClientSet.CoordinationV1().Leases(status.AdmissionControllerStatusNamespace).
+			err := f.ClientSet.CoordinationV1().Leases(utils.VpaNamespace).
 				Delete(context.TODO(), status.AdmissionControllerStatusName, metav1.DeleteOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()