diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-29 22:00:56 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-29 22:00:56 +0300 |
| commit | 57ca2340edc4664729f3030f1a96081041493f4f (patch) | |
| tree | 706f70e66aeefef1bd946dea454dc014a8701997 /doc/install/kubernetes | |
| parent | 0341cfd63efcfee7422f67dd3a83df1cf392740c (diff) | |
| parent | b05a36430404aa8eaeeed8560ed03c18117f6d72 (diff) | |
Merge branch 'master' into tatkins-installation-method-docs
Diffstat (limited to 'doc/install/kubernetes')
| -rw-r--r-- | doc/install/kubernetes/gitlab_chart.md | 3 | ||||
| -rw-r--r-- | doc/install/kubernetes/gitlab_runner_chart.md | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/install/kubernetes/gitlab_chart.md b/doc/install/kubernetes/gitlab_chart.md index d3a3bb16603..5f3f49bddb5 100644 --- a/doc/install/kubernetes/gitlab_chart.md +++ b/doc/install/kubernetes/gitlab_chart.md @@ -115,8 +115,7 @@ If your SMTP server requires authentication make sure to read the section on pro your password in the [secrets documentation](https://gitlab.com/charts/gitlab/blob/master/doc/installation/secrets.md#smtp-password). You can disable authentication settings with `--set global.smtp.authentication=""`. -If your Kubernetes cluster is on GKE, be aware that SMTP ports [25, 465, and 587 -are blocked](https://cloud.google.com/compute/docs/tutorials/sending-mail/#using_standard_email_ports). +If your Kubernetes cluster is on GKE, be aware that SMTP port [25 is blocked](https://cloud.google.com/compute/docs/tutorials/sending-mail/#using_standard_email_ports). ### Deploying the Community Edition diff --git a/doc/install/kubernetes/gitlab_runner_chart.md b/doc/install/kubernetes/gitlab_runner_chart.md index f34d398a7f5..3c2f883f29d 100644 --- a/doc/install/kubernetes/gitlab_runner_chart.md +++ b/doc/install/kubernetes/gitlab_runner_chart.md @@ -84,7 +84,7 @@ rbac: ## # serviceAccountName: default -## Configuration for the Pods that that the runner launches for each new job +## Configuration for the Pods that the runner launches for each new job ## runners: ## Default container image to use for builds when none is specified |