codis release3.2 support kubernetes

Makefile

@@ -2,7 +2,7 @@
 
 export GO15VENDOREXPERIMENT=1
 
-build-all: codis-server codis-dashboard codis-proxy codis-admin codis-fe clean-gotest
+build-all: codis-server codis-dashboard codis-proxy codis-admin codis-ha codis-fe clean-gotest
 
 codis-deps:
 	@mkdir -p bin config && bash version
@@ -19,6 +19,9 @@ codis-proxy: codis-deps
 codis-admin: codis-deps
 	go build -i -o bin/codis-admin ./cmd/admin
 
+codis-ha: codis-deps
+	go build -i -o bin/codis-ha ./cmd/ha
+
 codis-fe: codis-deps
 	go build -i -o bin/codis-fe ./cmd/fe
 	@rm -rf bin/assets; cp -rf cmd/fe/assets bin/

cmd/dashboard/main.go

@@ -25,7 +25,7 @@ import (
 func main() {
 	const usage = `
 Usage:
-	codis-dashboard [--ncpu=N] [--config=CONF] [--log=FILE] [--log-level=LEVEL] [--host-admin=ADDR] [--pidfile=FILE]
+	codis-dashboard [--ncpu=N] [--config=CONF] [--log=FILE] [--log-level=LEVEL] [--host-admin=ADDR] [--zookeeper=ADDR|--etcd=ADDR|--filesystem=ROOT] [--product_name=NAME] [--product_auth=AUTH] [--pidfile=FILE] [--remove-lock]
 	codis-dashboard  --default-config
 	codis-dashboard  --version
 
@@ -88,12 +88,45 @@ Options:
 		log.Warnf("option --host-admin = %s", s)
 	}
 
+	switch {
+	case d["--zookeeper"] != nil:
+		config.CoordinatorName = "zookeeper"
+		config.CoordinatorAddr = utils.ArgumentMust(d, "--zookeeper")
+	case d["--etcd"] != nil:
+		config.CoordinatorName = "etcd"
+		config.CoordinatorAddr = utils.ArgumentMust(d, "--etcd")
+	case d["--filesystem"] != nil:
+		config.CoordinatorName = "filesystem"
+		config.CoordinatorAddr = utils.ArgumentMust(d, "--filesystem")
+	}
+
+	if s, ok := utils.Argument(d, "--product_name"); ok {
+		config.ProductName = s
+		log.Warnf("option --product_nam = %s", s)
+	}
+	if s, ok := utils.Argument(d, "--product_auth"); ok {
+		config.ProductAuth = s
+		log.Warnf("option --product_auth = %s", s)
+	}
+
 	client, err := models.NewClient(config.CoordinatorName, config.CoordinatorAddr, time.Minute)
 	if err != nil {
 		log.PanicErrorf(err, "create '%s' client to '%s' failed", config.CoordinatorName, config.CoordinatorAddr)
 	}
 	defer client.Close()
 
+	if d["--remove-lock"].(bool) {
+		store := models.NewStore(client, config.ProductName)
+		defer store.Close()
+
+		log.Warnf("force remove-lock")
+		if err := store.Release(); err != nil {
+			log.WarnErrorf(err, "force remove-lock failed")
+		} else {
+			log.Warnf("force remove-lock OK")
+		}
+	}
+
 	s, err := topom.New(client, config)
 	if err != nil {
 		log.PanicErrorf(err, "create topom with config file failed\n%s", config)