Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cf720584
Commit
cf720584
authored
Jun 11, 2020
by
Amy Qualls
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-fix-line-breaks' into 'master'
Remove broken br tags See merge request gitlab-org/gitlab!34369
parents
01c4d41b
43135f8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
14 deletions
+9
-14
doc/.vale/gitlab/Acronyms.yml
doc/.vale/gitlab/Acronyms.yml
+2
-0
doc/user/project/clusters/add_eks_clusters.md
doc/user/project/clusters/add_eks_clusters.md
+0
-2
doc/user/project/clusters/add_remove_clusters.md
doc/user/project/clusters/add_remove_clusters.md
+7
-12
No files found.
doc/.vale/gitlab/Acronyms.yml
View file @
cf720584
...
...
@@ -15,6 +15,7 @@ second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)'
# ... with the exception of these:
exceptions
:
-
API
-
ARN
-
ASCII
-
AWS
-
CNAME
...
...
@@ -30,6 +31,7 @@ exceptions:
-
HTML
-
HTTP
-
HTTPS
-
IAM
-
IDE
-
JSON
-
LDAP
...
...
doc/user/project/clusters/add_eks_clusters.md
View file @
cf720584
...
...
@@ -59,7 +59,6 @@ To create and add a new Kubernetes cluster to your project, group, or instance:
-
Project's
**{cloud-gear}**
**Operations > Kubernetes**
page, for a project-level cluster.
-
Group's
**{cloud-gear}**
**Kubernetes**
page, for a group-level cluster.
-
**{admin}**
**Admin Area >**
**{cloud-gear}**
**Kubernetes**
, for an instance-level cluster.
<br><br/>
1.
Click
**Add Kubernetes cluster**
.
1.
Under the
**Create new cluster**
tab, click
**Amazon EKS**
. You will be provided with an
`Account ID`
and
`External ID`
to use in the next step.
...
...
@@ -155,7 +154,6 @@ To create and add a new Kubernetes cluster to your project, group, or instance:
-
**Node count**
- The number of worker nodes.
-
**GitLab-managed cluster**
- Leave this checked if you want GitLab to manage namespaces and service accounts for this cluster.
See the
[
Managed clusters section
](
index.md#gitlab-managed-clusters
)
for more information.
<br><br/>
1.
Finally, click the
**Create Kubernetes cluster**
button.
After about 10 minutes, your cluster will be ready to go. You can now proceed
...
...
doc/user/project/clusters/add_remove_clusters.md
View file @
cf720584
...
...
@@ -161,7 +161,6 @@ To add a Kubernetes cluster to your project, group, or instance:
1.
Project's
**{cloud-gear}**
**Operations > Kubernetes**
page, for a project-level cluster.
1.
Group's
**{cloud-gear}**
**Kubernetes**
page, for a group-level cluster.
1.
**{admin}**
**Admin Area >**
**{cloud-gear}**
**Kubernetes**
page, for an instance-level cluster.
<br></br>
1.
Click
**Add Kubernetes cluster**
.
1.
Click the
**Add existing cluster**
tab and fill in the details:
1.
**Kubernetes cluster name**
(required) - The name you wish to give the cluster.
...
...
@@ -184,9 +183,7 @@ To add a Kubernetes cluster to your project, group, or instance:
1.
Get the certificate by running this command:
```shell
kubectl get secret <secret name> -o jsonpath="{['data']['ca\.crt']}" | base64 --decode
```
NOTE: **Note:**
...
...
@@ -199,7 +196,6 @@ To add a Kubernetes cluster to your project, group, or instance:
**
The token used should belong to a service account with
[
`cluster-admin`
](
https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles
)
privileges.
**
To create this service account:
1.
Create a file called
`gitlab-admin-service-account.yaml`
with contents:
```yaml
...
...
@@ -273,16 +269,15 @@ To add a Kubernetes cluster to your project, group, or instance:
token: <authentication_token>
```
NOTE: **Note:**
For GKE clusters, you will need the
`container.clusterRoleBindings.create` permission to create a cluster
role binding. You can follow the [Google Cloud
documentation](https://cloud.google.com/iam/docs/granting-changing-revoking-access)
to grant access.
NOTE: **Note:**
For GKE clusters, you will need the
`container.clusterRoleBindings.create` permission to create a cluster
role binding. You can follow the [Google Cloud
documentation](https://cloud.google.com/iam/docs/granting-changing-revoking-access)
to grant access.
1.
**GitLab-managed cluster**
- Leave this checked if you want GitLab to manage namespaces and service accounts for this cluster.
See the
[
Managed clusters section
](
index.md#gitlab-managed-clusters
)
for more information.
1.
**Project namespace**
(optional) - You don't have to fill it in; by leaving
it blank, GitLab will create one for you. Also:
-
Each project should have a unique namespace.
...
...
@@ -292,7 +287,7 @@ To add a Kubernetes cluster to your project, group, or instance:
-
If you or someone created a secret specifically for the project, usually
with limited permissions, the secret's namespace and project namespace may
be the same.
<br></br>
1.
Finally, click the
**Create Kubernetes cluster**
button.
After a couple of minutes, your cluster will be ready to go. You can now proceed
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment