diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-20 16:31:39 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-21 01:31:33 +0800 |
| commit | 91b1f03d4419212060a21325bd1a1934c68fc9e0 (patch) | |
| tree | 6baabe81c47629ff7af908cb1d55a94d9892cf9d | |
| parent | 57d406684693a49d9d454850c9d9e7d821f6c2a0 (diff) | |
| download | gitlab-ce-91b1f03d4419212060a21325bd1a1934c68fc9e0.tar.gz | |
Merge branch 'kubernetes-service-namespace' into 'master'
Kubernetes service namespace
Closes #30445
See merge request !10821
| -rw-r--r-- | doc/user/project/integrations/kubernetes.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index f7d5e3a8ab2..73fa83d72a8 100644 --- 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 |