diff options
| author | Evan Read <eread@gitlab.com> | 2019-06-17 05:49:51 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-06-17 05:49:51 +0000 |
| commit | 5eff8dd1e7a9a51349953124a5eca069b866f6c7 (patch) | |
| tree | d7dcaaff8dfb3049557b121229cd893cdbe54589 | |
| parent | d170a0fb7af727470a23f94e102c6536f5df4a85 (diff) | |
| parent | 3a3515b0f3f0439ed2ff8a842713f642f5bd29cb (diff) | |
| download | gitlab-ce-5eff8dd1e7a9a51349953124a5eca069b866f6c7.tar.gz | |
Merge branch 'docs-existing-knative' into 'master'
Add documentation on using serverless with existing Knative instance
See merge request gitlab-org/gitlab-ce!29699
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index 2cda850f24e..0ab6d8e112f 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -83,6 +83,15 @@ NOTE: **Note:** You can deploy either [functions](#deploying-functions) or [serverless applications](#deploying-serverless-applications) on a given project but not both. The current implementation makes use of a `serverless.yml` file to signal a FaaS project. +## Using an existing installation of Knative + +NOTE: **Note:** +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 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. + ## Deploying functions > Introduced in GitLab 11.6. |