From 3bfbe1fed8eed66e869bfd1d1f444395467f428d Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Thu, 21 Jun 2018 15:05:33 -0400 Subject: [PATCH 1/7] Minor polish --- doc/install/kubernetes/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md index b1cecf46697..6419a9dcb69 100644 --- a/doc/install/kubernetes/index.md +++ b/doc/install/kubernetes/index.md @@ -14,7 +14,7 @@ should be deployed, upgraded, and configured. ## Chart Overview -* **[GitLab Chart](https://gitlab.com/charts/gitlab/blob/master/README.md)**: The recommended GitLab chart, currently in beta. Support large deployments with horizontal scaling of individual GitLab components, and does not require NFS. +* **[GitLab Chart](gitlab_chart.html)**: The recommended GitLab chart, currently in beta. Supports large deployments with horizontal scaling of individual GitLab components, and does not require NFS. * **[GitLab Runner Chart](gitlab_runner_chart.md)**: For deploying just the GitLab Runner. * Other Charts * [GitLab-Omnibus](gitlab_omnibus.md): Chart based on the Omnibus GitLab linux package, only suitable for small deployments. The chart will be deprecated by the [GitLab chart](#gitlab-chart) when it is GA. @@ -26,7 +26,7 @@ should be deployed, upgraded, and configured. The best way to operate GitLab on Kubernetes. This chart contains all the required components to get started, and can scale to large deployments. -This chart includes a number of benefits: +This chart offers a number of benefits: * Horizontal scaling of individual components * No requirement for shared storage to scale * Containers do not need `root` permissions From b7b88f439ad89e633eb9f9ac30724bbc1a28bae7 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Thu, 21 Jun 2018 15:34:57 -0400 Subject: [PATCH 2/7] Fix helm update command --- doc/install/kubernetes/gitlab_chart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index 3d16b3cadd8..b7e5f802c98 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -64,7 +64,7 @@ run helm. In this example, we've named our helm release "gitlab". ``` helm repo add gitlab https://charts.gitlab.io/ -helm dependencies update +helm update helm upgrade --install gitlab gitlab/gitlab \ --timeout 600 \ --set global.hosts.domain=example.local \ From a28c8b88cd8072dcade16979b83713057cc1dd23 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Thu, 21 Jun 2018 16:07:15 -0400 Subject: [PATCH 3/7] Add additional commands for Mac OS for retrieving the password --- doc/install/kubernetes/gitlab_chart.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index b7e5f802c98..7274e94c2c3 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -81,13 +81,24 @@ the deployment is taking place if you run the command in another terminal. ### Initial login -You can access the GitLab instance by visiting the domain specified during -installation. If you manually created the secret for initial root password, you -can use that to sign in as `root` user. If not, Gitlab would've automatically +You can access the GitLab instance by visiting `gitlab.` and then the domain specified during installation. From the example above, the URL would be `https://gitlab.example.local`. + +If you manually created the secret for initial root password, you +can use that to sign in as `root` user. If not, Gitlab automatically created a random password for `root` user. This can be extracted by the following command (replace `` by name of the release - which is `gitlab` if you used the command above) +> **Note**: On some versions of Kubernetes a `%` will appear at the end of the password, do not include it. + +Mac OS: + +``` +kubectl get secret -gitlab-initial-root-password -ojsonpath={.data.password} | base64 -D +``` + +Linux: + ``` kubectl get secret -gitlab-initial-root-password -ojsonpath={.data.password} | base64 -d ``` From 816cb68c6c8d85ff015bf4e8e1113f798c7f23e7 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Thu, 21 Jun 2018 16:25:59 -0400 Subject: [PATCH 4/7] Push CPU requirement to 6 --- doc/install/kubernetes/gitlab_chart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index 7274e94c2c3..bd8a40c1bff 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -32,7 +32,7 @@ Currently out of scope: In order to deploy GitLab on Kubernetes, a few prerequisites are required. 1. `helm` and `kubectl` [installed on your computer](preparation/tools_installation.md). -1. A Kubernetes cluster, version 1.8 or higher. 4vCPU and 16GB of RAM is recommended. +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) * [Microsoft AKS](https://docs.microsoft.com/en-us/azure/aks/kubernetes-walkthrough-portal) From 7576be97268689d8850c8f9d2353b509bfbbd0bf Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Fri, 22 Jun 2018 00:08:35 -0400 Subject: [PATCH 5/7] Add a missing period --- doc/install/kubernetes/gitlab_chart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index bd8a40c1bff..3b79b1544b0 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -87,7 +87,7 @@ If you manually created the secret for initial root password, you can use that to sign in as `root` user. If not, Gitlab automatically created a random password for `root` user. This can be extracted by the following command (replace `` by name of the release - which is `gitlab` -if you used the command above) +if you used the command above). > **Note**: On some versions of Kubernetes a `%` will appear at the end of the password, do not include it. From ccbaa480e3affaa7bc55ec48cf46181043afbc9c Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Fri, 22 Jun 2018 09:26:28 -0400 Subject: [PATCH 6/7] Simplify the decode secret step --- doc/install/kubernetes/gitlab_chart.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index 3b79b1544b0..9d4d9b3d245 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -89,18 +89,8 @@ created a random password for `root` user. This can be extracted by the following command (replace `` by name of the release - which is `gitlab` if you used the command above). -> **Note**: On some versions of Kubernetes a `%` will appear at the end of the password, do not include it. - -Mac OS: - ``` -kubectl get secret -gitlab-initial-root-password -ojsonpath={.data.password} | base64 -D -``` - -Linux: - -``` -kubectl get secret -gitlab-initial-root-password -ojsonpath={.data.password} | base64 -d +kubectl get secret -gitlab-initial-root-password -ojsonpath={.data.password} | base64 --decode ``` ## Outgoing email From 2eb168c6494376a2485b2904e022f0de5a015fa9 Mon Sep 17 00:00:00 2001 From: Mike Lewis Date: Fri, 22 Jun 2018 18:43:47 +0000 Subject: [PATCH 7/7] Update gitlab_chart.md --- doc/install/kubernetes/gitlab_chart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index 9d4d9b3d245..48f3df1925a 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -81,7 +81,7 @@ the deployment is taking place if you run the command in another terminal. ### Initial login -You can access the GitLab instance by visiting `gitlab.` and then the domain specified during installation. From the example above, the URL would be `https://gitlab.example.local`. +You can access the GitLab instance by visiting the domain name beginning with `gitlab.` followed by the domain specified during installation. From the example above, the URL would be `https://gitlab.example.local`. If you manually created the secret for initial root password, you can use that to sign in as `root` user. If not, Gitlab automatically