diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-03 22:04:56 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-03 22:04:56 +0300 |
| commit | afd566347fe604d633adfebf0cd8277b860f52e0 (patch) | |
| tree | 7e5845cbe3567520a80876a4d525a5e0a1225cca /doc | |
| parent | df63d9db40e568bcca87cf7946cf518684538a31 (diff) | |
| parent | ba4a2c546982b1b615be5ed9c8b96361de3f3545 (diff) | |
Merge branch 'set-kube-ca-pem-to-file' into 'master'
Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
Closes #25753
See merge request !9398
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/integrations/kubernetes.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index cc67e667472..2a890acde4d 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -49,7 +49,8 @@ GitLab CI build environment: - `KUBE_URL` - equal to the API URL - `KUBE_TOKEN` - `KUBE_NAMESPACE` -- `KUBE_CA_PEM` - only if a custom CA bundle was specified +- `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 |