Move the contain func-

Signed-off-by: lubronzhan <[email protected]>

Author: lubronzhan

internal/provisioner/objects/deployment/deployment.go

@@ -101,6 +101,15 @@ func DesiredDeployment(contour *model.Contour, image string) *appsv1.Deployment
 		args = append(args, "--debug")
 	}
 
+	contains := func(elements []string, v string) bool {
+		for _, a := range elements {
+			if a == v {
+				return true
+			}
+		}
+		return false
+	}
+
 	if contour.Spec.WatchNamespaces != nil && len(contour.Spec.WatchNamespaces) > 0 && !contains(contour.Spec.WatchNamespaces, corev1.NamespaceAll) {
 		args = append(args, fmt.Sprintf("--watch-namespaces=%s", strings.Join(contour.Spec.WatchNamespaces, ",")))
 	}
@@ -330,12 +339,3 @@ func contourPodAnnotations(contour *model.Contour) map[string]string {
 
 	return annotations
 }
-
-func contains(s []string, e string) bool {
-	for _, a := range s {
-		if a == e {
-			return true
-		}
-	}
-	return false
-}

internal/provisioner/objects/deployment/deployment_test.go

@@ -136,12 +136,22 @@ func checkDeploymentHasStrategy(t *testing.T, ds *appsv1.Deployment, expected ap
 	t.Errorf("deployment has unexpected strategy %q", expected)
 }
 
+func ensureContainerDoesntHaveArg(t *testing.T, container *corev1.Container, arg string) {
+	t.Helper()
+
+	for _, a := range container.Args {
+		if a == arg {
+			t.Errorf("container has arg %q", arg)
+		}
+	}
+}
+
 func TestDesiredDeployment(t *testing.T) {
 	name := "deploy-test"
 	cntr := model.Default(fmt.Sprintf("%s-ns", name), name)
 	icName := "test-ic"
 	cntr.Spec.IngressClassName = &icName
-	testNamespaces := []string{"ns1", "ns2", "ns3"}
+
 	resQutoa := corev1.ResourceRequirements{
 		Limits: corev1.ResourceList{
 			corev1.ResourceCPU:    resource.MustParse("400m"),
@@ -165,9 +175,6 @@ func TestDesiredDeployment(t *testing.T) {
 	// Change the Contour log level to test --debug.
 	cntr.Spec.ContourLogLevel = v1alpha1.DebugLog
 
-	// Change the Contour watch namespaces flag
-	cntr.Spec.WatchNamespaces = testNamespaces
-
 	cntr.Spec.ResourceLabels = map[string]string{
 		"key": "value",
 	}
@@ -211,14 +218,53 @@ func TestDesiredDeployment(t *testing.T) {
 	arg = fmt.Sprintf("--kubernetes-debug=%d", cntr.Spec.KubernetesLogLevel)
 	checkContainerHasArg(t, container, arg)
 
-	arg = fmt.Sprintf("--watch-namespaces=%s", strings.Join(testNamespaces, ","))
-	checkContainerHasArg(t, container, arg)
-
 	checkDeploymentHasNodeSelector(t, deploy, nil)
 	checkDeploymentHasTolerations(t, deploy, nil)
 	checkDeploymentHasResourceRequirements(t, deploy, resQutoa)
 	checkDeploymentHasStrategy(t, deploy, cntr.Spec.ContourDeploymentStrategy)
+}
 
+func TestDesiredDeploymentWhenSettingWatchNamespaces(t *testing.T) {
+	testCases := []struct {
+		description    string
+		namespaces     []string
+		expectArgExist bool
+	}{
+		{
+			description:    "several valid namespaces",
+			namespaces:     []string{"ns1", "ns2"},
+			expectArgExist: true,
+		},
+		{
+			description:    "single valid namespace",
+			namespaces:     []string{"ns1", "ns2"},
+			expectArgExist: true,
+		},
+		{
+			description:    "include empty namespace",
+			namespaces:     []string{"ns1", ""},
+			expectArgExist: false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.description, func(t *testing.T) {
+			name := "deploy-test"
+			cntr := model.Default(fmt.Sprintf("%s-ns", name), name)
+			icName := "test-ic"
+			cntr.Spec.IngressClassName = &icName
+			// Change the Contour watch namespaces flag
+			cntr.Spec.WatchNamespaces = tc.namespaces
+			deploy := DesiredDeployment(cntr, "ghcr.io/projectcontour/contour:test")
+			container := checkDeploymentHasContainer(t, deploy, contourContainerName, true)
+			arg := fmt.Sprintf("--watch-namespaces=%s", strings.Join(tc.namespaces, ","))
+			if tc.expectArgExist {
+				checkContainerHasArg(t, container, arg)
+			} else {
+				ensureContainerDoesntHaveArg(t, container, arg)
+			}
+		})
+	}
 }
 
 func TestNodePlacementDeployment(t *testing.T) {