summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-07-29 10:23:29 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-07-29 10:23:29 +0000
commit4a648828fc5716dc8f204b957ffbd7397c661676 (patch)
treef0a37b84d9f7903b61b3975dc03bb1d4a7bef231 /doc/user
parent4f90f93456421fb188448e37639bebf774274a03 (diff)
downloadgitlab-ce-4a648828fc5716dc8f204b957ffbd7397c661676.tar.gz
Fix deploy example and other fixes
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/clusters/index.md31
1 files changed, 18 insertions, 13 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 670dde6bb00..918944d72a1 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -1,11 +1,10 @@
# Kubernetes clusters
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) for
-> projects in GitLab 10.1.
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/34758) for
-> [groups](../../group/clusters/index.md) in GitLab 11.6.
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/39840) for
-> [instances](../../instance/clusters/index.md) in GitLab 11.11.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) in GitLab 10.1 for projects.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/34758) in
+> GitLab 11.6 for [groups](../../group/clusters/index.md).
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/39840) in
+> GitLab 11.11 for [instances](../../instance/clusters/index.md).
GitLab provides many features with a Kubernetes integration. Kubernetes can be
integrated with projects, but also:
@@ -76,6 +75,9 @@ you will need the Kubernetes project integration enabled.
[Read more about Auto DevOps](../../../topics/autodevops/index.md)
+NOTE: **Note**
+Kubernetes clusters can be used without Auto DevOps.
+
### Web terminals
NOTE: **Note:**
@@ -477,10 +479,10 @@ For example, let's say the following Kubernetes clusters exist in a project:
| Cluster | Environment scope |
| ----------- | ----------------- |
| Development | `*` |
-| Staging | `staging` |
| Production | `production` |
-And the following environments are set in [`.gitlab-ci.yml`](../../../ci/yaml/README.md):
+And the following environments are set in
+[`.gitlab-ci.yml`](../../../ci/yaml/README.md):
```yaml
stages:
@@ -508,9 +510,12 @@ deploy to production:
The result will then be:
-- The development cluster will be used for the "test" job.
-- The staging cluster will be used for the "deploy to staging" job.
-- The production cluster will be used for the "deploy to production" job.
+- The Development cluster details will be available in the `deploy to staging`
+ job.
+- The production cluster details will be available in the `deploy to production`
+ job.
+- No cluster details will be available in the `test` job because it doesn't
+ define any environment.
### Multiple Kubernetes clusters **(PREMIUM)**
@@ -615,8 +620,8 @@ 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 using special
+[deployment variables](#deployment-variables).
### Deployment variables