diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 03:08:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 03:08:50 +0000 |
commit | bb19d18713d1b3da7d564826f5e21e8d9f9f36cd (patch) | |
tree | 253b299d67af8b585e1db009244ae308d64ad9b3 /doc/topics/autodevops | |
parent | 4fe93274dec62ff7361a67be88e320131d66b788 (diff) | |
download | gitlab-ce-bb19d18713d1b3da7d564826f5e21e8d9f9f36cd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics/autodevops')
-rw-r--r-- | doc/topics/autodevops/index.md | 7 | ||||
-rw-r--r-- | doc/topics/autodevops/quick_start_guide.md | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index af33936297c..4958768f772 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -40,7 +40,7 @@ If you are using GitLab.com, see the [quick start guide](quick_start_guide.md) for how to use Auto DevOps with GitLab.com and a Kubernetes cluster on Google Kubernetes Engine (GKE). -If you are using a self-hosted instance of GitLab, you will need to configure the +If you are using a self-managed instance of GitLab, you will need to configure the [Google OAuth2 OmniAuth Provider](../../integration/google.md) before you can configure a cluster on GKE. Once this is set up, you can follow the steps on the [quick start guide](quick_start_guide.md) to get started. @@ -55,7 +55,7 @@ in multiple ways: - Auto DevOps works with any Kubernetes cluster; you're not limited to running on GitLab's infrastructure. (Note that many features also work without Kubernetes). - There is no additional cost (no markup on the infrastructure costs), and you - can use a self-hosted Kubernetes cluster or Containers as a Service on any + can use a Kubernetes cluster you host or Containers as a Service on any public cloud (for example, [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/)). - Auto DevOps has more features including security testing, performance testing, and code quality testing. @@ -93,7 +93,8 @@ knowledge of the following: Auto DevOps provides great defaults for all the stages; you can, however, [customize](#customizing) almost everything to your needs. -For an overview on the creation of Auto DevOps, read the blog post [From 2/3 of the Self-Hosted Git Market, to the Next-Generation CI System, to Auto DevOps](https://about.gitlab.com/blog/2017/06/29/whats-next-for-gitlab-ci/). +For an overview on the creation of Auto DevOps, read more +[in this blog post](https://about.gitlab.com/blog/2017/06/29/whats-next-for-gitlab-ci/). NOTE: **Note** Kubernetes clusters can [be used without](../../user/project/clusters/index.md) diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md index 32dcd60624f..d5730d16296 100644 --- a/doc/topics/autodevops/quick_start_guide.md +++ b/doc/topics/autodevops/quick_start_guide.md @@ -7,7 +7,7 @@ We will use GitLab's native Kubernetes integration, so you will not need to create a Kubernetes cluster manually using the Google Cloud Platform console. We will create and deploy a simple application that we create from a GitLab template. -These instructions will also work for a self-hosted GitLab instance; you'll just +These instructions will also work for a self-managed GitLab instance; you'll just need to ensure your own [Runners are configured](../../ci/runners/README.md) and [Google OAuth is enabled](../../integration/google.md). |