summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-07-31 08:54:19 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-07-31 08:54:19 +0000
commit8702dbcda312547dad937f63b88939ade5f0c5df (patch)
treeeed14c32cf416ea09471d2aa11e74ef23d865e2d
parentd6a2488a5bde638edc59ce425d667e13542aa27e (diff)
parent87fd224fa27da2cc1b5b01c127e90ab4a8d78036 (diff)
downloadgitlab-ce-8702dbcda312547dad937f63b88939ade5f0c5df.tar.gz
Merge branch 'docs/use-kubernetes-command' into 'master'
Help user to know what to do when deploying to cluster Closes #58947 See merge request gitlab-org/gitlab-ce!31318
-rw-r--r--doc/user/project/clusters/index.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 918944d72a1..f0d80dad94f 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -620,8 +620,16 @@ use an A record. If your external endpoint is a hostname, use a CNAME record.
## Deploying to a Kubernetes cluster
-A Kubernetes cluster can be the destination for a deployment job using special
-[deployment variables](#deployment-variables).
+A Kubernetes cluster can be the destination for a deployment job. If
+
+- The cluster is integrated with GitLab, special
+ [deployment variables](#deployment-variables) are made available to your job
+ and configuration is not required. You can immediately begin interacting with
+ the cluster from your jobs using tools such as `kubectl` or `helm`.
+- You don't use GitLab's cluster integration you can still deploy to your
+ cluster. However, you will need configure Kubernetes tools yourself
+ using [environment variables](../../../ci/variables/README.md#creating-a-custom-environment-variable)
+ before you can interact with the cluster from your jobs.
### Deployment variables