From 19fe1d7d35a816110f26ca45171206af2399bf93 Mon Sep 17 00:00:00 2001 From: Nicolas Degory Date: Wed, 15 Nov 2017 16:41:19 -0800 Subject: [PATCH] prepare for 0.16.0 --- VERSION | 2 +- cli/command/cluster/cluster.go | 2 +- cluster/ampagent/stacks/cluster/01-core.yml | 4 ++-- cluster/ampagent/stacks/cluster/02-logs.yml | 4 ++-- cluster/ampagent/stacks/cluster/03-metrics.yml | 2 +- cluster/ampagent/stacks/single/01-core.yml | 4 ++-- cluster/ampagent/stacks/single/02-logs.yml | 4 ++-- cluster/ampagent/stacks/single/03-metrics.yml | 2 +- cluster/plugin/aws/plugin/plugin.go | 3 ++- examples/clusters/aws-swarm-asg.yml | 6 +++--- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index 8681693b5..04a373efe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.16.0-dev +0.16.0 diff --git a/cli/command/cluster/cluster.go b/cli/command/cluster/cluster.go index e8d8c3df3..41647bb68 100644 --- a/cli/command/cluster/cluster.go +++ b/cli/command/cluster/cluster.go @@ -35,7 +35,7 @@ var ( workers: 2, provider: "local", name: "", - tag: "latest", + tag: "0.16.0", registration: configuration.RegistrationDefault, notifications: true, } diff --git a/cluster/ampagent/stacks/cluster/01-core.yml b/cluster/ampagent/stacks/cluster/01-core.yml index 9d4c6b232..80c077cb4 100644 --- a/cluster/ampagent/stacks/cluster/01-core.yml +++ b/cluster/ampagent/stacks/cluster/01-core.yml @@ -54,7 +54,7 @@ services: - node.labels.amp.type.kv == true amplifier: - image: appcelerator/amplifier:${TAG:-0.15.0} + image: appcelerator/amplifier:${TAG:-0.16.0} networks: - core - monit @@ -88,7 +88,7 @@ services: mode: 0400 gateway: - image: appcelerator/gateway:${TAG:-0.15.0} + image: appcelerator/gateway:${TAG:-0.16.0} networks: - core - public diff --git a/cluster/ampagent/stacks/cluster/02-logs.yml b/cluster/ampagent/stacks/cluster/02-logs.yml index 87068919d..5278a2d9c 100644 --- a/cluster/ampagent/stacks/cluster/02-logs.yml +++ b/cluster/ampagent/stacks/cluster/02-logs.yml @@ -67,7 +67,7 @@ services: - node.labels.amp.type.mq == true ampbeat: - image: appcelerator/ampbeat:${TAG:-0.15.0} + image: appcelerator/ampbeat:${TAG:-0.16.0} networks: - core deploy: @@ -108,7 +108,7 @@ services: VIRTUAL_HOST: "http://kibana.*,https://kibana.*" agent: - image: appcelerator/agent:${TAG:-0.15.0} + image: appcelerator/agent:${TAG:-0.16.0} networks: - core deploy: diff --git a/cluster/ampagent/stacks/cluster/03-metrics.yml b/cluster/ampagent/stacks/cluster/03-metrics.yml index 0e1d1b40a..a627edf59 100644 --- a/cluster/ampagent/stacks/cluster/03-metrics.yml +++ b/cluster/ampagent/stacks/cluster/03-metrics.yml @@ -24,7 +24,7 @@ secrets: services: prometheus: - image: appcelerator/amp-prometheus:${TAG:-0.15.0} + image: appcelerator/amp-prometheus:${TAG:-0.16.0} networks: - public - monit diff --git a/cluster/ampagent/stacks/single/01-core.yml b/cluster/ampagent/stacks/single/01-core.yml index cc91d1c83..016f12039 100644 --- a/cluster/ampagent/stacks/single/01-core.yml +++ b/cluster/ampagent/stacks/single/01-core.yml @@ -47,7 +47,7 @@ services: - node.labels.amp.type.kv == true amplifier: - image: appcelerator/amplifier:${TAG:-0.15.0} + image: appcelerator/amplifier:${TAG:-0.16.0} networks: - core - monit @@ -81,7 +81,7 @@ services: mode: 0400 gateway: - image: appcelerator/gateway:${TAG:-0.15.0} + image: appcelerator/gateway:${TAG:-0.16.0} networks: - core - public diff --git a/cluster/ampagent/stacks/single/02-logs.yml b/cluster/ampagent/stacks/single/02-logs.yml index baeb23ddc..093e7ea30 100644 --- a/cluster/ampagent/stacks/single/02-logs.yml +++ b/cluster/ampagent/stacks/single/02-logs.yml @@ -58,7 +58,7 @@ services: - node.labels.amp.type.mq == true ampbeat: - image: appcelerator/ampbeat:${TAG:-0.15.0} + image: appcelerator/ampbeat:${TAG:-0.16.0} networks: - core deploy: @@ -99,7 +99,7 @@ services: VIRTUAL_HOST: "http://kibana.*,https://kibana.*" agent: - image: appcelerator/agent:${TAG:-0.15.0} + image: appcelerator/agent:${TAG:-0.16.0} networks: - core deploy: diff --git a/cluster/ampagent/stacks/single/03-metrics.yml b/cluster/ampagent/stacks/single/03-metrics.yml index 0e1d1b40a..a627edf59 100644 --- a/cluster/ampagent/stacks/single/03-metrics.yml +++ b/cluster/ampagent/stacks/single/03-metrics.yml @@ -24,7 +24,7 @@ secrets: services: prometheus: - image: appcelerator/amp-prometheus:${TAG:-0.15.0} + image: appcelerator/amp-prometheus:${TAG:-0.16.0} networks: - public - monit diff --git a/cluster/plugin/aws/plugin/plugin.go b/cluster/plugin/aws/plugin/plugin.go index 4ae091b18..2b0e945db 100644 --- a/cluster/plugin/aws/plugin/plugin.go +++ b/cluster/plugin/aws/plugin/plugin.go @@ -14,7 +14,8 @@ import ( const ( // replace latest by the version when releasing the plugin - DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/latest/aws-swarm-asg.yml" + //DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/latest/aws-swarm-asg.yml" + DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/v0.16.0/aws-swarm-asg.yml" ) // RequestOptions stores raw request input options before transformation into a AWS SDK specific diff --git a/examples/clusters/aws-swarm-asg.yml b/examples/clusters/aws-swarm-asg.yml index 8565598b1..8a63579be 100644 --- a/examples/clusters/aws-swarm-asg.yml +++ b/examples/clusters/aws-swarm-asg.yml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: Swarm cluster with autoscaling groups v0.16.0-dev +Description: Swarm cluster with autoscaling groups v0.16.0 Mappings: AMI: @@ -200,8 +200,8 @@ Parameters: Default: yes ApplicationVersion: Type: String - Description: Use the latest release version for the best result (a tag, e.g. 0.15.0) - Default: latest + Description: Use the latest release version for the best result (a tag, e.g. 0.16.0) + Default: 0.16.0 MirrorRegistry: Type: String Description: If yes, a mirror registry will be installed