From 2b7a199f13b2f270021aaf926db0d853cf4375ca Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Thu, 20 Jun 2019 09:20:06 +0000 Subject: [PATCH] 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 --- doc/user/project/clusters/serverless/index.md | 18 ++++++++++++++---- 1 file 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 -- GitLab