From bcaac5b969f6b59fc6401e86a51263843620f50b Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Mon, 27 Jan 2020 13:41:12 -0700 Subject: [PATCH] Make air gap doc consistent with other install doc --- .../air-gap/install-rancher/_index.md | 25 +------------------ .../single-node/_index.md | 2 +- .../upgrades/upgrades/single-node/_index.md | 4 +-- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md index 33c3ea95253..f1b375bbca1 100644 --- a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/_index.md @@ -87,16 +87,10 @@ By default, Rancher generates a CA and uses cert-manager to issue the certificat ``` 1. Fetch the latest cert-manager chart available from the [Helm chart repository](https://hub.helm.sh/charts/jetstack/cert-manager). -<<<<<<< HEAD - ```plain - helm fetch jetstack/cert-manager --version v0.9.1 - ``` -======= ```plain helm fetch jetstack/cert-manager --version v0.12.0 ``` ->>>>>>> Revert "Revert "Updated cert-manager installation/upgrade docs"" 1. Render the cert manager template with the options you would like to 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 @@ -113,14 +107,6 @@ By default, Rancher generates a CA and uses cert-manager to issue the certificat ``` 1. Render the Rancher template, declaring your chosen options. Use the reference table below to replace each placeholder. Rancher needs to be configured to use the private registry in order to provision any Rancher launched Kubernetes clusters or Rancher tools. -<<<<<<< HEAD -Placeholder | Description - ------------|------------- -`` | The version number of the output tarball. -`` | The DNS name you pointed at your load balancer. -`` | The DNS name for your private registry. - ```plain -======= Placeholder | Description ------------|------------- @@ -130,7 +116,6 @@ Placeholder | Description `` | Cert-manager version running on k8s cluster. ```plain ->>>>>>> Revert "Revert "Updated cert-manager installation/upgrade docs"" helm template ./rancher-.tgz --output-dir . \ --name rancher \ --namespace cattle-system \ @@ -188,14 +173,6 @@ If you are using self-signed certificates, install cert-manager: kubectl create namespace cert-manager ``` -<<<<<<< HEAD -1. Label the cert-manager namespace to disable resource validation. -```plain -kubectl label namespace cert-manager certmanager.k8s.io/disable-validation=true -``` - -======= ->>>>>>> Revert "Revert "Updated cert-manager installation/upgrade docs"" 1. Create the cert-manager CustomResourceDefinitions (CRDs). ```plain kubectl apply -f cert-manager/cert-manager-crd.yaml @@ -290,7 +267,7 @@ After creating your certificate, log into your Linux host, and then run the inst | `` | The path to the directory containing your certificate files. | | `` | The path to your full certificate chain. | | `` | The path to the private key for your certificate. | -| `` | The path to the certificate authority's private key. | +| `` | The path to the certificate authority's certificate. | | `` | Your private registry URL and port. | | `` | The release tag of the [Rancher version]({{< baseurl >}}/rancher/v2.x/en/installation/options/server-tags/) that you want to install. | diff --git a/content/rancher/v2.x/en/installation/other-installation-methods/single-node/_index.md b/content/rancher/v2.x/en/installation/other-installation-methods/single-node/_index.md index 1eba31f9b01..a1fdee2cab6 100644 --- a/content/rancher/v2.x/en/installation/other-installation-methods/single-node/_index.md +++ b/content/rancher/v2.x/en/installation/other-installation-methods/single-node/_index.md @@ -61,7 +61,7 @@ After creating your certificate, run the Docker command below to install Rancher | `` | The path to the directory containing your certificate files. | | `` | The path to your full certificate chain. | | `` | The path to the private key for your certificate. | -| `` | The path to the certificate authority's private key. | +| `` | The path to the certificate authority's certificate. | ``` docker run -d --restart=unless-stopped \ diff --git a/content/rancher/v2.x/en/upgrades/upgrades/single-node/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/single-node/_index.md index 508fd896d70..bba806e9927 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/single-node/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/single-node/_index.md @@ -156,7 +156,7 @@ Placeholder | Description `` | The path to the directory containing your certificate files. `` | The path to your full certificate chain. `` | The path to the private key for your certificate. -`` | The path to the certificate authority's private key. +`` | The path to the certificate authority's certificate. `` | The release tag of the [Rancher version]({{< baseurl >}}/rancher/v2.x/en/installation/options/server-tags/) that you want to upgrade to. ``` @@ -263,7 +263,7 @@ Placeholder | Description `` | The path to the directory containing your certificate files. `` | The path to your full certificate chain. `` | The path to the private key for your certificate. -`` | The path to the certificate authority's private key. +`` | The path to the certificate authority's certificate. `` | Your private registry URL and port. `` | The release tag of the [Rancher version]({{< baseurl >}}/rancher/v2.x/en/installation/options/server-tags/) that you want to upgrade to.