From 28e18f914c8cb6ddc954b499045b6d63605213ae Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 30 Jun 2020 19:50:25 +0100 Subject: [PATCH 1/4] Use the installCRDs option for cert-manager --- .../v2.x/en/installation/k8s-install/helm-rancher/_index.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md index 74aa80b7789..3d1e76fc86a 100644 --- a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md @@ -88,9 +88,6 @@ This step is only required to use certificates issued by Rancher's generated CA These instructions are adapted from the [official cert-manager documentation](https://cert-manager.io/docs/installation/kubernetes/#installing-with-helm). ``` -# Install the CustomResourceDefinition resources separately -kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.15.0/cert-manager.crds.yaml - # **Important:** # If you are running Kubernetes v1.15 or below, you # will need to add the `--validate=false` flag to your @@ -114,7 +111,8 @@ helm repo update helm install \ cert-manager jetstack/cert-manager \ --namespace cert-manager \ - --version v0.15.0 + --version v0.15.0 \ + --set installCRDs=true ``` Once you’ve installed cert-manager, you can verify it is deployed correctly by checking the cert-manager namespace for running pods: From 7fa88f691a17620113d39b72b87c3d91c452c862 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 22 Sep 2020 09:37:52 +0100 Subject: [PATCH 2/4] Update version. Remove CRD Flag --- .../v2.x/en/installation/k8s-install/helm-rancher/_index.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md index 3d1e76fc86a..8ea026ca56f 100644 --- a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md @@ -88,6 +88,9 @@ This step is only required to use certificates issued by Rancher's generated CA These instructions are adapted from the [official cert-manager documentation](https://cert-manager.io/docs/installation/kubernetes/#installing-with-helm). ``` +# Install the CustomResourceDefinition resources separately +kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.1/cert-manager.crds.yaml + # **Important:** # If you are running Kubernetes v1.15 or below, you # will need to add the `--validate=false` flag to your @@ -111,8 +114,7 @@ helm repo update helm install \ cert-manager jetstack/cert-manager \ --namespace cert-manager \ - --version v0.15.0 \ - --set installCRDs=true + --version v1.0.1 ``` Once you’ve installed cert-manager, you can verify it is deployed correctly by checking the cert-manager namespace for running pods: From 39686bbae17ff430e75ca6cb8d0823ef620db250 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 22 Sep 2020 09:38:22 +0100 Subject: [PATCH 3/4] Whitespace --- .../v2.x/en/installation/k8s-install/helm-rancher/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md index 8ea026ca56f..f6bcec0c245 100644 --- a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md @@ -88,8 +88,8 @@ This step is only required to use certificates issued by Rancher's generated CA These instructions are adapted from the [official cert-manager documentation](https://cert-manager.io/docs/installation/kubernetes/#installing-with-helm). ``` -# Install the CustomResourceDefinition resources separately -kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.1/cert-manager.crds.yaml +# Install the CustomResourceDefinition resources separately +kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.1/cert-manager.crds.yaml # **Important:** # If you are running Kubernetes v1.15 or below, you From 8242a26b33e5191eedb9635349f20d390fb12aad Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Tue, 10 Nov 2020 10:13:00 -0700 Subject: [PATCH 4/4] Change cert-manager version from v1.0.1 to v1.0.4 --- .../v2.x/en/installation/k8s-install/helm-rancher/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md index f6bcec0c245..3fa99ac72d8 100644 --- a/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/k8s-install/helm-rancher/_index.md @@ -89,7 +89,7 @@ These instructions are adapted from the [official cert-manager documentation](ht ``` # Install the CustomResourceDefinition resources separately -kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.1/cert-manager.crds.yaml +kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.4/cert-manager.crds.yaml # **Important:** # If you are running Kubernetes v1.15 or below, you @@ -114,7 +114,7 @@ helm repo update helm install \ cert-manager jetstack/cert-manager \ --namespace cert-manager \ - --version v1.0.1 + --version v1.0.4 ``` Once you’ve installed cert-manager, you can verify it is deployed correctly by checking the cert-manager namespace for running pods: