From 1ef4b65f55f4fc6524a47050b4f6d686beb81d3a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Nov 2019 06:06:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/api/settings.md | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/api/settings.md') diff --git a/doc/api/settings.md b/doc/api/settings.md index a1c343ec208..a061309d8d1 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -212,6 +212,10 @@ are listed in the descriptions of the relevant settings. | `dsa_key_restriction` | integer | no | The minimum allowed bit length of an uploaded DSA key. Default is `0` (no restriction). `-1` disables DSA keys. | | `ecdsa_key_restriction` | integer | no | The minimum allowed curve size (in bits) of an uploaded ECDSA key. Default is `0` (no restriction). `-1` disables ECDSA keys. | | `ed25519_key_restriction` | integer | no | The minimum allowed curve size (in bits) of an uploaded ED25519 key. Default is `0` (no restriction). `-1` disables ED25519 keys. | +| `eks_integration_enabled` | boolean | no | Enable integration with Amazon EKS | +| `eks_account_id` | string | no | Amazon account ID | +| `eks_access_key_id` | string | no | AWS IAM access key ID | +| `eks_secret_access_key` | string | no | AWS IAM secret access key | | `elasticsearch_aws_access_key` | string | no | **(PREMIUM)** AWS IAM access key | | `elasticsearch_aws` | boolean | no | **(PREMIUM)** Enable the use of AWS hosted Elasticsearch | | `elasticsearch_aws_region` | string | no | **(PREMIUM)** The AWS region the Elasticsearch domain is configured | -- cgit v1.2.3