summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-04-20 17:27:07 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-04-20 17:27:07 +0200
commitee8d9ac840ed361135bdb3b7b09f819d1a37fee3 (patch)
tree4abf5e6e8988e707b2e83862689b7f68f16c5d34 /doc
parent63d6edf1bfe048e202769547b774665a6d7ec101 (diff)
downloadgitlab-ce-ee8d9ac840ed361135bdb3b7b09f819d1a37fee3.tar.gz
Move kube namespace section to the variables one
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/integrations/kubernetes.md15
1 files changed, 6 insertions, 9 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md
index d63c04c98ff..73fa83d72a8 100644
--- a/doc/user/project/integrations/kubernetes.md
+++ b/doc/user/project/integrations/kubernetes.md
@@ -40,13 +40,6 @@ Fill in the service token and namespace according to the values you just got.
If the API is using a self-signed TLS certificate, you'll also need to include
the `ca.crt` contents as the `Custom CA bundle`.
-## Kubernetes namespace
-
-Kubernetes namespace is auto-generated if not specified.
-The default value is `<project_name>-<project_id>`.
-You can overwrite to use different one, if needed.
-Otherwise `KUBE_NAMESPACE` will receive the default.
-
## Deployment variables
The Kubernetes service exposes following
@@ -55,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