diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-12-24 11:58:50 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-12-24 11:58:50 +0000 |
| commit | 86207178df03cda49153c5b3104020a2977ddbc2 (patch) | |
| tree | 59cc6256d815aed9108a60cff5a26b0dc4b07968 /doc/install | |
| parent | f044679c96251c82de310219a48cb7814dfe5143 (diff) | |
| parent | 7ac7687f6e5fdf2feebea0e98b9d60a18b927b21 (diff) | |
| download | gitlab-ce-86207178df03cda49153c5b3104020a2977ddbc2.tar.gz | |
Merge branch 'patch-35' into 'master'
Alphabetized and added IBM Kubernetes service (IKS)
See merge request gitlab-org/gitlab-ce!23824
Diffstat (limited to 'doc/install')
| -rw-r--r-- | doc/install/kubernetes/gitlab_chart.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index 74e2598f860..26ced45de7b 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -47,8 +47,9 @@ In order to deploy GitLab on Kubernetes, the following are required: 1. `helm` and `kubectl` [installed on your computer](preparation/tools_installation.md). 1. A Kubernetes cluster, version 1.8 or higher. 6vCPU and 16GB of RAM is recommended. - - [Google GKE](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-container-cluster) - [Amazon EKS](https://docs.aws.amazon.com/eks/latest/userguide/getting-started.html) + - [Google GKE](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-container-cluster) + - [IBM IKS](https://console.bluemix.net/docs/tutorials/scalable-webapp-kubernetes.html#create_kube_cluster) - [Microsoft AKS](https://docs.microsoft.com/en-us/azure/aks/kubernetes-walkthrough-portal) 1. A [wildcard DNS entry and external IP address](preparation/networking.md) 1. [Authenticate and connect](preparation/connect.md) to the cluster |