Merge pull request #873 from pwzgorilla/stop

use vcluster name as cluster name
Dataman-Cloud · Aug 11, 2017 · 6d3d8ef · 6d3d8ef
2 parents 2fcf0f1 + f3186d4
commit 6d3d8ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/api/app.go b/api/app.go
@@ -60,8 +60,13 @@ func (r *Server) createApp(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	cluster := r.driver.ClusterName()
+	if c := utils.StripSpaces(version.Cluster); c != "" {
+		cluster = c
+	}
+
 	var (
-		id      = fmt.Sprintf("%s.%s.%s.%s", version.Name, compose, version.RunAs, r.driver.ClusterName())
+		id      = fmt.Sprintf("%s.%s.%s.%s", version.Name, compose, version.RunAs, cluster)
 		count   = int(version.Instances)
 		restart = version.RestartPolicy
 		retries = 3

diff --git a/docs/api.md b/docs/api.md
@@ -180,6 +180,7 @@ Example request:
   "mem": 32,
   "disk": 0,
   "runAs": "xcm",
+  "cluster": "cctv",
   "instances": 10,
   "constraints": [],
   "container": {

diff --git a/docs/json.md b/docs/json.md
@@ -9,6 +9,7 @@
   "mem": 32,
   "disk": 0,
   "runAs": "xcm",
+  "cluster": "cctv",
   "priority": 100,
   "instances": 10,
   "constraints": [],

diff --git a/types/version.go b/types/version.go
@@ -48,6 +48,7 @@ type Version struct {
 	Disk          float64           `json:"disk"`
 	Instances     int32             `json:"instances"`
 	RunAs         string            `json:"runAs"`
+	Cluster       string            `json:"cluster"`
 	Container     *Container        `json:"container"`
 	Labels        map[string]string `json:"labels"`
 	HealthCheck   *HealthCheck      `json:"healthCheck"`