Add scale policy

rancher · Jun 26, 2016 · 7338718 · 7338718
1 parent 05b6677
commit 7338718
Show file tree

Hide file tree

Showing 17 changed files with 175 additions and 210 deletions.
diff --git a/rancher/context.go b/rancher/context.go
@@ -67,6 +67,7 @@ type RancherConfig struct {
 	DefaultCert        string                                 `yaml:"default_cert,omitempty"`
 	Certs              []string                               `yaml:"certs,omitempty"`
 	Metadata           map[string]interface{}                 `yaml:"metadata,omitempty"`
+	ScalePolicy        *rancherClient.ScalePolicy             `yaml:"scale_policy,omitempty"`
 	ServiceSchemas     map[string]rancherClient.Schema        `yaml:"service_schemas,omitempty"`
 	UpgradeStrategy    rancherClient.InServiceUpgradeStrategy `yaml:"upgrade_strategy,omitempty"`
 }

diff --git a/rancher/normal.go b/rancher/normal.go
@@ -54,6 +54,7 @@ func (f *NormalFactory) config(r *RancherService) (*CompositeService, *rancherCl
 			Name:              r.name,
 			Metadata:          r.Metadata(),
 			Scale:             int64(r.getConfiguredScale()),
+			ScalePolicy:       rancherConfig.ScalePolicy,
 			RetainIp:          rancherConfig.RetainIp,
 			EnvironmentId:     r.Context().Environment.Id,
 			SelectorContainer: r.SelectorContainer(),

diff --git a/scripts/config_schema_v1.json b/scripts/config_schema_v1.json
@@ -112,6 +112,7 @@
         "restart": {"type": "string"},
         "retain_ip": {"type": "boolean"},
         "scale": {"type": "number"},
+        "scale_policy": {"type": "object"},
         "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "shm_size": {"type": ["number", "string"]},
         "stdin_open": {"type": "boolean"},

diff --git a/trash.yml b/trash.yml
@@ -49,7 +49,7 @@ import:
   version:  ecc762f6877af82d7c6f56cae2a50045951f8af1
 
 - package:  github.com/rancher/go-rancher
-  version:  6f68a5fa617dca7db1a509c2a789c1fffaca7b19
+  version:  37c17e456a2d6dce279f54ee2f957797d30a20dc
 
 - package:  github.com/rancher/rancher-catalog-service
   version:  a3a8b500adceb82b3a0387b2c7b06a60e7eeee9a

diff --git a/vendor/github.com/docker/libcompose/config/schema.go b/vendor/github.com/docker/libcompose/config/schema.go
diff --git a/vendor/github.com/rancher/go-rancher/client/generated_azureadconfig.go b/vendor/github.com/rancher/go-rancher/client/generated_azureadconfig.go
diff --git a/vendor/github.com/rancher/go-rancher/client/generated_client.go b/vendor/github.com/rancher/go-rancher/client/generated_client.go
diff --git a/vendor/github.com/rancher/go-rancher/client/generated_compose_project.go b/vendor/github.com/rancher/go-rancher/client/generated_compose_project.go