diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-20 09:20:06 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-06-20 13:56:42 +0000 |
| commit | 2b7a199f13b2f270021aaf926db0d853cf4375ca (patch) | |
| tree | ddd5cc7f635399a544d6c84ab0cf4482143feffb | |
| parent | 867590945742ec0325b4e27d6523e004695e1405 (diff) | |
| download | gitlab-ce-2b7a199f13b2f270021aaf926db0d853cf4375ca.tar.gz | |
Merge branch 'docs/existing-knative-edit' into 'master'
Add version text and edit section
See merge request gitlab-org/gitlab-ce!29875
(cherry picked from commit e0125d7bc006d5ccbad9db5258d403071ced674d)
5239f88d Add version text and edit section
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index 0ab6d8e112f..3be5bfeaddc 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -85,12 +85,22 @@ on a given project but not both. The current implementation makes use of a `serv ## Using an existing installation of Knative +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/58941) in GitLab 12.0. + NOTE: **Note:** -The "invocations" monitoring feature of GitLab serverless will not work when adding an existing installation of Knative. +The "invocations" monitoring feature of GitLab serverless will not work when +adding an existing installation of Knative. + +It is also possible to use GitLab Serverless with an existing Kubernetes +cluster which already has Knative installed. + +Simply: -It is also possible to use GitLab Serverless with an existing Kubernetes cluster which already has Knative installed. -Simply follow the steps to [add an existing Kubernetes cluster](../index.md#adding-an-existing-kubernetes-cluster) -and then follow the steps to deploy [functions](#deploying-functions) or [serverless applications](#deploying-serverless-applications) onto your cluster. +1. Follow the steps to + [add an existing Kubernetes cluster](../index.md#adding-an-existing-kubernetes-cluster). +1. Follow the steps to deploy [functions](#deploying-functions) + or [serverless applications](#deploying-serverless-applications) onto your + cluster. ## Deploying functions |