diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
| commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
| tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /doc/administration/dedicated | |
| parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) | |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'doc/administration/dedicated')
| -rw-r--r-- | doc/administration/dedicated/index.md | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/administration/dedicated/index.md b/doc/administration/dedicated/index.md index f2caa5fa368..db30684ab1c 100644 --- a/doc/administration/dedicated/index.md +++ b/doc/administration/dedicated/index.md @@ -14,7 +14,11 @@ The instructions on this page guide you through: 1. Onboarding and initial setup of your GitLab Dedicated instance. 1. Configuring your GitLab Dedicated instance including enabling and updating the settings for [available functionality](../../subscriptions/gitlab_dedicated/index.md#available-features). -Any functionality in the GitLab application that is not controlled by the SaaS environment can be configured by using the [Admin Panel](../../user/admin_area/index.md). +Any functionality in the GitLab application that is not controlled by the SaaS environment can be configured by using the [Admin Panel](../../administration/admin_area.md). + +Examples of SaaS environment settings include `gitlab.rb` configurations and access to shell, Rails console, and PostgreSQL console. +These environment settings cannot be changed by tenants. +GitLab Dedicated Engineers also don't have direct access to tenant environments, except for [break glass situations](../../subscriptions/gitlab_dedicated/index.md#access-controls). ## Onboarding @@ -68,8 +72,9 @@ To create a KMS key using the AWS Console: 1. Key material origin: **KMS** 1. Regionality: **Multi-Region key** 1. Enter your values for key alias, description, and tags. -1. Select Key administrators (optionally allow or deny key administrators to delete the key). -1. For Key usage permissions, add the GitLab AWS account using the **Other AWS accounts** dialog. +1. Select key administrators. +1. Optional. Allow or prevent key administrators from deleting the key. +1. On the **Define key usage permissions** page, under **Other AWS accounts**, add the GitLab AWS account. The last page asks you to confirm the KMS key policy. It should look similar to the following example, populated with your account IDs and usernames: |