relax restriction to allow upgrade

templates/etcd-ha/4/README.md

@@ -1,5 +1,7 @@
 # Etcd 
 
+** NOTE ** This template does not function with Rancher 1.2+, it is only present to enable an upgrade path for those who upgraded Rancher prior to upgrading their etcd service.
+
 A distributed key/value store that provides a reliable way to store data across a cluster of machines
 
 ### General

templates/etcd-ha/4/rancher-compose.yml

@@ -1,7 +1,6 @@
 .catalog:
-  version: 2.3.7
+  version: 2.3.7-beta.1
   minimum_rancher_version: v1.1.1
-  maximum_rancher_version: v1.1.4
   questions:
   - variable: SCALE
     description: Desired cluster size. 3, 5, or 7 are good choices. You will need this many hosts to reach your desired scale.

templates/etcd-ha/5/README.md

@@ -1,5 +1,9 @@
 ## Etcd v2.3.7 Persistent
 
+### Upgrade WARNING
+
+Automated upgrading to this version is only supported from `2.3.7-beta.1`. If you are on a previous version, please upgrade to `2.3.7-beta.1` before upgrading to this version. It is recommended you perform a manual backup before continuing.
+
 ### Backup Configuration
 
 Backups are enabled/disabled via the `Enable Backups` radio buttons.
@@ -21,7 +25,3 @@ See [this wiki](https://github.com/rancher/rancher/wiki/Kubernetes-Management#di
 ### Restoring Backups
 
 See [this wiki](https://github.com/rancher/rancher/wiki/Kubernetes-Management#restoring-backups) for instructions.
-
-### Upgrading to this Version: WARNING
-
-Automated upgrading to this version is unsupported. Please capture a snapshot of a node's data directory and follow backup restoration process if necessary.

templates/etcd-ha/5/docker-compose.yml

@@ -3,6 +3,7 @@ etcd:
     labels:
         io.rancher.scheduler.affinity:host_label_soft: etcd=true
         io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+        io.rancher.sidekicks: data
     environment:
         RANCHER_DEBUG: '${RANCHER_DEBUG}'
         EMBEDDED_BACKUPS: '${EMBEDDED_BACKUPS}'
@@ -11,3 +12,13 @@ etcd:
     volumes:
     - etcd:/pdata
     - ${BACKUP_LOCATION}:/data-backup
+    volumes_from:
+    - data
+data:
+  image: busybox
+  command: /bin/true
+  net: none
+  volumes:
+  - /data
+  labels:
+    io.rancher.container.start_once: 'true'

templates/etcd-ha/5/rancher-compose.yml

@@ -1,5 +1,5 @@
 .catalog:
-  version: 2.3.7-rancher2
+  version: 2.3.7-beta.2
   minimum_rancher_version: v1.2.0
   questions:
   - variable: SCALE

templates/etcd-ha/config.yml

@@ -1,5 +1,5 @@
 name: Etcd
 description: |
   A distributed key/value store that provides a reliable way to store data across a cluster of machines
-version: 2.3.7-rancher2
+version: 2.3.7-beta.2
 category: Clustering