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
c41b5c98
Commit
c41b5c98
authored
Nov 19, 2019
by
Evan Read
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '22392-update-eks-docs-links' into 'master'
Update EKS help links See merge request gitlab-org/gitlab!20328
parents
fea2d171
ac7bdc14
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
app/views/clusters/clusters/aws/_new.html.haml
app/views/clusters/clusters/aws/_new.html.haml
+4
-1
No files found.
app/views/clusters/clusters/aws/_new.html.haml
View file @
c41b5c98
-
if
!
Gitlab
::
CurrentSettings
.
eks_integration_enabled?
-
documentation_link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
help_page_path
(
"integration/amazon"
)
}
-
documentation_link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
help_page_path
(
'user/project/clusters/add_remove_clusters.md'
,
anchor:
'additional-requirements-for-self-managed-instances'
)
}
=
s_
(
'Amazon authentication is not %{link_start}correctly configured%{link_end}. Ask your GitLab administrator if you want to use this service.'
).
html_safe
%
{
link_start:
documentation_link_start
,
link_end:
'<a/>'
.
html_safe
}
-
else
.js-create-eks-cluster-form-container
{
data:
{
'gitlab-managed-cluster-help-path'
=>
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'gitlab-managed-clusters'
),
...
...
@@ -16,5 +17,7 @@
'account-id'
=>
Gitlab
::
CurrentSettings
.
eks_account_id
,
'external-id'
=>
@aws_role
.
role_external_id
,
'kubernetes-integration-help-path'
=>
help_page_path
(
'user/project/clusters/index'
),
'account-and-external-ids-help-path'
=>
help_page_path
(
'user/project/clusters/add_remove_clusters.md'
,
anchor:
'eks-cluster'
),
'create-role-arn-help-path'
=>
help_page_path
(
'user/project/clusters/add_remove_clusters.md'
,
anchor:
'eks-cluster'
),
'external-link-icon'
=>
icon
(
'external-link'
),
'has-credentials'
=>
@aws_role
.
role_arn
.
present?
.
to_s
}
}
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