diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md index 3bcf38cb402..558b5664dc5 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md @@ -71,10 +71,6 @@ Complete installation of Rancher using the instructions in [Single Node Install] /rancher/rancher:latest ``` -### High Availability Install - -Complete the installation of Rancher following the [High Availability instructions]({{< baseurl >}}/rancher/v2.x/en/installation/ha/). - ## Configuring Rancher to use the private registry Rancher needs to be configured to use the private registry as source for the needed images. diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 4ce856866ef..bc447a1320d 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -18,43 +18,6 @@ kubectl -n kube-system create serviceaccount tiller kubectl create clusterrolebinding tiller --clusterrole cluster-admin --serviceaccount=kube-system:tiller ``` -
Additional steps for Air Gap/Private Registry -

- -If you have an Air Gapped network you will need the `tiller` image available in your private registry. - -##### Create registry secret - -Create a registry secret in the `kube-system` namespace for the `tiller` ServiceAccount to use. - -``` -kubectl -n kube-system create secret docker-registry regcred \ ---docker-server="reg.example.com" \ ---docker-username= \ ---docker-password= \ ---docker-email= -``` - -##### Patch the ServiceAccount - -Update the ServiceAccount to include the imagePullSecret. Pods created with this ServiceAccount will automatically have the imagePullSecret added to their manifest. - -``` -kubectl -n kube-system patch serviceaccount tiller -p \ -'{"imagePullSecrets": [{"name\": "regcred"}]}' -``` - -##### `--tiller-image` option - -Add the --tiller-image option to the `helm init` command. - -``` ---tiller-image reg.example.com/kubernetes-helm/tiller:v2.9.1 -``` - -

-
- ##### Helm init `helm init` installs the `tiller` service in the `kube-system` namespace on your cluster. diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md index 8542eb3dd05..f139cc0b560 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md @@ -86,7 +86,7 @@ Now that Rancher is running, see [Adding TLS Secrets]({{< baseurl >}}/rancher/v2 The Rancher chart configuration has many options for customizing the install to suit your specific environment. Here are some common advanced scenarios. * [HTTP Proxy]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/#http-proxy) -* [Private Docker Image Registry/Air Gap Network]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/#private-or-air-gap-registry) +* [Private Docker Image Registry]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/#private-registry) * [TLS Termination on an External Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/#external-tls-termination) See the [Chart Options]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/) for the full list of options. diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md index d2978f92f19..2b338442f90 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md @@ -41,9 +41,9 @@ Add your IP exceptions to the `noProxy` list. Make sure you add the Service clus --set noProxy="127.0.0.1,localhost,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16" ``` -### Private or Air Gap Registry +### Private Registry -You can point to a private registry for an "Air Gap" install. +You can point to a private registry for the rancher image. #### Images diff --git a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md index 556760f3000..ab51ecfc554 100644 --- a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md +++ b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md @@ -36,10 +36,7 @@ nodes: #### Advanced configurations -RKE has many configuration options for customizing the install to suit your specific environment. Here are some common advanced scenarios. - -* [System Images for Air Gap Network]({{< baseurl >}}/rke/v0.1.x/en/config-options/system-images/) -* [Private Docker Image Registry]({{< baseurl >}}/rke/v0.1.x/en/config-options/private-registries/) +RKE has many configuration options for customizing the install to suit your specific environment. Please see the [RKE Documentation]({{< baseurl >}}/rke/v0.1.x/en/) for the full list of options and capabilities.