From e61a737ac30d40a3f69cf1597692ae98594ebf87 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 30 Jun 2020 20:06:59 +0100 Subject: [PATCH 1/5] Update docs for cert manager to latest version --- .../air-gap/install-rancher/_index.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 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 af59e6eacf5..dec2bf92dfe 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 @@ -85,22 +85,19 @@ 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). ```plain - helm fetch jetstack/cert-manager --version v0.12.0 + helm fetch jetstack/cert-manager --version v0.15.1 ``` 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 - helm template cert-manager ./cert-manager-v0.12.0.tgz --output-dir . \ + helm template cert-manager ./cert-manager-v0.15.1.tgz --output-dir . \ --namespace cert-manager \ --set image.repository=/quay.io/jetstack/cert-manager-controller \ --set webhook.image.repository=/quay.io/jetstack/cert-manager-webhook \ --set cainjector.image.repository=/quay.io/jetstack/cert-manager-cainjector + --set installCRDs=true ``` -1. Download the required CRD file for cert-manager - ```plain - curl -L -o cert-manager/cert-manager-crd.yaml https://raw.githubusercontent.com/jetstack/cert-manager/release-0.12/deploy/manifests/00-crds.yaml - ``` 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. @@ -183,18 +180,14 @@ If you are using self-signed certificates, install cert-manager: kubectl create namespace cert-manager ``` -1. Create the cert-manager CustomResourceDefinitions (CRDs). +1. Launch cert-manager. ```plain -kubectl apply -f cert-manager/cert-manager-crd.yaml +kubectl apply -R -f ./cert-manager ``` > **Note:** > If you are running Kubernetes v1.15 or below, you will need to add the `--validate=false` flag to your `kubectl apply` command above, or else you will receive a validation error relating to the `x-kubernetes-preserve-unknown-fields` field in cert-manager’s CustomResourceDefinition resources. This is a benign error and occurs due to the way kubectl performs resource validation. -1. Launch cert-manager. -```plain -kubectl apply -R -f ./cert-manager -``` {{% /accordion %}} From 07396216427c210f3fc84f1f794651c7418563e9 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 30 Jun 2020 20:08:00 +0100 Subject: [PATCH 2/5] Update image version --- .../air-gap/populate-private-registry/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md index 6cef213e1ae..285181f6ec0 100644 --- a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md +++ b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md @@ -59,7 +59,7 @@ In a Kubernetes Install, if you elect to use the Rancher default self-signed TLS ```plain helm repo add jetstack https://charts.jetstack.io helm repo update - helm fetch jetstack/cert-manager --version v0.12.0 + helm fetch jetstack/cert-manager --version v0.15.1 helm template ./cert-manager-.tgz | grep -oP '(?<=image: ").*(?=")' >> ./rancher-images.txt ``` From 568a5377d8e808617576d1e1b53a4487d199fc86 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 22 Sep 2020 09:41:04 +0100 Subject: [PATCH 3/5] Version 1.0.1. Revert CRD flag --- .../air-gap/install-rancher/_index.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 dec2bf92dfe..c95159ca386 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 @@ -85,17 +85,21 @@ 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). ```plain - helm fetch jetstack/cert-manager --version v0.15.1 + helm fetch jetstack/cert-manager --version v1.0.1 ``` 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 - helm template cert-manager ./cert-manager-v0.15.1.tgz --output-dir . \ + helm template cert-manager ./cert-manager-v1.0.1.tgz --output-dir . \ --namespace cert-manager \ --set image.repository=/quay.io/jetstack/cert-manager-controller \ --set webhook.image.repository=/quay.io/jetstack/cert-manager-webhook \ --set cainjector.image.repository=/quay.io/jetstack/cert-manager-cainjector - --set installCRDs=true + ``` + +1. Download the required CRD file for cert-manager + ```plain + curl -L -o cert-manager/cert-manager-crd.yaml https://github.com/jetstack/cert-manager/releases/download/v1.0.1/cert-manager.crds.yaml ``` 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. From 20cdeb1b73a67221fe6575c7dbff1935d4dd50fe Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 22 Sep 2020 09:44:30 +0100 Subject: [PATCH 4/5] Revert back CRD settings --- .../air-gap/install-rancher/_index.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 c95159ca386..3c77f17f536 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 @@ -184,14 +184,18 @@ If you are using self-signed certificates, install cert-manager: kubectl create namespace cert-manager ``` -1. Launch cert-manager. +1. Create the cert-manager CustomResourceDefinitions (CRDs). ```plain -kubectl apply -R -f ./cert-manager +kubectl apply -f cert-manager/cert-manager-crd.yaml ``` > **Note:** > If you are running Kubernetes v1.15 or below, you will need to add the `--validate=false` flag to your `kubectl apply` command above, or else you will receive a validation error relating to the `x-kubernetes-preserve-unknown-fields` field in cert-manager’s CustomResourceDefinition resources. This is a benign error and occurs due to the way kubectl performs resource validation. +1. Launch cert-manager. +```plain +kubectl apply -R -f ./cert-manager +``` {{% /accordion %}} From 588ec4334e54083174a4247644055208dfb26742 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 22 Sep 2020 09:45:45 +0100 Subject: [PATCH 5/5] Fix version to 1.0.1 --- .../air-gap/populate-private-registry/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md index 285181f6ec0..8032be68c40 100644 --- a/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md +++ b/content/rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/_index.md @@ -59,7 +59,7 @@ In a Kubernetes Install, if you elect to use the Rancher default self-signed TLS ```plain helm repo add jetstack https://charts.jetstack.io helm repo update - helm fetch jetstack/cert-manager --version v0.15.1 + helm fetch jetstack/cert-manager --version v1.0.1 helm template ./cert-manager-.tgz | grep -oP '(?<=image: ").*(?=")' >> ./rancher-images.txt ```