Commit d0499fab authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'fix/doc-user-project-clusters-configure' into 'master'

Doc Consistency: user/project/clusters - configure

See merge request gitlab-org/gitlab!76797
parents dcb79ad6 7bbfc4ed
...@@ -34,7 +34,7 @@ Prerequisites: ...@@ -34,7 +34,7 @@ Prerequisites:
- An [Amazon Web Services](https://aws.amazon.com/) account. - An [Amazon Web Services](https://aws.amazon.com/) account.
- Permissions to manage IAM resources. - Permissions to manage IAM resources.
For instance-level clusters, see [additional requirements for self-managed instances](#additional-requirements-for-self-managed-instances). **(FREE SELF)** For instance-level clusters, see [additional requirements for self-managed instances](#additional-requirements-for-self-managed-instances).
To create new Kubernetes clusters for your project, group, or instance through the certificate-based method: To create new Kubernetes clusters for your project, group, or instance through the certificate-based method:
...@@ -256,7 +256,7 @@ IAM user in the Amazon AWS console, and follow these steps: ...@@ -256,7 +256,7 @@ IAM user in the Amazon AWS console, and follow these steps:
#### EKS access key and ID #### EKS access key and ID
> Instance profiles were [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/291015) in GitLab 13.7. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/291015) instance profiles in GitLab 13.7.
If you're using GitLab 13.7 or later, you can use instance profiles to If you're using GitLab 13.7 or later, you can use instance profiles to
dynamically retrieve temporary credentials from AWS when needed. dynamically retrieve temporary credentials from AWS when needed.
......
...@@ -4,7 +4,7 @@ group: Configure ...@@ -4,7 +4,7 @@ group: Configure
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# Connect existing clusters through cluster certificates **(DEPRECATED)** # Connect existing clusters through cluster certificates (DEPRECATED) **(FREE)**
> [Deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5. > [Deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5.
...@@ -27,7 +27,7 @@ To add any cluster to GitLab, you need: ...@@ -27,7 +27,7 @@ To add any cluster to GitLab, you need:
- Either a GitLab.com account or an account for a self-managed installation - Either a GitLab.com account or an account for a self-managed installation
running GitLab 12.5 or later. running GitLab 12.5 or later.
- The Maintainer role for group-level and project-level clusters. - The Maintainer role for group-level and project-level clusters.
- Access to the Admin area for instance-level clusters. **(FREE SELF)** - Access to the Admin area for instance-level clusters.
- A Kubernetes cluster. - A Kubernetes cluster.
- Cluster administration access to the cluster with `kubectl`. - Cluster administration access to the cluster with `kubectl`.
......
...@@ -6,8 +6,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -6,8 +6,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Multiple clusters per project with cluster certificates (DEPRECATED) **(FREE)** # Multiple clusters per project with cluster certificates (DEPRECATED) **(FREE)**
> - Introduced in [GitLab Premium](https://about.gitlab.com/pricing/) 10.3 > - Introduced in GitLab 10.3
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35094) to GitLab Free in 13.2. > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35094) from GitLab Premium to GitLab Free in 13.2.
> - [Deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5. > - [Deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5.
WARNING: WARNING:
......
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