From 92f0b14b395c63accb1af04a0dca4bdc313a86c8 Mon Sep 17 00:00:00 2001
From: pwzgorilla <pwzgorilla@gmail.com>
Date: Fri, 11 Aug 2017 12:33:52 +0800
Subject: [PATCH 1/2] use vcluster name as the cluster name if vcluster name is
 set

---
 api/app.go       | 7 ++++++-
 types/version.go | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/app.go b/api/app.go
index d7cee8c1..564667ab 100644
--- 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/types/version.go b/types/version.go
index cebc24e6..6fd260a4 100644
--- 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"`

From f3186d40654eb2a64a902caf3673cd65fbe0c71d Mon Sep 17 00:00:00 2001
From: pwzgorilla <pwzgorilla@gmail.com>
Date: Fri, 11 Aug 2017 12:34:52 +0800
Subject: [PATCH 2/2] update api doc

---
 docs/api.md  | 1 +
 docs/json.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/api.md b/docs/api.md
index 0f2ad74d..488220e7 100644
--- 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
index 5397de7b..b20926ef 100644
--- 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": [],