Support running stability test out of cluster

tests/actions.go

@@ -234,10 +234,10 @@ func (oi *OperatorConfig) OperatorHelmSetString(m map[string]string) string {
 
 func (oa *operatorActions) DeployOperator(info *OperatorConfig) error {
 	if info.Tag != "e2e" {
-		if err := cloneOperatorRepo(); err != nil {
+		if err := oa.cloneOperatorRepo(); err != nil {
 			return err
 		}
-		if err := checkoutTag(info.Tag); err != nil {
+		if err := oa.checkoutTag(info.Tag); err != nil {
 			return err
 		}
 	}
@@ -280,7 +280,7 @@ func (oa *operatorActions) CleanOperatorOrDie(info *OperatorConfig) {
 }
 
 func (oa *operatorActions) UpgradeOperator(info *OperatorConfig) error {
-	if err := checkoutTag(info.Tag); err != nil {
+	if err := oa.checkoutTag(info.Tag); err != nil {
 		return err
 	}
 
@@ -1318,8 +1318,8 @@ func releaseIsNotFound(err error) bool {
 	return strings.Contains(err.Error(), "not found")
 }
 
-func cloneOperatorRepo() error {
-	cmd := fmt.Sprintf("git clone https://github.com/pingcap/tidb-operator.git /tidb-operator")
+func (oa *operatorActions) cloneOperatorRepo() error {
+	cmd := fmt.Sprintf("git clone https://github.com/pingcap/tidb-operator.git %s", oa.cfg.OperatorRepoDir)
 	glog.Info(cmd)
 	res, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
 	if err != nil && !strings.Contains(string(res), "already exists") {
@@ -1329,15 +1329,15 @@ func cloneOperatorRepo() error {
 	return nil
 }
 
-func checkoutTag(tagName string) error {
-	cmd := fmt.Sprintf(`cd /tidb-operator &&
+func (oa *operatorActions) checkoutTag(tagName string) error {
+	cmd := fmt.Sprintf(`cd %s &&
 		git stash -u &&
 		git checkout %s &&
 		mkdir -p /charts/%s &&
 		cp -rf charts/tidb-operator /charts/%s/tidb-operator &&
 		cp -rf charts/tidb-cluster /charts/%s/tidb-cluster &&
 		cp -rf charts/tidb-backup /charts/%s/tidb-backup`,
-		tagName, tagName, tagName, tagName, tagName)
+		oa.cfg.OperatorRepoDir, tagName, tagName, tagName, tagName, tagName)
 	glog.Info(cmd)
 	res, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
 	if err != nil {

tests/cmd/stability/main.go

@@ -21,17 +21,16 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/jinzhu/copier"
+	"github.com/pingcap/tidb-operator/tests/pkg/client"
 	"k8s.io/apiserver/pkg/util/logs"
 
 	"github.com/pingcap/tidb-operator/tests"
 	"github.com/pingcap/tidb-operator/tests/backup"
-	"github.com/pingcap/tidb-operator/tests/pkg/client"
 )
 
 func main() {
 	logs.InitLogs()
 	defer logs.FlushLogs()
-
 	go func() {
 		glog.Info(http.ListenAndServe("localhost:6060", nil))
 	}()

tests/config.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 )
 
 // Config defines the config of operator tests
@@ -22,6 +22,9 @@ type Config struct {
 	Nodes            []Nodes `yaml:"nodes" json:"nodes"`
 	ETCDs            []Nodes `yaml:"etcds" json:"etcds"`
 	APIServers       []Nodes `yaml:"apiservers" json:"apiservers"`
+
+	// For local test
+	OperatorRepoDir string `yaml:"git_repo_dir" json:"gir_repo_dir"`
 }
 
 // Nodes defines a series of nodes that belong to the same physical node.
@@ -39,6 +42,8 @@ func NewConfig() *Config {
 	flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v2.1.3,v2.1.4", "tidb versions")
 	flag.StringVar(&cfg.OperatorTag, "operator-tag", "master", "operator tag used to choose charts")
 	flag.StringVar(&cfg.OperatorImage, "operator-image", "pingcap/tidb-operator:latest", "operator image")
+	flag.StringVar(&cfg.OperatorRepoDir, "operator-repo-dir", "/tidb-operator", "local directory to which tidb-operator cloned")
+	flag.Parse()
 
 	return cfg
 }

tests/pkg/client/client.go

@@ -1,6 +1,11 @@
 package client
 
 import (
+	"flag"
+	"fmt"
+	"os"
+	"os/user"
+	"path/filepath"
 	"time"
 
 	"github.com/juju/errors"
@@ -11,31 +16,52 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
+var (
+	masterUrl      string
+	kubeconfigPath string
+)
+
+func init() {
+	flag.StringVar(&kubeconfigPath, "kubeconfig", "",
+		"path to a kubeconfig. Only required if out-of-cluster.")
+	flag.StringVar(&masterUrl, "master", "",
+		"address of the Kubernetes API server. Overrides any value in kubeconfig. "+
+			"Only required if out-of-cluster.")
+}
+
 func NewCliOrDie() (versioned.Interface, kubernetes.Interface) {
-	cfg, err := rest.InClusterConfig()
+	cfg, err := GetConfig()
 	if err != nil {
 		panic(err)
 	}
 
-	cfg.Timeout = 30 * time.Second
-	cli, err := versioned.NewForConfig(cfg)
-	if err != nil {
-		panic(err)
-	}
+	return buildClientsOrDie(cfg)
+}
 
-	kubeCli, err := kubernetes.NewForConfig(cfg)
-	if err != nil {
-		panic(err)
+func GetConfig() (*rest.Config, error) {
+	// If kubeconfigPath provided, use that
+	if len(kubeconfigPath) > 0 {
+		return clientcmd.BuildConfigFromFlags(masterUrl, kubeconfigPath)
+	}
+	// If an env variable is specified with the config locaiton, use that
+	if len(os.Getenv("KUBECONFIG")) > 0 {
+		return clientcmd.BuildConfigFromFlags(masterUrl, os.Getenv("KUBECONFIG"))
+	}
+	// If no explicit location, try the in-cluster config
+	if c, err := rest.InClusterConfig(); err == nil {
+		return c, nil
+	}
+	// If no in-cluster config, try the default location in the user's home directory
+	if usr, err := user.Current(); err == nil {
+		if c, err := clientcmd.BuildConfigFromFlags(
+			"", filepath.Join(usr.HomeDir, ".kube", "config")); err == nil {
+			return c, nil
+		}
 	}
 
-	return cli, kubeCli
+	return nil, fmt.Errorf("could not locate a kubeconfig")
 }
 
-var (
-	masterUrl      string
-	kubeconfigPath string
-)
-
 type Client interface {
 	kubernetes.Interface
 	PingcapV1alpha1() v1alpha1.PingcapV1alpha1Interface
@@ -74,3 +100,18 @@ func LoadConfig() (*rest.Config, error) {
 	cfg, err := clientcmd.BuildConfigFromFlags(masterUrl, kubeconfigPath)
 	return cfg, errors.Trace(err)
 }
+
+func buildClientsOrDie(cfg *rest.Config) (versioned.Interface, kubernetes.Interface) {
+	cfg.Timeout = 30 * time.Second
+	cli, err := versioned.NewForConfig(cfg)
+	if err != nil {
+		panic(err)
+	}
+
+	kubeCli, err := kubernetes.NewForConfig(cfg)
+	if err != nil {
+		panic(err)
+	}
+
+	return cli, kubeCli
+}