Merge branch 'kubernetes-service-namespace' into 'master'

Kubernetes service namespace Closes #30445 See merge request !10821

Merge branch 'kubernetes-service-namespace' into 'master'
631bc875 · Achilleas Pipinellis · 90e3ef50 · ee8d9ac8 · 631bc875
Commit 631bc875 authored Apr 20, 2017 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

kubernetes.md doc/user/project/integrations/kubernetes.md +6 -2

No files found.
--- a/doc/user/project/integrations/kubernetes.md
+++ b/doc/user/project/integrations/kubernetes.md
@@ -48,8 +48,12 @@ GitLab CI build environment:

 - `KUBE_URL` - equal to the API URL
 - `KUBE_TOKEN`
- `KUBE_NAMESPACE`
- `KUBE_CA_PEM_FILE` - only present if a custom CA bundle was specified. Path to a file containing PEM data.
+- `KUBE_NAMESPACE` - The Kubernetes namespace is auto-generated if not specified.
+  The default value is `<project_name>-<project_id>`. You can overwrite it to
+  use different one if needed, otherwise the `KUBE_NAMESPACE` variable will
+  receive the default value.
+- `KUBE_CA_PEM_FILE` - only present if a custom CA bundle was specified. Path
+  to a file containing PEM data.
 - `KUBE_CA_PEM` (deprecated)- only if a custom CA bundle was specified. Raw PEM data.

 ## Web terminals