Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielgruesso <dgruesso@gitlab.com>2019-02-22 22:12:30 +0300
committerdanielgruesso <dgruesso@gitlab.com>2019-02-22 22:12:30 +0300
commit05b97dc52e92a89855ecf0183a14ba538cdaaa5c (patch)
tree444fd8c5a6e0a941b60fabc4953dc7d4b560c46d
parentf0b2067879eb91b5f4851c59b9c4ab791a0f5079 (diff)
parenta76f63b11c9084c5494175a7d4f301ef13b6bfe9 (diff)
Merge branch 'docs-serverless-updates' of gitlab.com:gitlab-org/gitlab-ce into docs-serverless-updates
-rw-r--r--doc/install/kubernetes/preparation/tiller.md4
-rw-r--r--doc/user/project/clusters/serverless/index.md8
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/install/kubernetes/preparation/tiller.md b/doc/install/kubernetes/preparation/tiller.md
index 798414a99e0..88e287bb44f 100644
--- a/doc/install/kubernetes/preparation/tiller.md
+++ b/doc/install/kubernetes/preparation/tiller.md
@@ -54,13 +54,13 @@ Some clusters require authentication to use `kubectl` to create the Tiller roles
#### Upload the RBAC config as an admin user (GKE)
-For GKE, you need to grab the admin credentials. This command will output the admin password:
+For GKE, you need to obtain the admin credentials. This command will output the admin password:
```
gcloud container clusters describe <cluster-name> --zone <zone> --project <project-id> --format='value(masterAuth.password)'
```
-Use the admin password to set the admin credentials (replace password below with output value from above step):
+Use the admin password to set the admin credentials. Replace the password value below with the output value from the above step:
```
kubectl config set-credentials admin --username=admin --password=xxxxxxxxxxxxxx
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md
index 70f4271465f..d7093272863 100644
--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
@@ -25,12 +25,12 @@ To run Knative on Gitlab, you will need:
1. **Kubernetes Cluster:** An RBAC-enabled Kubernetes cluster is required to deploy Knative.
The simplest way to get started is to add a cluster using [GitLab's GKE integration](../index.md#adding-and-creating-a-new-gke-cluster-via-gitlab).
- Minimum recommended cluster size to run Knative is 3-nodes, 6 vCPUs, and 22.50 GB memory.
+ The set of minimum recommended cluster specifications to run Knative is 3 nodes, 6 vCPUs, and 22.50 GB memory.
1. **Helm Tiller:** Helm is a package manager for Kubernetes and is required to install
Knative.
1. **GitLab Runner:** A runner is required to run the CI jobs that will deploy serverless
applications or functions onto your cluster. You can install the GitLab Runner
- onto the existing kubernetes cluster. See [Installing Applications](../index.md#installing-applications) for more information.
+ onto the existing Kubernetes cluster. See [Installing Applications](../index.md#installing-applications) for more information.
1. **Domain Name:** Knative will provide its own load balancer using Istio. It will provide an
external IP address for all the applications served by Knative. You will be prompted to enter a
wildcard domain where your applications will be served. Configure your DNS server to use the
@@ -51,7 +51,7 @@ The minimum recommended cluster size to run Knative is 3-nodes, 6 vCPUs, and 22.
1. [Add a Kubernetes cluster](../index.md) and [install Helm](../index.md#installing-applications).
1. Once Helm has been successfully installed, scroll down to the Knative app section. Enter the domain to be used with
- your application/functions (ie. `example.com`) and click "Install".
+ your application/functions (e.g. `example.com`) and click **Install**.
![install-knative](img/install-knative.png)
@@ -79,7 +79,7 @@ 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.
-## Deploying Functions
+## Deploying functions
> Introduced in GitLab 11.6.