e2e: test brownfield setup (#882)

* e2e: test prohibited target

add one blacklisted service and one whitelisted service

* delete agic without shared from agic namespace

* fix yaml indent, rename testing namespace for brownfield

* update testing namespace in test case

* correct the namespace created for testing blacklist

* delete agic if it exists

* fix brownfield bootstrap test

* wait until appgw config for brownfield rule got applied

Author: 3quanfeng

scripts/e2e/cmd/runner/helper.go

@@ -316,8 +316,8 @@ func cleanUp(clientset *kubernetes.Clientset) error {
 				break
 			}
 
-			klog.Warning("Trying again...", i)
-			time.Sleep(time.Second)
+			klog.Warning("cleanUp: trying again...", i)
+			time.Sleep(5 * time.Second)
 		}
 	}
 
@@ -347,7 +347,7 @@ func getPublicIP(clientset *kubernetes.Clientset, namespaceName string) (string,
 			return publicIP, nil
 		}
 
-		klog.Warning("Trying again in 5 seconds...", i)
+		klog.Warning("getPublicIP: trying again in 5 seconds...", i)
 		time.Sleep(5 * time.Second)
 	}
 

scripts/e2e/cmd/runner/lfu_one_namespace_one_ingress_test.go

@@ -0,0 +1,57 @@
+// -------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// --------------------------------------------------------------------------------------------
+
+// +build e2e
+
+package runner
+
+import (
+	"fmt"
+
+	"github.com/Azure/go-autorest/autorest/to"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/klog"
+)
+
+var _ = Describe("LFU", func() {
+	var (
+		clientset *kubernetes.Clientset
+		err       error
+	)
+
+	Context("One Namespace One Ingress", func() {
+		BeforeEach(func() {
+			clientset, err = getClient()
+			Expect(err).To(BeNil())
+			cleanUp(clientset)
+		})
+
+		It("[prohibited-target-test] prohibited service should be available to be accessed", func() {
+			// get ip address for 1 ingress
+			klog.Info("Getting public IP from blacklisted Ingress...")
+			publicIP, _ := getPublicIP(clientset, "test-brownfield-ns")
+			Expect(publicIP).ToNot(Equal(""))
+
+			//prohibited service will be kept by agic
+			url_blacklist := fmt.Sprintf("http://%s/blacklist", publicIP)
+			_, err = makeGetRequest(url_blacklist, "brownfield-blacklist-ns.host", 200, true)
+			Expect(err).To(BeNil())
+
+			//delete namespaces for blacklist testing
+			deleteOptions := &metav1.DeleteOptions{
+				GracePeriodSeconds: to.Int64Ptr(0),
+			}
+
+			klog.Info("Delete namespaces test-brownfield-ns after blacklist testing...")
+			err = clientset.CoreV1().Namespaces().Delete("test-brownfield-ns", deleteOptions)
+			Expect(err).To(BeNil())
+		})
+	})
+
+})

scripts/e2e/cmd/runner/mfu_one_namespace_many_ingresses_test.go

@@ -109,7 +109,7 @@ var _ = Describe("MFU", func() {
 			hosts := []string{"appa.", "appb."}
 			url := fmt.Sprintf("https://%s/status/200", publicIP)
 			klog.Infof("Sending get request %s ...", url)
-			for i := 1; i <= 50; i++ {
+			for i := 1; i <= 40; i++ {
 				for _, host := range hosts {
 					hostIndex := host + strconv.Itoa(i)
 					klog.Infof("Sending request with host %s ...", hostIndex)

scripts/e2e/cmd/runner/agic_e2e_test.go renamed to scripts/e2e/cmd/runner/runner_test.go

@@ -1,4 +1,4 @@
-{{- range untilStep 1 51 1 }}
+{{- range untilStep 1 41 1 }}
 apiVersion: apps/v1
 kind: Deployment
 metadata: