summaryrefslogtreecommitdiff
path: root/doc/user/project/clusters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 06:10:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 06:10:11 +0000
commit65a1175e466105fca1f40cb5a995fdb100ff334e (patch)
tree562573b4fc7a0cd748d07d6a1720b4b13d36386a /doc/user/project/clusters
parent3a52deac114dda8a1ee0da597c148b0dfc5dcf35 (diff)
downloadgitlab-ce-65a1175e466105fca1f40cb5a995fdb100ff334e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/clusters')
-rw-r--r--doc/user/project/clusters/serverless/aws.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/user/project/clusters/serverless/aws.md b/doc/user/project/clusters/serverless/aws.md
index 30ed82e45b6..cb35e598803 100644
--- a/doc/user/project/clusters/serverless/aws.md
+++ b/doc/user/project/clusters/serverless/aws.md
@@ -2,11 +2,10 @@
GitLab allows users to easily deploy AWS Lambda functions and create rich serverless applications.
-GitLab supports deployment of functions to AWS Lambda using a combination of:
+GitLab supports deployment of AWS Lambda functions through GitLab CI/CD using the following Serverless frameworks:
- [Serverless Framework with AWS](#serverless-framework)
- [AWS' Serverless Application Model (SAM)](#aws-serverless-application-model)
-- GitLab CI/CD
## Serverless Framework
@@ -362,7 +361,7 @@ sam init -h
### Setting up your AWS credentials with your GitLab account
-In order to interact with your AWS account, the GitLab CI/CD pipelines require both
+In order to interact with your AWS account, the GitLab CI/CD pipelines require both
`AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` to be set in the project's CI/CD
variables.