From 205e54d178a5478e82c2f2a0246eb34b8c13b46f Mon Sep 17 00:00:00 2001
From: Jason Greathouse <jgreat@jgreat.me>
Date: Tue, 2 Oct 2018 15:16:52 -0500
Subject: [PATCH] air-gap upgrade

---
 .../install-rancher/_index.md                 | 33 +++++++++++++++++--
 .../upgrades/ha-server-upgrade-helm/_index.md |  2 ++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md
index 8e38f50295d..41686fc0019 100644
--- a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md
+++ b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md
@@ -92,7 +92,7 @@ helm fetch stable/cert-manager
 Render the template with the option you would use to install the chart. Remember to set the `image.repository` option to pull the image from your private registry. This will create a `cert-manager` directory with the Kubernetes manifest files.
 
 ```plain
-helm template ./cert-manager-<version>.tgz --output-dir ./ \
+helm template ./cert-manager-<version>.tgz --output-dir . \
 --name cert-manager --namespace kube-system \
 --set image.repository=<REGISTRY.YOURDOMAIN.COM:PORT>/quay.io/jetstack/cert-manager-controller
 ```
@@ -114,7 +114,7 @@ helm fetch rancher-stable/rancher
 Render the template with the options you would use to install the chart. See [Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/) for details on the various options. Remember to set the `rancherImage` option to pull the image from your private registry. This will create a `rancher` directory with the Kubernetes manifest files.
 
 ```plain
-helm template ./rancher-<version>.tgz --output-dir ./ \
+helm template ./rancher-<version>.tgz --output-dir . \
 --name rancher --namespace cattle-system \
 --set hostname=<RANCHER.YOURDOMAIN.COM> \
 --set rancherImage=<REGISTRY.YOURDOMAIN.COM:PORT>/rancher/rancher
@@ -137,6 +137,35 @@ kubectl -n cattle-system apply -R -f ./rancher
 
 Make sure you follow any additional instructions required by SSL install options. See [Choose your SSL Configuration]({{< baseurl >}}rancher/v2.x/en/installation/ha/helm-rancher/#choose-your-ssl-configuration) for details.
 
+## Upgrading Rancher
+
+Update the Rancher chart repo.
+
+```plain
+helm repo update
+```
+
+Fetch the latest `rancher-stable/rancher` chart. This will pull down the chart and save it in the current directory as a `.tgz` file.
+
+```plain
+helm fetch rancher-stable/rancher
+```
+
+Render the upgrade template using the same `--set` values you used for the install. Remember to set the `--is-upgrade` flag for `helm`. This will create a `rancher` directory with the Kubernetes manifest files.
+
+```plain
+helm template ./rancher-<version>.tgz --output-dir . --is-upgrade \
+--name rancher --namespace cattle-system \
+--set hostname=<RANCHER.YOURDOMAIN.COM> \
+--set rancherImage=<REGISTRY.YOURDOMAIN.COM:PORT>/rancher/rancher
+```
+
+Copy the rendered manifests to a server with access to the Rancher server cluster and apply the rendered templates.
+
+```plain
+kubectl -n cattle-system apply -R -f ./rancher
+```
+
 {{% /tab %}}
 {{% tab "Single Node" %}}
 To deploy Rancher on a single node in an air gap environment, follow the instructions in the standard [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/). Parts of the install where you must complete a special action for air gap are flagged with a substitute step, which is listed in the subheading below.
diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md
index 4af36eb44ec..62e96cb3bf9 100644
--- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md
+++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/_index.md
@@ -40,6 +40,8 @@ The following instructions will guide you through upgrading a high-availability
 
 ## Upgrade Rancher
 
+> **Note:** For Air Gap installs see [Upgrading HA Rancher - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#upgrading-rancher)
+
 1. Update your local helm repo cache.
 
     ```