From 28daf4dc1645db495f1861eea04ab6f730dd9cb1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Wed, 17 Oct 2018 16:35:16 +0200 Subject: [PATCH] Cleanup helm/tiller + added verification steps for helm/tiller --- .../rancher/v2.x/en/installation/ha/helm-init/_index.md | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e3e9e566a66..ca03a9e1f1c 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 @@ -3,7 +3,11 @@ title: 3 - Initialize Helm (Install tiller) weight: 195 --- +<<<<<<< HEAD Helm is the package management tool of choice for Kubernetes. Helm charts provide templating syntax for Kubernetes YAML manifest documents. With Helm, we can create configurable deployments instead of just using static files. For more information about creating your own repository of deployments, check out the docs at [https://helm.sh/](https://helm.sh/). To be able to use Helm, the server-side component `tiller` needs to be installed on your cluster. +======= +Helm is the package management tool of choice for Kubernetes. Helm "charts" provide templating syntax for Kubernetes YAML manifest documents. With Helm we can create configurable deployments instead of just using static files. For more information about creating your own catalog of deployments, check out the docs at [https://helm.sh/](https://helm.sh/). To be able to use Helm, the server-side component `tiller` needs to be installed on your cluster. +>>>>>>> Cleanup helm/tiller + added verification steps for helm/tiller > **Note:** For systems without direct internet access see [Helm - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#helm) for install details. @@ -12,7 +16,11 @@ Helm is the package management tool of choice for Kubernetes. Helm charts provid Helm installs the `tiller` service on your cluster to manage charts. Since RKE enables RBAC by default we will need to use `kubectl` to create a `serviceaccount` and `clusterrolebinding` so `tiller` has permission to deploy to the cluster. * Create the `ServiceAccount` in the `kube-system` namespace. +<<<<<<< HEAD * Create the `ClusterRoleBinding` to give the `tiller` service account access to the cluster. +======= +* Create the `ClusterRoleBinding` to give the `tiller` account access to the cluster. +>>>>>>> Cleanup helm/tiller + added verification steps for helm/tiller * Finally use `helm` to install the `tiller` service ```plain