[Test Framework] Support Pilot mesh config

howardjohn · howardjohn · commit da17fe737a57 · 2019-04-19T09:08:08.000-07:00
diff --git a/pkg/test/framework/components/environment/native/native.go b/pkg/test/framework/components/environment/native/native.go
@@ -17,8 +17,6 @@ package native
 import (
 	"io"
 
-	meshConfig "istio.io/api/mesh/v1alpha1"
-	"istio.io/istio/pilot/pkg/model"
 	"istio.io/istio/pkg/test/framework/components/environment"
 	"istio.io/istio/pkg/test/framework/components/environment/api"
 	"istio.io/istio/pkg/test/framework/resource"
@@ -38,12 +36,6 @@ type Environment struct {
 	id  resource.ID
 	ctx api.Context
 
-	// TODO: It is not correct to have fixed meshconfig at the environment level. We should align this with Galley's
-	// mesh usage as well, which is per-component instantiation.
-
-	// Mesh for configuring pilot.
-	Mesh *meshConfig.MeshConfig
-
 	// SystemNamespace is the namespace used for all Istio system components.
 	SystemNamespace string
 
@@ -58,16 +50,13 @@ var _ resource.Environment = &Environment{}
 
 // New returns a new native environment.
 func New(ctx api.Context) (resource.Environment, error) {
-	mesh := model.DefaultMeshConfig()
-
 	portMgr, err := reserveport.NewPortManager()
 	if err != nil {
 		return nil, err
 	}
 
 	e := &Environment{
 		ctx:             ctx,
-		Mesh:            &mesh,
 		SystemNamespace: systemNamespace,
 		Domain:          domain,
 		PortManager:     portMgr,
diff --git a/pkg/test/framework/components/pilot/native.go b/pkg/test/framework/components/pilot/native.go
@@ -23,6 +23,7 @@ import (
 
 	meshconfig "istio.io/api/mesh/v1alpha1"
 	"istio.io/istio/pilot/pkg/bootstrap"
+	"istio.io/istio/pilot/pkg/model"
 	"istio.io/istio/pilot/pkg/proxy/envoy"
 	"istio.io/istio/pkg/test/framework/components/environment/native"
 	"istio.io/istio/pkg/test/framework/resource"
@@ -70,10 +71,16 @@ func newNative(ctx resource.Context, config Config) (Instance, error) {
 		SecureGrpcAddr: "",
 	}
 
+	tmpMesh := model.DefaultMeshConfig()
+	mesh := &tmpMesh
+	if config.MeshConfig != nil {
+		mesh = config.MeshConfig
+	}
+
 	bootstrapArgs := bootstrap.PilotArgs{
 		Namespace:        env.SystemNamespace,
 		DiscoveryOptions: options,
-		MeshConfig:       instance.environment.Mesh,
+		MeshConfig:       mesh,
 		// Use the config store for service entries as well.
 		Service: bootstrap.ServiceArgs{
 			// A ServiceEntry registry is added by default, which is what we want. Don't include any other registries.
diff --git a/pkg/test/framework/components/pilot/pilot.go b/pkg/test/framework/components/pilot/pilot.go
@@ -23,6 +23,7 @@ import (
 
 	xdsapi "github.com/envoyproxy/go-control-plane/envoy/api/v2"
 
+	meshConfig "istio.io/api/mesh/v1alpha1"
 	"istio.io/istio/pkg/test/framework/components/galley"
 	"istio.io/istio/pkg/test/framework/resource"
 )
@@ -41,6 +42,10 @@ type Config struct {
 	fmt.Stringer
 	// If set then pilot takes a dependency on the referenced Galley instance
 	Galley galley.Instance
+
+	// The MeshConfig to be used for Pilot in native environment. In Kube environment this can be
+	// configured with Helm.
+	MeshConfig *meshConfig.MeshConfig
 }
 
 // New returns a new instance of echo.
