Fix incluster suite

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
projectcontour · Dec 15, 2021 · 394d8c5 · 394d8c5
1 parent 79a97c4
commit 394d8c5
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/test/e2e/incluster/incluster_test.go b/test/e2e/incluster/incluster_test.go
@@ -36,6 +36,16 @@ func TestIncluster(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
+	// Default to using ContourConfiguration CRD.
+	originalArgs := f.Deployment.ContourDeployment.Spec.Template.Spec.Containers[0].Args
+	var newArgs []string
+	for _, arg := range originalArgs {
+		if !strings.Contains(arg, "--config-path") {
+			newArgs = append(newArgs, arg)
+		}
+	}
+	newArgs = append(newArgs, "--contour-config-name=incluster-tests")
+	f.Deployment.ContourDeployment.Spec.Template.Spec.Containers[0].Args = newArgs
 	require.NoError(f.T(), f.Deployment.EnsureResourcesForInclusterContour(false))
 })
 
@@ -50,17 +60,8 @@ var _ = Describe("Incluster", func() {
 	var contourConfig *contour_api_v1alpha1.ContourConfiguration
 
 	BeforeEach(func() {
-		// Default to using ContourConfiguration CRD.
 		contourConfig = e2e.DefaultContourConfiguration()
-		originalArgs := f.Deployment.ContourDeployment.Spec.Template.Spec.Containers[0].Args
-		newArgs := []string{}
-		for _, arg := range originalArgs {
-			if !strings.Contains(arg, "--config-path") {
-				newArgs = append(newArgs, arg)
-			}
-		}
-		newArgs = append(newArgs, "--contour-config-name="+contourConfig.Name)
-		f.Deployment.ContourDeployment.Spec.Template.Spec.Containers[0].Args = newArgs
+		contourConfig.Name = "incluster-tests"
 	})
 
 	JustBeforeEach(func() {