summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-13 12:27:53 +0000
committerPhil Hughes <me@iamphill.com>2017-06-13 12:27:53 +0000
commite44502f6158be36ff78bf0ecc7e3af9a570a5e44 (patch)
treeac00655024e03a971de55536ae0ace0cf255d570
parent323d9f1f5767d74d4aaa858b9e07677430571ac3 (diff)
parent252e248e1993023f56411ee8716d4966c694470c (diff)
downloadgitlab-ce-e44502f6158be36ff78bf0ecc7e3af9a570a5e44.tar.gz
Merge branch 'updating-k8s-page' into 'master'
Added Tectonic to the page. See merge request !12126
-rw-r--r--doc/install/kubernetes/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/kubernetes/index.md b/doc/install/kubernetes/index.md
index 88c56a1d17c..5ea08869a9b 100644
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
@@ -1,7 +1,7 @@
# Installing GitLab on Kubernetes
> Officially supported cloud providers are Google Container Service and Azure Container Service.
-> Officially supported schedulers are Kubernetes and Terraform.
+> Officially supported schedulers are Kubernetes, Terraform and Tectonic.
The easiest method to deploy GitLab in [Kubernetes](https://kubernetes.io/) is
to take advantage of the official GitLab Helm charts. [Helm] is a package