diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md index 5ccf9b0fa9d..3afce1a2f39 100644 --- a/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md @@ -24,6 +24,6 @@ The following CLI tools are required for this install. Make sure these tools are - [3. Install Kubernetes with RKE]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/install-kube/) - [4. Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/install-rancher/) - [5. Configure Rancher for the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/) - +- [6. Configure Rancher System Charts]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/) ### [Next: Create Nodes and Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts/) diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md index b5d0a5cc75f..ef20c1718c9 100644 --- a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md @@ -1,6 +1,6 @@ --- title: "5. Configure Rancher for the Private Registry" -weight: +weight: 500 aliases: --- @@ -21,4 +21,6 @@ Rancher needs to be configured to use the private registry in order to provision 1. Change the value to your registry (e.g. `registry.yourdomain.com:port`). Do not prefix the registry with `http://` or `https://`. - ![Save]({{< baseurl >}}/img/rancher/airgap/enter-system-default-registry.png) \ No newline at end of file + ![Save]({{< baseurl >}}/img/rancher/airgap/enter-system-default-registry.png) + +### [Next: Configure Rancher System Charts]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/) 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 new file mode 100644 index 00000000000..2884a065f00 --- /dev/null +++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md @@ -0,0 +1,27 @@ +--- +title: "6. Configure Rancher System Charts" +weight: 600 +aliases: +--- + +## A. Prepare System Charts + +The [System Charts](https://github.com/rancher/system-charts) contains all the catalog items required for features such as moniotring, logging, alerting and global DNS. To keep these features working, you will need to make that the `rancher/rancher` container can either access `https://git.rancher.io/system-charts.git` or that you configure the system charts to be updated from your own mirrored Git repository. + +## B. Configure System Charts + +Rancher needs to be configured to use the mirrored Git repository if the `rancher/rancher` container cannot access `https://git.rancher.io/system-charts.git` + +1. Log into Rancher. + +1. Open `https:///v3/catalogs/system-library` in your browser. + + ![Open]({{< baseurl >}}/img/rancher/airgap/system-charts-setting.png) + +1. Click **Edit** on the upper right corner and update the **url**. + + ![Update]({{< baseurl >}}/img/rancher/airgap/system-charts-update.png) + +1. Click **Show Request** + +1. Click **Send Request** diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md index 3f7fd9e6302..ee1286bad76 100644 --- a/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md @@ -15,6 +15,6 @@ Rancher supports air gap installs using a private registry. You must have your o - [2. Prepare Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/prepare-private-registry/) - [3. Choose an SSL Option and Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/install-rancher/) - [4. Configure Rancher for Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/) - +- [5. Configure Rancher System Charts]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/) ### [Next: Provision Linux Host]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/provision-host/) diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md index 4d9a28bbfc4..cbb98837736 100644 --- a/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md @@ -20,4 +20,6 @@ Rancher needs to be configured to use the private registry in order to provision ![Save]({{< baseurl >}}/img/rancher/airgap/enter-system-default-registry.png) ->**Note:** If you want to configure the setting when starting the rancher/rancher container, you can use the environment variable `CATTLE_SYSTEM_DEFAULT_REGISTRY`. \ No newline at end of file +>**Note:** If you want to configure the setting when starting the rancher/rancher container, you can use the environment variable `CATTLE_SYSTEM_DEFAULT_REGISTRY`. + +### [Next: Configure Rancher System Charts]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-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 new file mode 100644 index 00000000000..9309ab3178b --- /dev/null +++ b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md @@ -0,0 +1,27 @@ +--- +title: "5. Configure Rancher System Charts" +weight: 500 +aliases: +--- + +## A. Prepare System Charts + +The [System Charts](https://github.com/rancher/system-charts) contains all the catalog items required for features such as moniotring, logging, alerting and global DNS. To keep these features working, you will need to make that the `rancher/rancher` container can either access `https://git.rancher.io/system-charts.git` or that you configure the system charts to be updated from your own mirrored Git repository. + +## B. Configure System Charts + +Rancher needs to be configured to use the mirrored Git repository if the `rancher/rancher` container cannot access `https://git.rancher.io/system-charts.git` + +1. Log into Rancher. + +1. Open `https:///v3/catalogs/system-library` in your browser. + + ![Open]({{< baseurl >}}/img/rancher/airgap/system-charts-setting.png) + +1. Click **Edit** on the upper right corner and update the **url**. + + ![Update]({{< baseurl >}}/img/rancher/airgap/system-charts-update.png) + +1. Click **Show Request** + +1. Click **Send Request** diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md index 78c210d6708..26b59288f0d 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade-helm-airgap/_index.md @@ -27,6 +27,9 @@ The following instructions will guide you through upgrading a high-availability - **Upgrades to v2.0.7+ only: check system namespace locations** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). +- **Upgrades to v2.2.0 only: make sure your own mirrored system charts up to date** + Starting in v2.2.0, Rancher introduced the [System Charts](https://github.com/rancher/system-charts) contains all the catalog items required for features such as moniotring, logging, alerting and global DNS. During upgrade to v2.2.0, Rancher expects that the `rancher/rancher` container can either access `https://git.rancher.io/system-charts.git` or that you configure the system charts to be updated from your own mirrored Git repository. Follow the directions in Air Gap Installation to [configure Rancher system charts]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-system-charts/) required for the new version of Rancher. + ## Caveats Upgrades _to_ or _from_ any chart in the [rancher-alpha repository]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories/) aren't supported. diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md index a2cf879b84a..4df80de7435 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node-air-gap-upgrade/_index.md @@ -9,6 +9,7 @@ To upgrade an air gapped Rancher Server, update your private registry with the l ## Prerequisites **Upgrades to v2.0.7+ only:** Starting in v2.0.7, Rancher introduced the `system` project, which is a project that's automatically created to store important namespaces that Kubernetes needs to operate. During upgrade to v2.0.7+, Rancher expects these namespaces to be unassigned from all projects. Before beginning upgrade, check your system namespaces to make sure that they're unassigned to [prevent cluster networking issues]({{< baseurl >}}/rancher/v2.x/en/upgrades/upgrades/namespace-migration/#preventing-cluster-networking-issues). +**Upgrades to v2.2.0 only:** Starting in v2.2.0, Rancher introduced the [System Charts](https://github.com/rancher/system-charts) contains all the catalog items required for features such as moniotring, logging, alerting and global DNS. During upgrade to v2.2.0, Rancher expects that the `rancher/rancher` container can either access `https://git.rancher.io/system-charts.git` or that you configure the system charts to be updated from your own mirrored Git repository. Follow the directions in Air Gap Installation to [configure Rancher system charts]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-system-charts/) required for the new version of Rancher. ## Caveats Upgrades _to_ or _from_ any tag containing [alpha]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#server-tags) aren't supported. diff --git a/static/img/rancher/airgap/system-charts-setting.png b/static/img/rancher/airgap/system-charts-setting.png new file mode 100644 index 00000000000..a50db5b3fef Binary files /dev/null and b/static/img/rancher/airgap/system-charts-setting.png differ diff --git a/static/img/rancher/airgap/system-charts-update.png b/static/img/rancher/airgap/system-charts-update.png new file mode 100644 index 00000000000..ed0ac20954d Binary files /dev/null and b/static/img/rancher/airgap/system-charts-update.png differ