summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-27 03:10:29 +0000
committerEvan Read <eread@gitlab.com>2019-08-27 03:10:29 +0000
commit5e59c919d780441a5605d76e76ce63a69166464d (patch)
tree32d70643a22d522219b8538aa1eb80c535b86f57
parent74445a5e37f348ebe529a21b891a8aa7e598aae0 (diff)
parentb1cb426663da265485191e34b3b552f9f06c6cda (diff)
downloadgitlab-ce-5e59c919d780441a5605d76e76ce63a69166464d.tar.gz
Merge branch 'docs-no-more-k8s-service-template' into 'master'
Docs: Remove mention of Kubernetes service templates See merge request gitlab-org/gitlab-ce!32093
-rw-r--r--doc/topics/autodevops/index.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 26d5221acc5..6021e8cff1d 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -111,9 +111,8 @@ To make full use of Auto DevOps, you will need:
a domain configured with wildcard DNS which is going to be used by all of your
Auto DevOps applications. [Read the specifics](#auto-devops-base-domain).
- **Kubernetes** (needed for Auto Review Apps, Auto Deploy, and Auto Monitoring) -
- To enable deployments, you will need Kubernetes 1.5+. You need a [Kubernetes cluster][kubernetes-clusters]
- for the project, or a Kubernetes [default service template](../../user/project/integrations/services_templates.md)
- for the entire GitLab installation.
+ To enable deployments, you will need Kubernetes 1.5+. You will need a [Kubernetes cluster][kubernetes-clusters]
+ for the project.
- **A load balancer** - You can use NGINX ingress by deploying it to your
Kubernetes cluster using the
[`nginx-ingress`](https://github.com/kubernetes/charts/tree/master/stable/nginx-ingress)