From 1591009bb7051213226ce9b11dc28853579ea0f9 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Tue, 26 Jun 2018 10:21:28 -0700 Subject: [PATCH] making changes for Denise's feedback --- content/rancher/v2.x/en/upgrades/backups/ha-backups/_index.md | 2 +- .../v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md | 2 +- .../en/upgrades/upgrade-scenarios/ha-server-upgrade/_index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/rancher/v2.x/en/upgrades/backups/ha-backups/_index.md b/content/rancher/v2.x/en/upgrades/backups/ha-backups/_index.md index cc3915dd088..53414c1c622 100644 --- a/content/rancher/v2.x/en/upgrades/backups/ha-backups/_index.md +++ b/content/rancher/v2.x/en/upgrades/backups/ha-backups/_index.md @@ -70,7 +70,7 @@ To take recurring snapshots, enable the `etcd-snapshot` service, which is a serv services: etcd: snapshot: true # enables recurring etcd snapshots - creation: 5m0s # time increment between snapshots + creation: 6h0s # time increment between snapshots retention: 24h # time increment before snapshot purge ``` diff --git a/content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md b/content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md index c92a6d94109..db678813652 100644 --- a/content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md +++ b/content/rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks/_index.md @@ -42,7 +42,7 @@ If you upgrade Rancher, but the upgrade does not complete successfully, you may ``` kubectl --kubeconfig=kube_config-rancher-cluster.yml set image deployment/cattle cattle-server=rancher/rancher: -n cattle-system ``` - Replace `` with the version that you were running before upgrade. For a list of tags available, see [DockerHub](https://hub.docker.com/r/rancher/rancher/tags/). However, don't use any tag suffixed with `-rc`, as they are used for testing and are not officially supported. + Replace `` with the version that you were running before upgrade. For a list of tags available, see the [Rancher Forum Announcements](https://forums.rancher.com/c/announcements). **Step Result:** The rollback begins. Rancher Server may be unavailable for a few minutes. diff --git a/content/rancher/v2.x/en/upgrades/upgrade-scenarios/ha-server-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrade-scenarios/ha-server-upgrade/_index.md index 2af8dcbd4fc..cd73242de9c 100644 --- a/content/rancher/v2.x/en/upgrades/upgrade-scenarios/ha-server-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrade-scenarios/ha-server-upgrade/_index.md @@ -30,7 +30,7 @@ To upgrade Rancher 2.x running in a high availability configuration, run an upgr ``` kubectl --kubeconfig=kube_config_rancher-cluster.yml set image deployment/cattle cattle-server=rancher/rancher: -n cattle-system ``` - Replace `` with the version that you want to upgrade to. For a list of tags available, see [DockerHub](https://hub.docker.com/r/rancher/rancher/tags/). However, don't use any tag suffixed with `-rc`, as they are used for testing and are not officially supported. + Replace `` with the version that you want to upgrade to. For a list of tags available, see the [Rancher Forum Announcements](https://forums.rancher.com/c/announcements). **Step Result:** The upgrade begins. Rancher Server may be unavailable for a few minutes.