diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 06:06:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 06:06:16 +0300 |
| commit | eb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (patch) | |
| tree | 1ef7347e275986d8d7621cc21d64f3eec1aa7a3a /doc/development/kubernetes.md | |
| parent | ee6b185429b62857a5e490526095a7699e8539f3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/kubernetes.md')
| -rw-r--r-- | doc/development/kubernetes.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/development/kubernetes.md b/doc/development/kubernetes.md index 4a554912e05..a0dd97f2a1c 100644 --- a/doc/development/kubernetes.md +++ b/doc/development/kubernetes.md @@ -94,12 +94,12 @@ the provisioning actions. The following resources must be present: - A service account with permissions to assume the provisioning role in the `Customer` account above. - Credentials for this service account configured in GitLab via - the `kubernetes` section of `gitlab.yml` + the `kubernetes` section of `gitlab.yml`. The process for creating a cluster is as follows: -1. Using the :provision_role_external_id, GitLab assumes the role provided - by :provision_role_arn and stores a set of temporary credentials on the +1. Using the `:provision_role_external_id`, GitLab assumes the role provided + by `:provision_role_arn` and stores a set of temporary credentials on the provider record. By default these credentials are valid for one hour. 1. A CloudFormation stack is created, based on the [`AWS CloudFormation EKS template`](https://gitlab.com/gitlab-org/gitlab/blob/master/vendor/aws/cloudformation/eks_cluster.yaml). @@ -114,9 +114,9 @@ The process for creating a cluster is as follows: 1. Credentials that are no longer required are removed. This deletes the following attributes: -- `access_key_id` -- `secret_access_key` -- `session_token` + - `access_key_id` + - `secret_access_key` + - `session_token` ## Security |