Commit 5eff8dd1 authored by Evan Read's avatar Evan Read

Merge branch 'docs-existing-knative' into 'master'

Add documentation on using serverless with existing Knative instance

See merge request gitlab-org/gitlab-ce!29699
parents d170a0fb 3a3515b0
...@@ -83,6 +83,15 @@ NOTE: **Note:** ...@@ -83,6 +83,15 @@ NOTE: **Note:**
You can deploy either [functions](#deploying-functions) or [serverless applications](#deploying-serverless-applications) 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. 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 ## Deploying functions
> Introduced in GitLab 11.6. > Introduced in GitLab 11.6.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment