Commit f8e16579 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'dwainaina-master-patch-76416-docs' into 'master'

Make instruction clearer for configuring AWS credentials

See merge request gitlab-org/gitlab!60717
parents 6dab206d 0064e98f
...@@ -41,9 +41,9 @@ For example, the following policy document allows assuming a role whose name sta ...@@ -41,9 +41,9 @@ For example, the following policy document allows assuming a role whose name sta
} }
``` ```
### Administration settings ### Configure Amazon authentication
Generate an access key for the IAM user, and configure GitLab with the credentials: To configure Amazon authentication in GitLab, generate an access key for the IAM user in the Amazon AWS console, and following the steps below.
1. Navigate to **Admin Area > Settings > General** and expand the **Amazon EKS** section. 1. Navigate to **Admin Area > Settings > General** and expand the **Amazon EKS** section.
1. Check **Enable Amazon EKS integration**. 1. Check **Enable Amazon EKS integration**.
...@@ -232,7 +232,7 @@ sequenceDiagram ...@@ -232,7 +232,7 @@ sequenceDiagram
First, GitLab must obtain an initial set of credentials to communicate with the AWS API. First, GitLab must obtain an initial set of credentials to communicate with the AWS API.
These credentials can be retrieved in one of two ways: These credentials can be retrieved in one of two ways:
- Statically through the [Administration settings](#administration-settings). - Statically through the [Configure Amazon authentication](#configure-amazon-authentication).
- Dynamically via an IAM instance profile ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/291015) in GitLab 13.7). - Dynamically via an IAM instance profile ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/291015) in GitLab 13.7).
After GitLab retrieves the AWS credentials, it makes an After GitLab retrieves the AWS credentials, it makes an
...@@ -272,7 +272,7 @@ arn:aws:iam::123456789012:role/gitlab-eks-provision' ...@@ -272,7 +272,7 @@ arn:aws:iam::123456789012:role/gitlab-eks-provision'
#### Access denied: User `arn:aws:iam::x` is not authorized to perform: `sts:AssumeRole` on resource: `arn:aws:iam::y` #### Access denied: User `arn:aws:iam::x` is not authorized to perform: `sts:AssumeRole` on resource: `arn:aws:iam::y`
This error occurs when the credentials defined in the This error occurs when the credentials defined in the
[Administration settings](#administration-settings) cannot assume the role defined by the [Configure Amazon authentication](#configure-amazon-authentication) cannot assume the role defined by the
Provision Role ARN. Check that: Provision Role ARN. Check that:
1. The initial set of AWS credentials [has the AssumeRole policy](#additional-requirements-for-self-managed-instances). 1. The initial set of AWS credentials [has the AssumeRole policy](#additional-requirements-for-self-managed-instances).
...@@ -290,6 +290,10 @@ because GitLab has successfully assumed your provided role, but the role has ...@@ -290,6 +290,10 @@ because GitLab has successfully assumed your provided role, but the role has
insufficient permissions to retrieve the resources needed for the form. Make sure insufficient permissions to retrieve the resources needed for the form. Make sure
you've assigned the role the correct permissions. you've assigned the role the correct permissions.
### Key Pairs are not loaded
GitLab loads the key pairs from the **Cluster Region** specified. Ensure that key pair exists in that region.
#### `ROLLBACK_FAILED` during cluster creation #### `ROLLBACK_FAILED` during cluster creation
The creation process halted because GitLab encountered an error when creating The creation process halted because GitLab encountered an error when creating
......
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