From 693e55d38753dd1383d5f990d28a4d366e03aeb6 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Mon, 8 Jul 2019 10:41:27 -0700 Subject: [PATCH 1/2] Specify system-charts branch for Rancher version in air gap docs --- .../config-rancher-system-charts/_index.md | 9 +++++++++ .../config-rancher-system-charts/_index.md | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md index fd1ae176f70..1c89a2e99b2 100644 --- a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md @@ -8,6 +8,15 @@ aliases: The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as monitoring, logging, alerting and global DNS. To be able to use these features in an air gap install, you will need to mirror the `system-charts` repository to a location in your network that Rancher can reach and configure Rancher to use that repository. +Use the branch of `system-charts` that corresponds to your version of Rancher: + +| Rancher Version | system-charts Repository Branch | +|-----------------|--------| +| v2.0.0 - v2.2.3 | master | +| v2.2.4+ | release-v2.2 | +| v2.3-alpha3 | v2.3-preview1 | +| v2.3-alpha5 | v2.3-preview2 | + ## B. Configure System Charts Rancher needs to be configured to use the Git mirror of the `system-charts` repository. diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md index 6317c915e3c..2d3a7596aab 100644 --- a/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md @@ -6,7 +6,16 @@ aliases: ## A. Prepare System Charts -The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as moniotring, logging, alerting and global DNS. To be able to use these features in an air gap install, you will need to mirror the `system-charts` repository to a location in your network that Rancher can reach and configure Rancher to use that repository. +The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as monitoring, logging, alerting and global DNS. To be able to use these features in an air gap install, you will need to mirror the `system-charts` repository to a location in your network that Rancher can reach and configure Rancher to use that repository. + +Use the branch of `system-charts` that corresponds to your version of Rancher: + +| Rancher Version | system-charts Repository Branch | +|-----------------|--------| +| v2.0.0 - v2.2.3 | master | +| v2.2.4+ | release-v2.2 | +| v2.3-alpha3 | v2.3-preview1 | +| v2.3-alpha5 | v2.3-preview2 | ## B. Configure System Charts From a3ef83799838c251c80f795e289aeba48f60a07f Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Tue, 16 Jul 2019 10:53:26 -0700 Subject: [PATCH 2/2] Point to release notes of system-charts for air gap installs --- .../config-rancher-system-charts/_index.md | 9 +-------- .../config-rancher-system-charts/_index.md | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md index 1c89a2e99b2..84271a410d8 100644 --- a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md @@ -8,14 +8,7 @@ aliases: The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as monitoring, logging, alerting and global DNS. To be able to use these features in an air gap install, you will need to mirror the `system-charts` repository to a location in your network that Rancher can reach and configure Rancher to use that repository. -Use the branch of `system-charts` that corresponds to your version of Rancher: - -| Rancher Version | system-charts Repository Branch | -|-----------------|--------| -| v2.0.0 - v2.2.3 | master | -| v2.2.4+ | release-v2.2 | -| v2.3-alpha3 | v2.3-preview1 | -| v2.3-alpha5 | v2.3-preview2 | +Refer to the release notes in the `system-charts` repository to see which branch corresponds to your version of Rancher. ## B. Configure System Charts diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md index 2d3a7596aab..e61d140cbf1 100644 --- a/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md @@ -8,14 +8,7 @@ aliases: The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as monitoring, logging, alerting and global DNS. To be able to use these features in an air gap install, you will need to mirror the `system-charts` repository to a location in your network that Rancher can reach and configure Rancher to use that repository. -Use the branch of `system-charts` that corresponds to your version of Rancher: - -| Rancher Version | system-charts Repository Branch | -|-----------------|--------| -| v2.0.0 - v2.2.3 | master | -| v2.2.4+ | release-v2.2 | -| v2.3-alpha3 | v2.3-preview1 | -| v2.3-alpha5 | v2.3-preview2 | +Refer to the release notes in the `system-charts` repository to see which branch corresponds to your version of Rancher. ## B. Configure System Charts