diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-20 09:20:06 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-20 09:20:06 +0000 |
| commit | e0125d7bc006d5ccbad9db5258d403071ced674d (patch) | |
| tree | a5f342e6d5dd7fc04ce78d98300ffe0bf250e4aa | |
| parent | 265fc7bc336f061570bab5bd7483b2f86b12ce7f (diff) | |
| parent | e04e2eb2c10e10f22cd2647b72e8da83643ceb6e (diff) | |
| download | gitlab-ce-e0125d7bc006d5ccbad9db5258d403071ced674d.tar.gz | |
Merge branch 'docs/existing-knative-edit' into 'master'
Add version text and edit section
See merge request gitlab-org/gitlab-ce!29875
| -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 |