fix testenv

Mengqi Yu · Mengqi Yu · commit 0ffee9949e82 · 2018-10-26T11:20:54.000-07:00
diff --git a/pkg/envtest/server.go b/pkg/envtest/server.go
@@ -118,12 +118,13 @@ func (te *Environment) Start() (*rest.Config, error) {
 	} else {
 		te.ControlPlane = integration.ControlPlane{}
 		te.ControlPlane.APIServer = &integration.APIServer{Args: defaultKubeAPIServerFlags}
+		te.ControlPlane.Etcd = &integration.Etcd{}
 
 		if os.Getenv(envKubeAPIServerBin) == "" {
 			te.ControlPlane.APIServer.Path = defaultAssetPath("kube-apiserver")
 		}
 		if os.Getenv(envEtcdBin) == "" {
-			te.ControlPlane.Etcd = &integration.Etcd{Path: defaultAssetPath("etcd")}
+			te.ControlPlane.Etcd.Path = defaultAssetPath("etcd")
 		}
 		if os.Getenv(envKubectlBin) == "" {
 			// we can't just set the path manually (it's behind a function), so set the environment variable instead

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,13 @@ func (te Environment) Start() (rest.Config, error) {`
`118`	`118`	`} else {`
`119`	`119`	`te.ControlPlane = integration.ControlPlane{}`
`120`	`120`	`te.ControlPlane.APIServer = &integration.APIServer{Args: defaultKubeAPIServerFlags}`
	`121`	`+ te.ControlPlane.Etcd = &integration.Etcd{}`
`121`	`122`
`122`	`123`	`if os.Getenv(envKubeAPIServerBin) == "" {`
`123`	`124`	`te.ControlPlane.APIServer.Path = defaultAssetPath("kube-apiserver")`
`124`	`125`	`}`
`125`	`126`	`if os.Getenv(envEtcdBin) == "" {`
`126`		`- te.ControlPlane.Etcd = &integration.Etcd{Path: defaultAssetPath("etcd")}`
	`127`	`+ te.ControlPlane.Etcd.Path = defaultAssetPath("etcd")`
`127`	`128`	`}`
`128`	`129`	`if os.Getenv(envKubectlBin) == "" {`
`129`	`130`	`// we can't just set the path manually (it's behind a function), so set the environment variable instead`