diff --git a/content/rancher/v2.x/en/installation/ha/_index.md b/content/rancher/v2.x/en/installation/ha/_index.md
index 7ad2b6b25a3..80a7fa6af48 100644
--- a/content/rancher/v2.x/en/installation/ha/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/_index.md
@@ -37,4 +37,13 @@ The following CLI tools are required for this install. Please make sure these to
## Additional Install Options
* [Migrating from RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/)
+
+## Previous Methods
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
* [RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/installation/ha/rke-add-on/)
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/_index.md
index 845423dcb06..2e32347bafa 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/_index.md
@@ -1,9 +1,14 @@
---
-title: Advanced Install - RKE Add-on
+title: RKE Add-On Install
weight: 276
---
-Rancher can be installed by providing the appropriate Kubernetes manifest configurations to RKE's `addons` feature. See the following instructions for examples appropriate to your environment.
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
* [High Availability Installation with External Load Balancer (TCP/Layer 4)]({{< baseurl >}}/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb)
* [High Availability Installation with External Load Balancer (HTTPS/Layer 7)]({{< baseurl >}}/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb)
diff --git a/content/rke/v0.1.x/en/config-options/add-ons/api-auditing/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md
similarity index 74%
rename from content/rke/v0.1.x/en/config-options/add-ons/api-auditing/_index.md
rename to content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md
index 6b4e72ff36b..f19184b574e 100644
--- a/content/rke/v0.1.x/en/config-options/add-ons/api-auditing/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md
@@ -1,8 +1,16 @@
---
-title: API Auditing
-weight: 10000
+title: Enable API Auditing
+weight: 300
+aliases:
+ - /rke/v0.1.x/en/config-options/add-ons/api-auditing/
---
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
If you're using RKE to install Rancher, you can use directives to enable API Auditing for your Rancher install. You can know what happened, when it happened, who initiated it, and what cluster it affected. API auditing records all requests and responses to and from the Rancher API, which includes use of the Rancher UI and any other use of the Rancher API through programmatic use.
## In-line Arguments
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md
index babaced624b..2272f5a42fb 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md
@@ -4,11 +4,18 @@ weight: 275
aliases:
- /rancher/v2.x/en/installation/ha-server-install/
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on:
- Layer 4 load balancer (TCP)
- [NGINX ingress controller with SSL termination (HTTPS)](https://kubernetes.github.io/ingress-nginx/)
-
+
In a HA setup that uses a layer 4 load balancer, the load balancer accepts Rancher client connections over the TCP/UDP protocols (i.e., the transport level). The load balancer then forwards these connections to individual cluster nodes without reading the request itself. Because the load balancer cannot read the packets it's forwarding, the routing decisions it can make are limited.
HA Rancher install with layer 4 load balancer, depicting SSL termination at ingress controllers
@@ -160,9 +167,9 @@ RKE uses a `.yml` config file to install and configure your Kubernetes cluster.
- [Template for self-signed certificate
`3-node-certificate.yml`](https://raw.githubusercontent.com/rancher/rancher/master/rke-templates/3-node-certificate.yml)
- [Template for certificate signed by recognized CA
`3-node-certificate-recognizedca.yml`](https://raw.githubusercontent.com/rancher/rancher/master/rke-templates/3-node-certificate-recognizedca.yml)
- >**Advanced Config Options:**
+ >**Advanced Config Options:**
>
- >- Want records of all transactions with the Rancher API? Enable the [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) feature by editing your RKE config file. For more information, see [RKE Documentation: API Auditing]({{< baseurl >}}/rke/v0.1.x/en/config-options/add-ons/api-auditing).
+ >- Want records of all transactions with the Rancher API? Enable the [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) feature by editing your RKE config file. For more information, see how to enable it in [your RKE config file]({{< baseurl >}}/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/).
>- Want to know the other config options available for your RKE template? See the [RKE Documentation: Config Options]({{< baseurl >}}/rke/v0.1.x/en/config-options/).
@@ -200,7 +207,7 @@ Once you have the `rancher-cluster.yml` config file template, edit the nodes sec
ssh_key_path: ~/.ssh/id_rsa
1. **Optional:** By default, `rancher-cluster.yml` is configured to take backup snapshots of your data. To disable these snapshots, change the `backup` directive setting to `false`, as depicted below.
-
+
services:
etcd:
backup: false
@@ -251,7 +258,7 @@ Choose from the following options:
**Step Result:** The file should look like the example below (the base64 encoded string should be different):
-
+
```yaml
---
apiVersion: v1
@@ -262,7 +269,7 @@ Choose from the following options:
type: Opaque
data:
cacerts.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNvRENDQVlnQ0NRRHVVWjZuMEZWeU16QU5CZ2txaGtpRzl3MEJBUXNGQURBU01SQXdEZ1lEVlFRRERBZDAKWlhOMExXTmhNQjRYRFRFNE1EVXdOakl4TURRd09Wb1hEVEU0TURjd05USXhNRFF3T1Zvd0VqRVFNQTRHQTFVRQpBd3dIZEdWemRDMWpZVENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNQmpBS3dQCndhRUhwQTdaRW1iWWczaTNYNlppVmtGZFJGckJlTmFYTHFPL2R0RUdmWktqYUF0Wm45R1VsckQxZUlUS3UzVHgKOWlGVlV4Mmo1Z0tyWmpwWitCUnFiZ1BNbk5hS1hocmRTdDRtUUN0VFFZdGRYMVFZS0pUbWF5NU45N3FoNTZtWQprMllKRkpOWVhHWlJabkdMUXJQNk04VHZramF0ZnZOdmJ0WmtkY2orYlY3aWhXanp2d2theHRUVjZlUGxuM2p5CnJUeXBBTDliYnlVcHlad3E2MWQvb0Q4VUtwZ2lZM1dOWmN1YnNvSjhxWlRsTnN6UjVadEFJV0tjSE5ZbE93d2oKaG41RE1tSFpwZ0ZGNW14TU52akxPRUc0S0ZRU3laYlV2QzlZRUhLZTUxbGVxa1lmQmtBZWpPY002TnlWQUh1dApuay9DMHpXcGdENkIwbkVDQXdFQUFUQU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFHTCtaNkRzK2R4WTZsU2VBClZHSkMvdzE1bHJ2ZXdia1YxN3hvcmlyNEMxVURJSXB6YXdCdFJRSGdSWXVtblVqOGo4T0hFWUFDUEthR3BTVUsKRDVuVWdzV0pMUUV0TDA2eTh6M3A0MDBrSlZFZW9xZlVnYjQrK1JLRVJrWmowWXR3NEN0WHhwOVMzVkd4NmNOQQozZVlqRnRQd2hoYWVEQmdma1hXQWtISXFDcEsrN3RYem9pRGpXbi8walI2VDcrSGlaNEZjZ1AzYnd3K3NjUDIyCjlDQVZ1ZFg4TWpEQ1hTcll0Y0ZINllBanlCSTJjbDhoSkJqa2E3aERpVC9DaFlEZlFFVFZDM3crQjBDYjF1NWcKdE03Z2NGcUw4OVdhMnp5UzdNdXk5bEthUDBvTXl1Ty82Tm1wNjNsVnRHeEZKSFh4WTN6M0lycGxlbTNZQThpTwpmbmlYZXc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
- ```
+ ```
{{% /accordion %}}
@@ -294,7 +301,7 @@ data:
tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1RENDQWN5Z0F3SUJBZ0lKQUlHc25NeG1LeGxLTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIzUmxjM1F0WTJFd0hoY05NVGd3TlRBMk1qRXdOREE1V2hjTk1UZ3dOekExTWpFd05EQTVXakFXTVJRdwpFZ1lEVlFRRERBdG9ZUzV5Ym1Ob2NpNXViRENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DCmdnRUJBTFJlMXdzekZSb2Rib2pZV05DSHA3UkdJaUVIMENDZ1F2MmdMRXNkUUNKZlcrUFEvVjM0NnQ3bSs3TFEKZXJaV3ZZMWpuY2VuWU5JSGRBU0VnU0ducWExYnhUSU9FaE0zQXpib3B0WDhjSW1OSGZoQlZETGdiTEYzUk0xaQpPM1JLTGdIS2tYSTMxZndjbU9zWGUwaElYQnpUbmxnM20vUzlXL3NTc0l1dDVwNENDUWV3TWlpWFhuUElKb21lCmpkS3VjSHFnMTlzd0YvcGVUalZrcVpuMkJHazZRaWFpMU41bldRV0pjcThTenZxTTViZElDaWlwYU9hWWQ3RFEKYWRTejV5dlF0YkxQNW4wTXpnOU43S3pGcEpvUys5QWdkWDI5cmZqV2JSekp3RzM5R3dRemN6VWtLcnZEb05JaQo0UFJHc01yclFNVXFSYjRSajNQOEJodEMxWXNDQXdFQUFhTTVNRGN3Q1FZRFZSMFRCQUl3QURBTEJnTlZIUThFCkJBTUNCZUF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdJR0NDc0dBUVVGQndNQk1BMEdDU3FHU0liM0RRRUIKQ3dVQUE0SUJBUUNKZm5PWlFLWkowTFliOGNWUW5Vdi9NZkRZVEJIQ0pZcGM4MmgzUGlXWElMQk1jWDhQRC93MgpoOUExNkE4NGNxODJuQXEvaFZYYy9JNG9yaFY5WW9jSEg5UlcvbGthTUQ2VEJVR0Q1U1k4S292MHpHQ1ROaDZ6Ci9wZTNqTC9uU0pYSjRtQm51czJheHFtWnIvM3hhaWpYZG9kMmd3eGVhTklvRjNLbHB2aGU3ZjRBNmpsQTM0MmkKVVlCZ09iN1F5KytRZWd4U1diSmdoSzg1MmUvUUhnU2FVSkN6NW1sNGc1WndnNnBTUXhySUhCNkcvREc4dElSYwprZDMxSk1qY25Fb1Rhc1Jyc1NwVmNGdXZyQXlXN2liakZyYzhienBNcE1obDVwYUZRcEZzMnIwaXpZekhwakFsCk5ZR2I2OHJHcjBwQkp3YU5DS2ErbCtLRTk4M3A3NDYwCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBdEY3WEN6TVZHaDF1aU5oWTBJZW50RVlpSVFmUUlLQkMvYUFzU3gxQUlsOWI0OUQ5ClhmanEzdWI3c3RCNnRsYTlqV09keDZkZzBnZDBCSVNCSWFlcHJWdkZNZzRTRXpjRE51aW0xZnh3aVkwZCtFRlUKTXVCc3NYZEV6V0k3ZEVvdUFjcVJjamZWL0J5WTZ4ZDdTRWhjSE5PZVdEZWI5TDFiK3hLd2k2M21uZ0lKQjdBeQpLSmRlYzhnbWlaNk4wcTV3ZXFEWDJ6QVgrbDVPTldTcG1mWUVhVHBDSnFMVTNtZFpCWWx5cnhMTytvemx0MGdLCktLbG81cGgzc05CcDFMUG5LOUMxc3MvbWZRek9EMDNzck1Xa21oTDcwQ0IxZmIydCtOWnRITW5BYmYwYkJETnoKTlNRcXU4T2cwaUxnOUVhd3l1dEF4U3BGdmhHUGMvd0dHMExWaXdJREFRQUJBb0lCQUJKYUErOHp4MVhjNEw0egpwUFd5bDdHVDRTMFRLbTNuWUdtRnZudjJBZXg5WDFBU2wzVFVPckZyTnZpK2xYMnYzYUZoSFZDUEN4N1RlMDVxClhPa2JzZnZkZG5iZFQ2RjgyMnJleVByRXNINk9TUnBWSzBmeDVaMDQwVnRFUDJCWm04eTYyNG1QZk1vbDdya2MKcm9Kd09rOEVpUHZZekpsZUd0bTAwUm1sRysyL2c0aWJsOTVmQXpyc1MvcGUyS3ZoN2NBVEtIcVh6MjlpUmZpbApiTGhBamQwcEVSMjNYU0hHR1ZqRmF3amNJK1c2L2RtbDZURDhrSzFGaUtldmJKTlREeVNXQnpPbXRTYUp1K01JCm9iUnVWWG4yZVNoamVGM1BYcHZRMWRhNXdBa0dJQWxOWjRHTG5QU2ZwVmJyU0plU3RrTGNzdEJheVlJS3BWZVgKSVVTTHM0RUNnWUVBMmNnZUE2WHh0TXdFNU5QWlNWdGhzbXRiYi9YYmtsSTdrWHlsdk5zZjFPdXRYVzkybVJneQpHcEhUQ0VubDB0Z1p3T081T1FLNjdFT3JUdDBRWStxMDJzZndwcmgwNFZEVGZhcW5QNTBxa3BmZEJLQWpmanEyCjFoZDZMd2hLeDRxSm9aelp2VkowV0lvR1ZLcjhJSjJOWGRTUVlUanZUZHhGczRTamdqNFFiaEVDZ1lFQTFBWUUKSEo3eVlza2EvS2V2OVVYbmVrSTRvMm5aYjJ1UVZXazRXSHlaY2NRN3VMQVhGY3lJcW5SZnoxczVzN3RMTzJCagozTFZNUVBzazFNY25oTTl4WE4vQ3ZDTys5b2t0RnNaMGJqWFh6NEJ5V2lFNHJPS1lhVEFwcDVsWlpUT3ZVMWNyCm05R3NwMWJoVDVZb2RaZ3IwUHQyYzR4U2krUVlEWnNFb2lFdzNkc0NnWUVBcVJLYWNweWZKSXlMZEJjZ0JycGkKQTRFalVLMWZsSjR3enNjbGFKUDVoM1NjZUFCejQzRU1YT0kvSXAwMFJsY3N6em83N3cyMmpud09mOEJSM0RBMwp6ZTRSWDIydWw4b0hGdldvdUZOTTNOZjNaNExuYXpVc0F0UGhNS2hRWGMrcEFBWGthUDJkZzZ0TU5PazFxaUNHCndvU212a1BVVE84b1ViRTB1NFZ4ZmZFQ2dZQUpPdDNROVNadUlIMFpSSitIV095enlOQTRaUEkvUkhwN0RXS1QKajVFS2Y5VnR1OVMxY1RyOTJLVVhITXlOUTNrSjg2OUZPMnMvWk85OGg5THptQ2hDTjhkOWN6enI5SnJPNUFMTApqWEtBcVFIUlpLTFgrK0ZRcXZVVlE3cTlpaHQyMEZPb3E5OE5SZDMzSGYxUzZUWDNHZ3RWQ21YSml6dDAxQ3ZHCmR4VnVnd0tCZ0M2Mlp0b0RLb3JyT2hvdTBPelprK2YwQS9rNDJBOENiL29VMGpwSzZtdmxEWmNYdUF1QVZTVXIKNXJCZjRVYmdVYndqa1ZWSFR6LzdDb1BWSjUvVUxJWk1Db1RUNFprNTZXWDk4ZE93Q3VTVFpZYnlBbDZNS1BBZApTZEpuVVIraEpnSVFDVGJ4K1dzYnh2d0FkbWErWUhtaVlPRzZhSklXMXdSd1VGOURLUEhHCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
```
-
+
{{% /accordion %}}
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/nlb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/nlb/_index.md
index 316b0ce50f4..f2e8368c779 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/nlb/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/nlb/_index.md
@@ -4,6 +4,13 @@ weight: 277
aliases:
- /rancher/v2.x/en/installation/ha-server-install/nlb/
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
## Objectives
Configuring an Amazon NLB is a multistage process. We've broken it down into multiple tasks so that it's easy to follow.
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md
index d9eae55f92b..132000ae609 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md
@@ -4,6 +4,13 @@ weight: 276
aliases:
- /rancher/v2.x/en/installation/ha-server-install-external-lb/
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on:
- Layer 7 Loadbalancer with SSL termination (HTTPS)
@@ -108,9 +115,9 @@ RKE uses a YAML config file to install and configure your Kubernetes cluster. Th
- [Template for self-signed certificate
`3-node-externalssl-certificate.yml`](https://raw.githubusercontent.com/rancher/rancher/master/rke-templates/3-node-externalssl-certificate.yml)
- [Template for certificate signed by recognized CA
`3-node-externalssl-recognizedca.yml`](https://raw.githubusercontent.com/rancher/rancher/master/rke-templates/3-node-externalssl-recognizedca.yml)
- >**Advanced Config Options:**
+ >**Advanced Config Options:**
>
- >- Want records of all transactions with the Rancher API? Enable the [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) feature by editing your RKE config file. For more information, see [RKE Documentation: API Auditing]({{< baseurl >}}/rke/v0.1.x/en/config-options/add-ons/api-auditing).
+ >- Want records of all transactions with the Rancher API? Enable the [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) feature by editing your RKE config file. For more information, see how to enable it in [your RKE config file]({{< baseurl >}}/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/).
>- Want to know the other config options available for your RKE template? See the [RKE Documentation: Config Options]({{< baseurl >}}/rke/v0.1.x/en/config-options/).
@@ -149,7 +156,7 @@ Once you have the `rancher-cluster.yml` config file template, edit the nodes sec
ssh_key_path: ~/.ssh/id_rsa
1. **Optional:** By default, `rancher-cluster.yml` is configured to take backup snapshots of your data. To disable these snapshots, change the `backup` directive setting to `false`, as depicted below.
-
+
services:
etcd:
backup: false
@@ -186,7 +193,7 @@ After replacing the values, the file should look like the example below (the bas
{{% /accordion %}}
{{% accordion id="option-b" label="Option B—Bring Your Own Certificate: Signed by Recognized CA" %}}
-If you are using a Certificate Signed By A Recognized Certificate Authority, you don't need to perform any step in this part.
+If you are using a Certificate Signed By A Recognized Certificate Authority, you don't need to perform any step in this part.
{{% /accordion %}}
## 8. Configure FQDN
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/alb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/alb/_index.md
index abeb64eaded..8d5e893f1d7 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/alb/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/alb/_index.md
@@ -4,6 +4,13 @@ weight: 277
aliases:
- /rancher/v2.x/en/installation/ha-server-install-external-lb/alb/
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
## Objectives
Configuring an Amazon ALB is a multistage process. We've broken it down into multiple tasks so that it's easy to follow.
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/nginx/_index.md
index d62c2c2c53f..515c867c974 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/nginx/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/nginx/_index.md
@@ -4,6 +4,13 @@ weight: 277
aliases:
- /rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
## Install NGINX
Start by installing NGINX on your load balancer host. NGINX has packages available for all known operating systems.
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/proxy/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/proxy/_index.md
index 05cb1f6ef2a..57b2381e1ce 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/proxy/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/proxy/_index.md
@@ -2,6 +2,13 @@
title: HTTP Proxy Configuration
weight: 277
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
If you operate Rancher behind a proxy and you want to access services through the proxy (such as retrieving catalogs), you must provide Rancher information about your proxy. As Rancher is written in Go, it uses the common proxy environment variables as shown below.
Make sure `NO_PROXY` contains the network addresses, network address ranges and domains that should be excluded from using the proxy.
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/404-default-backend/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/404-default-backend/_index.md
index 78bbfc446b6..5bcd69fc4fb 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/404-default-backend/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/404-default-backend/_index.md
@@ -5,6 +5,12 @@ aliases:
- /rancher/v2.x/en/installation/troubleshooting-ha/404-default-backend/
---
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
To debug issues around this error, you will need to download the command-line tool `kubectl`. See [Install and Set Up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) how to download `kubectl` for your platform.
When you have made changes to `rancher-cluster.yml`, you will have to run `rke remove --config rancher-cluster.yml` to clean the nodes, so it cannot conflict with previous configuration errors.
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/_index.md
index 2ab9ccf7147..dee15c33749 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/_index.md
@@ -4,6 +4,13 @@ weight: 370
aliases:
- /rancher/v2.x/en/installation/troubleshooting-ha/
---
+
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
This section contains common errors seen when setting up a High Availability Installation.
Choose from the following options:
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/generic-troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/generic-troubleshooting/_index.md
index 41ead2d7934..a529d1dfa44 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/generic-troubleshooting/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/generic-troubleshooting/_index.md
@@ -5,6 +5,12 @@ aliases:
- /rancher/v2.x/en/installation/troubleshooting-ha/generic-troubleshooting/
---
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
Below are steps that you can follow to determine what is wrong in your cluster.
### Double check if all the required ports are opened in your (host) firewall
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/job-complete-status/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/job-complete-status/_index.md
index eaec014af2d..fc6309be3d9 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/job-complete-status/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/troubleshooting/job-complete-status/_index.md
@@ -5,6 +5,12 @@ aliases:
- /rancher/v2.x/en/installation/troubleshooting-ha/job-complete-status/
---
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
To debug issues around this error, you will need to download the command-line tool `kubectl`. See [Install and Set Up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) how to download `kubectl` for your platform.
When you have made changes to `rancher-cluster.yml`, you will have to run `rke remove --config rancher-cluster.yml` to clean the nodes, so it cannot conflict with previous configuration errors.
diff --git a/content/rancher/v2.x/en/upgrades/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/_index.md
index c92ffb952e7..dc876a708c9 100644
--- a/content/rancher/v2.x/en/upgrades/upgrades/_index.md
+++ b/content/rancher/v2.x/en/upgrades/upgrades/_index.md
@@ -13,9 +13,14 @@ This section contains information about how to upgrade your Rancher server to a
- [Upgrade an HA Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm/)
- [Upgrade a Air Gap HA Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/)
-- [Migrating from a RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/)
+- [Migrating from a RKE Add-on Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/)
### Upgrading an RKE Add-on Install
-- [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/)
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+- [Upgrading a High Availability Install - RKE Add-On Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/)
diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md
index 2d98fbf9917..b494c9a0ab5 100644
--- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md
+++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md
@@ -1,10 +1,16 @@
---
-title: High Availability (HA) Upgrade - RKE Add-on
+title: HA Upgrade - RKE Add-on
weight: 1040
aliases:
- /rancher/v2.x/en/upgrades/ha-server-upgrade/
---
+> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>
+>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
+>
+>If you are currently using the RKE add-on install method, see [Migrating from a RKE add-on install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/) for details on how to move to using the helm chart.
+
This document is for upgrading Rancher HA installed with the RKE Add-On yaml. See these docs to migrate to or upgrade Rancher installed with the Helm chart.
* [Migrating from a High Availability RKE Add-on Install]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/migrating-from-rke-add-on/)
@@ -21,9 +27,9 @@ This document is for upgrading Rancher HA installed with the RKE Add-On yaml. Se
1. Change directory to the location of the RKE binary. Your `rancher-cluster.yml` file must reside in the same directory.
- >**Want records of all transactions with the Rancher API?**
+ >**Want records of all transactions with the Rancher API?**
>
- >Enable the [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) feature by editing your RKE config file (`rancher-cluster.yml`). For more information, see [RKE Documentation: API Auditing]({{< baseurl >}}/rke/v0.1.x/en/config-options/add-ons/api-auditing).
+ >Enable the [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/api-auditing) feature by editing your RKE config file (`rancher-cluster.yml`). For more information, see how to enable it in [your RKE config file]({{< baseurl >}}/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/).
1. Enter the following command. Replace `` with any name that you want to use for the snapshot (e.g. `upgrade.db`).
diff --git a/scripts/Downloads/.localized b/scripts/Downloads/.localized
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/scripts/Downloads/Untitled.txt b/scripts/Downloads/Untitled.txt
deleted file mode 100644
index 80cd5af12ba..00000000000
--- a/scripts/Downloads/Untitled.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-When setting up an airgap environment, it may be useful to run RKE through a bastion server. This can be helpful if you want to keep your RKE config or SSH keys on your local machine. This requires that the bastion server is accessible from the outside world, and has access to port 22 (SSH) on your airgapped nodes.
-
-local RKE (via port 22 over internet) -> bastion
-bastion (via port 22 over internal network) -> airgap_node_1, airgap_node_2, airgap_node3
-
-To enable running RKE through a bastion server, add the following to your RKE yaml config:
-
-```
-bastion_host:
- address: 18.224.54.35 # public IP of the bastion server
- user: ubuntu
- port: 22
- ssh_key_path: /path/to/ssh/key
-```
-
-Full ex:
-```
-bastion_host:
- address: 18.224.54.35 # public IP of the bastion server
- user: ubuntu
- port: 22
- ssh_key_path: /path/to/ssh/key
-nodes:
- - address: 172.31.6.15 # private IP of airgapped node
- user: ubuntu
- role: [ "controlplane", "etcd", "worker" ]
- ssh_key_path: /path/to/ssh/key
- - address: 172.31.12.84 # private IP of airgapped node
- user: ubuntu
- role: [ "controlplane", "etcd", "worker" ]
- ssh_key_path: /path/to/ssh/key
- - address: 172.31.15.78 # private IP of airgapped node
- user: ubuntu
- role: [ "controlplane", "etcd", "worker" ]
- ssh_key_path: /path/to/ssh/key
-private_registries:
- - url:
- user:
- password:
- is_default: true
- ```
-
- Running `rke up` will provision the k8s cluster through the bastion server, and provide the resulting kube_config. However, it's important to note that as your nodes are not accessible via a public IP, the machine you run `kubectl` from in later steps must be able to reach your airgapped nodes through the addresses provided. This may require moving the resulting kube_config after it is created.
\ No newline at end of file
diff --git a/scripts/Downloads/air-gap-files/ha-air-gap.sh b/scripts/Downloads/air-gap-files/ha-air-gap.sh
deleted file mode 100644
index 245e4ac3fbd..00000000000
--- a/scripts/Downloads/air-gap-files/ha-air-gap.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -e
-
-# Collect images for Air Gap/Private Registry install
-# Requires:
-# rke - https://rancher.com/docs/rke/v0.1.x/en/installation/
-# helm - https://docs.helm.sh/using_helm/#installing-helm
-# curl
-# jq
-
-echo "RKE Images"
-rke config --system-images 2>/dev/null > tmp-images.txt
-
-echo "Helm Tiller Image"
-helm init --dry-run --debug | grep image: | awk '{print $2}' >> tmp-images.txt
-
-echo "Rancher Images"
-latest_url=$(curl -sS "https://api.github.com/repos/rancher/rancher/releases/latest" | jq -r '.assets[]|select(.name=="rancher-images.txt")|.browser_download_url')
-curl -sSL ${latest_url} >> tmp-images.txt
-
-echo "Cert-Manager Image"
-cm_repo=$(helm inspect values stable/cert-manager | grep repository: | awk '{print $2}')
-cm_tag=$(helm inspect values stable/cert-manager | grep tag: | awk '{print $2}')
-echo "${cm_repo}:${cm_tag}" >> tmp-images.txt
-
-echo "Sort and uniq the images list"
-cat tmp-images.txt | sort -u | uniq > images.txt
-
-# cleanup tmp file
-rm tmp-images.txt
\ No newline at end of file
diff --git a/scripts/Downloads/air-gap-files/rancher-images.txt b/scripts/Downloads/air-gap-files/rancher-images.txt
deleted file mode 100644
index cdcf7256675..00000000000
--- a/scripts/Downloads/air-gap-files/rancher-images.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-busybox
-rancher/alertmanager-helper:v0.0.2
-rancher/alpine-git:1.0.4
-rancher/calico-cni:v3.1.1
-rancher/calico-ctl:v2.0.0
-rancher/calico-node:v3.1.1
-rancher/cluster-proportional-autoscaler-amd64:1.0.0
-rancher/coreos-etcd:v3.1.12
-rancher/coreos-etcd:v3.2.18
-rancher/coreos-flannel-cni:v0.2.0
-rancher/coreos-flannel:v0.9.1
-rancher/docker-elasticsearch-kubernetes:5.6.2
-rancher/fluentd-helper:v0.1.2
-rancher/fluentd:v0.1.10
-rancher/hyperkube:v1.10.5-rancher1
-rancher/hyperkube:v1.11.2-rancher1
-rancher/hyperkube:v1.9.7-rancher2
-rancher/jenkins-jenkins:2.107-slim
-rancher/jenkins-jnlp-slave:3.10-1-alpine
-rancher/jenkins-plugins-docker:17.12
-rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.10
-rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7
-rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8
-rancher/k8s-dns-kube-dns-amd64:1.14.10
-rancher/k8s-dns-kube-dns-amd64:1.14.7
-rancher/k8s-dns-kube-dns-amd64:1.14.8
-rancher/k8s-dns-sidecar-amd64:1.14.10
-rancher/k8s-dns-sidecar-amd64:1.14.7
-rancher/k8s-dns-sidecar-amd64:1.14.8
-rancher/kibana:5.6.4
-rancher/log-aggregator:v0.1.3
-rancher/metrics-server-amd64:v0.2.1
-rancher/nginx-ingress-controller-defaultbackend:1.4
-rancher/nginx-ingress-controller:0.16.2-rancher1
-rancher/pause-amd64:3.0
-rancher/pause-amd64:3.1
-rancher/prom-alertmanager:v0.11.0
-rancher/rke-tools:v0.1.13
-rancher/rancher:v2.0.8
-rancher/rancher-agent:v2.0.8
diff --git a/scripts/Downloads/air-gap-files/rancher-load-images.sh b/scripts/Downloads/air-gap-files/rancher-load-images.sh
deleted file mode 100644
index 224313d0493..00000000000
--- a/scripts/Downloads/air-gap-files/rancher-load-images.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
- echo Usage: $0 [REGISTRY]
- exit 1
-fi
-
-set -e -x
-REGISTRY=$1
-
-docker load --input rancher-images.tar.gz
-
-
-docker tag busybox ${REGISTRY}/busybox
-docker push ${REGISTRY}/busybox
-docker tag rancher/alertmanager-helper:v0.0.2 ${REGISTRY}/rancher/alertmanager-helper:v0.0.2
-docker push ${REGISTRY}/rancher/alertmanager-helper:v0.0.2
-docker tag rancher/alpine-git:1.0.4 ${REGISTRY}/rancher/alpine-git:1.0.4
-docker push ${REGISTRY}/rancher/alpine-git:1.0.4
-docker tag rancher/calico-cni:v3.1.1 ${REGISTRY}/rancher/calico-cni:v3.1.1
-docker push ${REGISTRY}/rancher/calico-cni:v3.1.1
-docker tag rancher/calico-ctl:v2.0.0 ${REGISTRY}/rancher/calico-ctl:v2.0.0
-docker push ${REGISTRY}/rancher/calico-ctl:v2.0.0
-docker tag rancher/calico-node:v3.1.1 ${REGISTRY}/rancher/calico-node:v3.1.1
-docker push ${REGISTRY}/rancher/calico-node:v3.1.1
-docker tag rancher/cluster-proportional-autoscaler-amd64:1.0.0 ${REGISTRY}/rancher/cluster-proportional-autoscaler-amd64:1.0.0
-docker push ${REGISTRY}/rancher/cluster-proportional-autoscaler-amd64:1.0.0
-docker tag rancher/coreos-etcd:v3.1.12 ${REGISTRY}/rancher/coreos-etcd:v3.1.12
-docker push ${REGISTRY}/rancher/coreos-etcd:v3.1.12
-docker tag rancher/coreos-etcd:v3.2.18 ${REGISTRY}/rancher/coreos-etcd:v3.2.18
-docker push ${REGISTRY}/rancher/coreos-etcd:v3.2.18
-docker tag rancher/coreos-flannel-cni:v0.2.0 ${REGISTRY}/rancher/coreos-flannel-cni:v0.2.0
-docker push ${REGISTRY}/rancher/coreos-flannel-cni:v0.2.0
-docker tag rancher/coreos-flannel:v0.9.1 ${REGISTRY}/rancher/coreos-flannel:v0.9.1
-docker push ${REGISTRY}/rancher/coreos-flannel:v0.9.1
-docker tag rancher/docker-elasticsearch-kubernetes:5.6.2 ${REGISTRY}/rancher/docker-elasticsearch-kubernetes:5.6.2
-docker push ${REGISTRY}/rancher/docker-elasticsearch-kubernetes:5.6.2
-docker tag rancher/fluentd-helper:v0.1.2 ${REGISTRY}/rancher/fluentd-helper:v0.1.2
-docker push ${REGISTRY}/rancher/fluentd-helper:v0.1.2
-docker tag rancher/fluentd:v0.1.10 ${REGISTRY}/rancher/fluentd:v0.1.10
-docker push ${REGISTRY}/rancher/fluentd:v0.1.10
-docker tag rancher/hyperkube:v1.10.5-rancher1 ${REGISTRY}/rancher/hyperkube:v1.10.5-rancher1
-docker push ${REGISTRY}/rancher/hyperkube:v1.10.5-rancher1
-docker tag rancher/hyperkube:v1.11.2-rancher1 ${REGISTRY}/rancher/hyperkube:v1.11.2-rancher1
-docker push ${REGISTRY}/rancher/hyperkube:v1.11.2-rancher1
-docker tag rancher/hyperkube:v1.9.7-rancher2 ${REGISTRY}/rancher/hyperkube:v1.9.7-rancher2
-docker push ${REGISTRY}/rancher/hyperkube:v1.9.7-rancher2
-docker tag rancher/jenkins-jenkins:2.107-slim ${REGISTRY}/rancher/jenkins-jenkins:2.107-slim
-docker push ${REGISTRY}/rancher/jenkins-jenkins:2.107-slim
-docker tag rancher/jenkins-jnlp-slave:3.10-1-alpine ${REGISTRY}/rancher/jenkins-jnlp-slave:3.10-1-alpine
-docker push ${REGISTRY}/rancher/jenkins-jnlp-slave:3.10-1-alpine
-docker tag rancher/jenkins-plugins-docker:17.12 ${REGISTRY}/rancher/jenkins-plugins-docker:17.12
-docker push ${REGISTRY}/rancher/jenkins-plugins-docker:17.12
-docker tag rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.10 ${REGISTRY}/rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.10
-docker push ${REGISTRY}/rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.10
-docker tag rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7 ${REGISTRY}/rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7
-docker push ${REGISTRY}/rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7
-docker tag rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8 ${REGISTRY}/rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8
-docker push ${REGISTRY}/rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8
-docker tag rancher/k8s-dns-kube-dns-amd64:1.14.10 ${REGISTRY}/rancher/k8s-dns-kube-dns-amd64:1.14.10
-docker push ${REGISTRY}/rancher/k8s-dns-kube-dns-amd64:1.14.10
-docker tag rancher/k8s-dns-kube-dns-amd64:1.14.7 ${REGISTRY}/rancher/k8s-dns-kube-dns-amd64:1.14.7
-docker push ${REGISTRY}/rancher/k8s-dns-kube-dns-amd64:1.14.7
-docker tag rancher/k8s-dns-kube-dns-amd64:1.14.8 ${REGISTRY}/rancher/k8s-dns-kube-dns-amd64:1.14.8
-docker push ${REGISTRY}/rancher/k8s-dns-kube-dns-amd64:1.14.8
-docker tag rancher/k8s-dns-sidecar-amd64:1.14.10 ${REGISTRY}/rancher/k8s-dns-sidecar-amd64:1.14.10
-docker push ${REGISTRY}/rancher/k8s-dns-sidecar-amd64:1.14.10
-docker tag rancher/k8s-dns-sidecar-amd64:1.14.7 ${REGISTRY}/rancher/k8s-dns-sidecar-amd64:1.14.7
-docker push ${REGISTRY}/rancher/k8s-dns-sidecar-amd64:1.14.7
-docker tag rancher/k8s-dns-sidecar-amd64:1.14.8 ${REGISTRY}/rancher/k8s-dns-sidecar-amd64:1.14.8
-docker push ${REGISTRY}/rancher/k8s-dns-sidecar-amd64:1.14.8
-docker tag rancher/kibana:5.6.4 ${REGISTRY}/rancher/kibana:5.6.4
-docker push ${REGISTRY}/rancher/kibana:5.6.4
-docker tag rancher/log-aggregator:v0.1.3 ${REGISTRY}/rancher/log-aggregator:v0.1.3
-docker push ${REGISTRY}/rancher/log-aggregator:v0.1.3
-docker tag rancher/metrics-server-amd64:v0.2.1 ${REGISTRY}/rancher/metrics-server-amd64:v0.2.1
-docker push ${REGISTRY}/rancher/metrics-server-amd64:v0.2.1
-docker tag rancher/nginx-ingress-controller-defaultbackend:1.4 ${REGISTRY}/rancher/nginx-ingress-controller-defaultbackend:1.4
-docker push ${REGISTRY}/rancher/nginx-ingress-controller-defaultbackend:1.4
-docker tag rancher/nginx-ingress-controller:0.16.2-rancher1 ${REGISTRY}/rancher/nginx-ingress-controller:0.16.2-rancher1
-docker push ${REGISTRY}/rancher/nginx-ingress-controller:0.16.2-rancher1
-docker tag rancher/pause-amd64:3.0 ${REGISTRY}/rancher/pause-amd64:3.0
-docker push ${REGISTRY}/rancher/pause-amd64:3.0
-docker tag rancher/pause-amd64:3.1 ${REGISTRY}/rancher/pause-amd64:3.1
-docker push ${REGISTRY}/rancher/pause-amd64:3.1
-docker tag rancher/prom-alertmanager:v0.11.0 ${REGISTRY}/rancher/prom-alertmanager:v0.11.0
-docker push ${REGISTRY}/rancher/prom-alertmanager:v0.11.0
-docker tag rancher/rke-tools:v0.1.13 ${REGISTRY}/rancher/rke-tools:v0.1.13
-docker push ${REGISTRY}/rancher/rke-tools:v0.1.13
-docker tag rancher/rancher:v2.0.8 ${REGISTRY}/rancher/rancher:v2.0.8
-docker push ${REGISTRY}/rancher/rancher:v2.0.8
-docker tag rancher/rancher-agent:v2.0.8 ${REGISTRY}/rancher/rancher-agent:v2.0.8
-docker push ${REGISTRY}/rancher/rancher-agent:v2.0.8
diff --git a/scripts/Downloads/air-gap-files/rancher-save-images.sh b/scripts/Downloads/air-gap-files/rancher-save-images.sh
deleted file mode 100644
index 5afba6c349a..00000000000
--- a/scripts/Downloads/air-gap-files/rancher-save-images.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-set -e -x
-
-docker pull busybox
-docker pull rancher/alertmanager-helper:v0.0.2
-docker pull rancher/alpine-git:1.0.4
-docker pull rancher/calico-cni:v3.1.1
-docker pull rancher/calico-ctl:v2.0.0
-docker pull rancher/calico-node:v3.1.1
-docker pull rancher/cluster-proportional-autoscaler-amd64:1.0.0
-docker pull rancher/coreos-etcd:v3.1.12
-docker pull rancher/coreos-etcd:v3.2.18
-docker pull rancher/coreos-flannel-cni:v0.2.0
-docker pull rancher/coreos-flannel:v0.9.1
-docker pull rancher/docker-elasticsearch-kubernetes:5.6.2
-docker pull rancher/fluentd-helper:v0.1.2
-docker pull rancher/fluentd:v0.1.10
-docker pull rancher/hyperkube:v1.10.5-rancher1
-docker pull rancher/hyperkube:v1.11.2-rancher1
-docker pull rancher/hyperkube:v1.9.7-rancher2
-docker pull rancher/jenkins-jenkins:2.107-slim
-docker pull rancher/jenkins-jnlp-slave:3.10-1-alpine
-docker pull rancher/jenkins-plugins-docker:17.12
-docker pull rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.10
-docker pull rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7
-docker pull rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8
-docker pull rancher/k8s-dns-kube-dns-amd64:1.14.10
-docker pull rancher/k8s-dns-kube-dns-amd64:1.14.7
-docker pull rancher/k8s-dns-kube-dns-amd64:1.14.8
-docker pull rancher/k8s-dns-sidecar-amd64:1.14.10
-docker pull rancher/k8s-dns-sidecar-amd64:1.14.7
-docker pull rancher/k8s-dns-sidecar-amd64:1.14.8
-docker pull rancher/kibana:5.6.4
-docker pull rancher/log-aggregator:v0.1.3
-docker pull rancher/metrics-server-amd64:v0.2.1
-docker pull rancher/nginx-ingress-controller-defaultbackend:1.4
-docker pull rancher/nginx-ingress-controller:0.16.2-rancher1
-docker pull rancher/pause-amd64:3.0
-docker pull rancher/pause-amd64:3.1
-docker pull rancher/prom-alertmanager:v0.11.0
-docker pull rancher/rke-tools:v0.1.13
-docker pull rancher/rancher:v2.0.8
-docker pull rancher/rancher-agent:v2.0.8
-docker save busybox rancher/alertmanager-helper:v0.0.2 rancher/alpine-git:1.0.4 rancher/calico-cni:v3.1.1 rancher/calico-ctl:v2.0.0 rancher/calico-node:v3.1.1 rancher/cluster-proportional-autoscaler-amd64:1.0.0 rancher/coreos-etcd:v3.1.12 rancher/coreos-etcd:v3.2.18 rancher/coreos-flannel-cni:v0.2.0 rancher/coreos-flannel:v0.9.1 rancher/docker-elasticsearch-kubernetes:5.6.2 rancher/fluentd-helper:v0.1.2 rancher/fluentd:v0.1.10 rancher/hyperkube:v1.10.5-rancher1 rancher/hyperkube:v1.11.2-rancher1 rancher/hyperkube:v1.9.7-rancher2 rancher/jenkins-jenkins:2.107-slim rancher/jenkins-jnlp-slave:3.10-1-alpine rancher/jenkins-plugins-docker:17.12 rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.10 rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7 rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8 rancher/k8s-dns-kube-dns-amd64:1.14.10 rancher/k8s-dns-kube-dns-amd64:1.14.7 rancher/k8s-dns-kube-dns-amd64:1.14.8 rancher/k8s-dns-sidecar-amd64:1.14.10 rancher/k8s-dns-sidecar-amd64:1.14.7 rancher/k8s-dns-sidecar-amd64:1.14.8 rancher/kibana:5.6.4 rancher/log-aggregator:v0.1.3 rancher/metrics-server-amd64:v0.2.1 rancher/nginx-ingress-controller-defaultbackend:1.4 rancher/nginx-ingress-controller:0.16.2-rancher1 rancher/pause-amd64:3.0 rancher/pause-amd64:3.1 rancher/prom-alertmanager:v0.11.0 rancher/rke-tools:v0.1.13 rancher/rancher:v2.0.8 rancher/rancher-agent:v2.0.8 | gzip -c > rancher-images.tar.gz
diff --git a/scripts/Downloads/air-gap-files/tmp-images.txt b/scripts/Downloads/air-gap-files/tmp-images.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/scripts/Downloads/system-tools-master.zip b/scripts/Downloads/system-tools-master.zip
deleted file mode 100644
index 53a072de0b4..00000000000
Binary files a/scripts/Downloads/system-tools-master.zip and /dev/null differ