wip for adding test.

Jianfei Hu · Jianfei Hu · commit 51659dacbc56 · 2018-12-11T11:05:51.000-08:00
diff --git a/pkg/test/framework/components/apps/kube/apps.go b/pkg/test/framework/components/apps/kube/apps.go
@@ -127,6 +127,22 @@ var (
 			headless:       true,
 			serviceAccount: true,
 		},
+		// TODO(incfly): ideally the test should declare the deployments content and associate it with
+		// meaningful names for maintaience reason.
+		{
+			deployment:     "http-probe-rewrite",
+			service:        "http-probe-rewrite",
+			version:        "unversioned",
+			port1:          80,
+			port2:          8080,
+			port3:          90,
+			port4:          9090,
+			port5:          70,
+			port6:          7070,
+			injectProxy:    false,
+			kubeInject:     true,
+			serviceAccount: true,
+		},
 	}
 )
 
@@ -154,7 +170,9 @@ func (c *kubeComponent) Init(ctx environment.ComponentContext, deps map[dependen
 
 	// Apply all the configs for the deployments.
 	for _, d := range deployments {
+		fmt.Println("jianfeih debug the deployment is ", d.deployment)
 		if err := d.apply(e); err != nil {
+			fmt.Printf("jianfeih debug the error occurred %v\n", err)
 			return nil, multierror.Prefix(err, fmt.Sprintf("failed deploying %s: ", d.deployment))
 		}
 	}
diff --git a/pkg/test/framework/components/apps/kube/deployment.go b/pkg/test/framework/components/apps/kube/deployment.go
@@ -16,12 +16,15 @@ package kube
 
 import (
 	"fmt"
+	"io/ioutil"
+	"path"
 	"strconv"
 
 	kubeApiCore "k8s.io/api/core/v1"
 
 	"istio.io/istio/pkg/test/framework/environments/kubernetes"
 	"istio.io/istio/pkg/test/framework/tmpl"
+	"istio.io/istio/tests/e2e/framework"
 )
 
 const (
@@ -142,16 +145,19 @@ spec:
 )
 
 type deployment struct {
-	deployment     string
-	service        string
-	version        string
-	port1          int
-	port2          int
-	port3          int
-	port4          int
-	port5          int
-	port6          int
-	injectProxy    bool
+	deployment  string
+	service     string
+	version     string
+	port1       int
+	port2       int
+	port3       int
+	port4       int
+	port5       int
+	port6       int
+	injectProxy bool
+	// by default deployment uses webhook auto inject. If `kubeInject` is true
+	// we run `istioctl kubeinject` for injection. `injectProxy` has to be false.
+	kubeInject     bool
 	headless       bool
 	serviceAccount bool
 }
@@ -181,6 +187,31 @@ func (d *deployment) apply(e *kubernetes.Implementation) error {
 		return err
 	}
 
+	// If `kubeInject` is turned on, run `istioctl kube-inject` instead.
+	if d.kubeInject {
+		tmpdir, _ := ioutil.TempDir("", "kubeinject")
+		if d.injectProxy {
+			return fmt.Errorf("%v: injectProxy has to be off while kubeInject is enabled", d.deployment)
+		}
+
+		ictl, err := framework.NewIstioctl(tmpdir, kubernetes.DefaultIstioSystemNamespace,
+			s.Values[kubernetes.HubValuesKey], s.Values[kubernetes.TagValuesKey], s.Values[kubernetes.ImagePullPolicyValuesKey], "", s.KubeConfig)
+		if err != nil {
+			return fmt.Errorf("failed to create istioctl instance %v", err)
+		}
+		src := path.Join(tmpdir, "src.yaml")
+		if err := ioutil.WriteFile(src, []byte(result), 0644); err != nil {
+			return fmt.Errorf("failed to dump file into file %v", err)
+		}
+		dest := path.Join(tmpdir, "destination.yaml")
+		if err = ictl.KubeInject(src, dest, s.KubeConfig); err != nil {
+			return fmt.Errorf("failed in kube-inject %v", err)
+		}
+		if err := e.Accessor.Apply(s.DependencyNamespace, dest); err != nil {
+			return err
+		}
+	}
+
 	if err = e.Accessor.ApplyContents(s.DependencyNamespace, result); err != nil {
 		return err
 	}
diff --git a/pkg/test/framework/driver.go b/pkg/test/framework/driver.go
@@ -162,6 +162,7 @@ func (d *driver) Requires(t testing.TB, dependencies []dependency.Instance) {
 	// Initialize dependencies only once.
 	for _, dep := range dependencies {
 		envID := d.context.Settings().Environment
+		fmt.Println("jianfieh debug dependency ", dep, envID)
 
 		switch dep {
 		case dependency.Local:
diff --git a/tests/integration2/examples/basic/basic_test.go b/tests/integration2/examples/basic/basic_test.go
@@ -16,6 +16,7 @@
 package basic
 
 import (
+	"fmt"
 	"testing"
 
 	"istio.io/istio/pkg/test/framework"
@@ -55,3 +56,10 @@ spec:
 	// As an example, the following method calls the Report operation against Mixer's own API directly.
 	m.Report(t, map[string]interface{}{})
 }
+
+func TestProbeRewrite(t *testing.T) {
+	framework.Requires(t, dependency.Apps)
+	framework.Requires(t, dependency.Pilot)
+	env := framework.AcquireEnvironment(t)
+	fmt.Println("jianfeih debug env ", env)
+}
