summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-07-06 13:05:50 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-07-06 13:05:50 +0000
commite0b3257b36396a43495a148b7642435c6cae82a5 (patch)
treebdee0e945bcacf24709daaf7299375dd359621cc /doc
parenta33fb2132cc9c1924fe986ce562cd7bea084a5c9 (diff)
parentdbb313c26f79e5bebf197af8eba24411fced51bb (diff)
downloadgitlab-ce-e0b3257b36396a43495a148b7642435c6cae82a5.tar.gz
Merge branch '33360-generate-kubeconfig' into 'master'
Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/integrations/kubernetes.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md
index 73fa83d72a8..bfe2672e098 100644
--- a/doc/user/project/integrations/kubernetes.md
+++ b/doc/user/project/integrations/kubernetes.md
@@ -55,6 +55,7 @@ GitLab CI build environment:
- `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.
+- `KUBECONFIG` - Path to a file containing kubeconfig for this deployment. CA bundle would be embedded if specified.
## Web terminals