From 63d6edf1bfe048e202769547b774665a6d7ec101 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Thu, 20 Apr 2017 15:34:50 +0200 Subject: Update Kubernetes namespace documentation --- doc/user/project/integrations/kubernetes.md | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index f7d5e3a8ab2..d63c04c98ff 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -40,6 +40,13 @@ 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 `-`. +You can overwrite to use different one, if needed. +Otherwise `KUBE_NAMESPACE` will receive the default. + ## Deployment variables The Kubernetes service exposes following -- cgit v1.2.1 From ee8d9ac840ed361135bdb3b7b09f819d1a37fee3 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Thu, 20 Apr 2017 17:27:07 +0200 Subject: Move kube namespace section to the variables one --- doc/user/project/integrations/kubernetes.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'doc') 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 `-`. -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 `-`. 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 -- cgit v1.2.1