diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-12 19:34:01 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-12 19:34:01 +0000 |
| commit | defdf45ab58db3db60d3c3411880059f90d6d2eb (patch) | |
| tree | e6ace60feedab8097fd77bb5c7899e503b405936 | |
| parent | b41fc6275ca67d37be57f5ff08f7f9b281f19d71 (diff) | |
| parent | 6f136ba1160d892a76efade28d6d1ba6b00e8fb2 (diff) | |
| download | gitlab-ce-defdf45ab58db3db60d3c3411880059f90d6d2eb.tar.gz | |
Merge branch 'patch-15' into 'master'
Add link to environments on kubernetes.md
See merge request !10555
| -rw-r--r-- | doc/user/project/integrations/kubernetes.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index 2a890acde4d..f7d5e3a8ab2 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -60,7 +60,7 @@ to use terminals. Support is currently limited to the first container in the first pod of your environment. When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals) -support to your environments. This is based on the `exec` functionality found in +support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in Docker and Kubernetes, so you get a new shell session within your existing containers. To use this integration, you should deploy to Kubernetes using the deployment variables above, ensuring any pods you create are labelled with |