summaryrefslogtreecommitdiff
path: root/doc/install/kubernetes
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-07-25 12:03:25 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2018-07-25 12:03:25 +0000
commitd22db4f492d5ae676bea6bc699203d2fc120fe96 (patch)
tree11d6f715a86438f7d5061e8bd3232b5458bff09d /doc/install/kubernetes
parentfe7c6bc699e502da30b765621915480c180afa24 (diff)
parentdbf60821033889f6b90b5f0de66346a2a6efa434 (diff)
downloadgitlab-ce-d22db4f492d5ae676bea6bc699203d2fc120fe96.tar.gz
Merge branch '49025-docs-kubernetes-tiller' into 'master'
doc: Configuring and initializing Helm Tiller Closes #49025 See merge request gitlab-org/gitlab-ce!20515
Diffstat (limited to 'doc/install/kubernetes')
-rw-r--r--doc/install/kubernetes/preparation/tiller.md18
1 files changed, 11 insertions, 7 deletions
diff --git a/doc/install/kubernetes/preparation/tiller.md b/doc/install/kubernetes/preparation/tiller.md
index c92f8258e41..016aac2abeb 100644
--- a/doc/install/kubernetes/preparation/tiller.md
+++ b/doc/install/kubernetes/preparation/tiller.md
@@ -4,7 +4,7 @@ To make use of Helm, you must have a [Kubernetes][k8s-io] cluster. Ensure you ca
Helm consists of two parts, the `helm` client and a `tiller` server inside Kubernetes.
-> **Note**: If you are not able to run tiller in your cluster, for example on OpenShift, it is possible to use [tiller locally](#local-tiller) and avoid deploying it into the cluster. This should only be used when Tiller cannot be normally deployed.
+> **Note**: If you are not able to run Tiller in your cluster, for example on OpenShift, it is possible to use [Tiller locally](https://gitlab.com/charts/gitlab/tree/master/doc/helm#local-tiller) and avoid deploying it into the cluster. This should only be used when Tiller cannot be normally deployed.
## Initialize Helm and Tiller
@@ -65,28 +65,32 @@ kubectl --username=admin --password=xxxxxxxxxxxxxx create -f rbac-config.yaml
For other clusters like Amazon EKS, you can directly upload the RBAC configuration.
+```
kubectl create -f rbac-config.yaml
+```
## Initialize Helm
-Deploy Helm Tiller with a service account
+Deploy Helm Tiller with a service account:
```
helm init --service-account tiller
```
-If your cluster
-previously had Helm/Tiller installed, run the following to ensure that the deployed version of Tiller matches the local Helm version:
+If your cluster previously had Helm/Tiller installed,
+run the following to ensure that the deployed version of Tiller matches the local Helm version:
```
helm init --upgrade --service-account tiller
```
-### Patching Helm Tiller for EKS
+### Patching Helm Tiller for Amazon EKS
-Helm Tiller requires a flag to be enabled to work properly on EKS:
+Helm Tiller requires a flag to be enabled to work properly on Amazon EKS:
-`kubectl -n kube-system patch deployment tiller-deploy -p '{"spec": {"template": {"spec": {"automountServiceAccountToken": true}}}}'`
+```
+kubectl -n kube-system patch deployment tiller-deploy -p '{"spec": {"template": {"spec": {"automountServiceAccountToken": true}}}}'
+```
[helm]: https://helm.sh
[helm-using]: https://docs.helm.sh/using_helm