feat(test): add e2e test for mutation hook

Author: aslakknutsen

e2e/smoke_test.go

@@ -45,6 +45,9 @@ var _ = Describe("Smoke End To End Tests - against OpenShift Cluster with Istio
 
 			InstallLocalOperator(namespace)
 			DeployTestScenario(scenario, namespace)
+		})
+
+		BeforeEach(func() {
 			sessionName = GenerateSessionName()
 		})
 
@@ -230,6 +233,36 @@ var _ = Describe("Smoke End To End Tests - against OpenShift Cluster with Istio
 			})
 		})
 
+		Context("che deployment", func() {
+			var tmpRemove func()
+
+			BeforeEach(func() {
+				scenario = "scenario-che"
+				tmpRemove = test.TemporaryEnvVars(
+					"IKE_SESSION", sessionName,
+					"IKE_ROUTE", "header:x-test-suite=smoke")
+			})
+
+			AfterEach(func() {
+				tmpRemove()
+			})
+
+			It("should watch for changes in ratings service in specified namespace and serve it", func() {
+				ChangeNamespace(namespace)
+				EnsureAllPodsAreReady(namespace)
+				EnsureProdRouteIsReachable(namespace, ContainSubstring("ratings-v1"))
+
+				// given the mutation hook has kicked in
+				EnsureSessionRouteIsReachable(namespace, sessionName, ContainSubstring("che-workspace"))
+
+				// when the mutated deployment is cleaned up
+				testshell.ExecuteInDir(tmpDir, "oc delete deployment che-workspace")
+
+				// then the session should no longer be available
+				EnsureSessionRouteIsNotReachable(namespace, sessionName, ContainSubstring("ratings-v1"), Not(ContainSubstring("che-workspace")))
+				EnsureProdRouteIsReachable(namespace, ContainSubstring("ratings-v1"))
+			})
+		})
 	})
 })
 

pkg/k8s/mutation/webhook.go

@@ -32,20 +32,20 @@ type data struct {
 }
 
 func (d *data) IsIkeable() bool {
-	//return d.Object.Labels["ike.target"] != ""
-	return d.Object.Spec.Selector.MatchLabels["deployment"] == "workspace"
+	return d.Object.Annotations["ike.target"] != ""
+	//return d.Object.Spec.Selector.MatchLabels["deployment"] == "workspace"
 }
 
 func (d *data) Target() string {
-	t := d.Object.Labels["ike.target"]
+	t := d.Object.Annotations["ike.target"]
 	if t != "" {
 		return t
 	}
 	return "preference-v1"
 }
 
 func (d *data) Session() string {
-	s := d.Object.Labels["ike.session"]
+	s := d.Object.Annotations["ike.session"]
 	if s != "" {
 		return s
 	}
@@ -58,7 +58,7 @@ func (d *data) Namespace() string {
 }
 
 func (d *data) Route() string {
-	r := d.Object.Labels["ike.route"]
+	r := d.Object.Annotations["ike.route"]
 	if r != "" {
 		return r
 	}
@@ -121,6 +121,7 @@ func (w *Webhook) Handle(ctx context.Context, req admission.Request) admission.R
 	for k, v := range lables {
 		logger().Info("Label added", "deployemnt", req.Name, k, v)
 		deployment.Spec.Template.Labels[k] = v
+		deployment.Spec.Selector.MatchLabels[k] = v // TODO: hmm, should we update the slector? In our test case scenario we have app=che-worksapce where the 'updated labels' become app=reviews
 	}
 
 	targetHost := findGwHost(refStatus)

test/cmd/test-scenario/generator/scenarios.go

@@ -2,6 +2,7 @@ package generator
 
 import (
 	"io"
+	"os"
 )
 
 var (
@@ -80,7 +81,23 @@ func TestScenarioMutationHookChe(out io.Writer) {
 		ForService(reviews, Call(HTTP(), ratings)),
 		GatewayOnHost(GatewayHost),
 	)
-	Do(out, che, Deployment, WithAnnotations(map[string]string{"ike.target": "reviews-v1"}))
+	Do(out, che, Deployment, WithAnnotations(map[string]string{
+		"ike.target":  "reviews-v1",
+		"ike.session": os.Getenv("IKE_SESSION"),
+		"ike.route":   os.Getenv("IKE_SESSION")}))
+}
+
+// TestScenarioMutationHookCheOnly is a basic test setup with a
+// few services calling each other in a chain. Similar to the original bookinfo example setup
+// and a single Deployment simulating a Che Deployment which should trigger the WebHook.
+// Using Deployment.
+func TestScenarioMutationHookCheOnly(out io.Writer) {
+	che := Entry{"che-workspace", "Deployment", Namespace}
+
+	Do(out, che, Deployment, WithAnnotations(map[string]string{
+		"ike.target":  "reviews-v1",
+		"ike.session": os.Getenv("IKE_SESSION"),
+		"ike.route":   os.Getenv("IKE_SESSION")}))
 }
 
 // DemoScenario is a simple setup for demo purposes.

test/cmd/test-scenario/main.go

@@ -25,11 +25,12 @@ func main() {
 	}
 
 	scenarios := map[string]func(io.Writer){
-		"scenario-1":   generator.TestScenario1HTTPThreeServicesInSequence,
-		"scenario-1.1": generator.TestScenario1GRPCThreeServicesInSequence,
-		"scenario-2":   generator.TestScenario2ThreeServicesInSequenceDeploymentConfig,
-		"scenario-che": generator.TestScenarioMutationHookChe,
-		"demo":         generator.DemoScenario,
+		"scenario-1":        generator.TestScenario1HTTPThreeServicesInSequence,
+		"scenario-1.1":      generator.TestScenario1GRPCThreeServicesInSequence,
+		"scenario-2":        generator.TestScenario2ThreeServicesInSequenceDeploymentConfig,
+		"scenario-che":      generator.TestScenarioMutationHookChe,
+		"scenario-che-only": generator.TestScenarioMutationHookCheOnly,
+		"demo":              generator.DemoScenario,
 	}
 	scenario := os.Args[1]
 	if f, ok := scenarios[scenario]; ok {