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
d8d9d63b
Commit
d8d9d63b
authored
Sep 19, 2019
by
Miranda Fluharty
Committed by
Filipa Lacerda
Sep 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port new group runner kubernetes section to EE
EE port needed due to gitlab.pot conflicts
parent
b3078831
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
24 deletions
+42
-24
app/views/ci/runner/_how_to_setup_runner_automatically.html.haml
...ws/ci/runner/_how_to_setup_runner_automatically.html.haml
+22
-0
app/views/groups/runners/_group_runners.html.haml
app/views/groups/runners/_group_runners.html.haml
+4
-0
app/views/projects/runners/_specific_runners.html.haml
app/views/projects/runners/_specific_runners.html.haml
+3
-22
changelogs/unreleased/63768-group-settings-kubernetes-runner-section.yml
...leased/63768-group-settings-kubernetes-runner-section.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+2
-2
spec/features/runners_spec.rb
spec/features/runners_spec.rb
+6
-0
No files found.
app/views/ci/runner/_how_to_setup_runner_automatically.html.haml
0 → 100644
View file @
d8d9d63b
.append-bottom-10
%h4
=
_
(
'Set up a %{type} Runner automatically'
)
%
{
type:
type
}
%p
-
link_to_help_page
=
link_to
(
_
(
'Learn more about Kubernetes'
),
help_page_path
(
'user/project/clusters/index'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
_
(
'You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}'
).
html_safe
%
{
link_to_help_page:
link_to_help_page
}
%ol
%li
=
_
(
'Click the button below to begin the install process by navigating to the Kubernetes page'
)
%li
=
_
(
'Select an existing Kubernetes cluster or create a new one'
)
%li
=
_
(
'From the Kubernetes cluster details view, install Runner from the applications list'
)
=
link_to
_
(
'Install Runner on Kubernetes'
),
clusters_path
,
class:
'btn btn-info'
app/views/groups/runners/_group_runners.html.haml
View file @
d8d9d63b
...
...
@@ -10,6 +10,10 @@
-# Proper policies should be implemented per
-# https://gitlab.com/gitlab-org/gitlab-foss/issues/45894
-
if
can?
(
current_user
,
:admin_pipeline
,
@group
)
=
render
partial:
'ci/runner/how_to_setup_runner_automatically'
,
locals:
{
type:
'group'
,
clusters_path:
group_clusters_path
(
@group
)
}
%hr
=
render
partial:
'ci/runner/how_to_setup_runner'
,
locals:
{
registration_token:
@group
.
runners_token
,
type:
'group'
,
...
...
app/views/projects/runners/_specific_runners.html.haml
View file @
d8d9d63b
...
...
@@ -2,28 +2,9 @@
=
_
(
'Specific Runners'
)
.bs-callout.help-callout
.append-bottom-10
%h4
=
_
(
'Set up a specific Runner automatically'
)
%p
-
link_to_help_page
=
link_to
(
_
(
'Learn more about Kubernetes'
),
help_page_path
(
'user/project/clusters/index'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
_
(
'You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}'
).
html_safe
%
{
link_to_help_page:
link_to_help_page
}
%ol
%li
=
_
(
'Click the button below to begin the install process by navigating to the Kubernetes page'
)
%li
=
_
(
'Select an existing Kubernetes cluster or create a new one'
)
%li
=
_
(
'From the Kubernetes cluster details view, install Runner from the applications list'
)
=
link_to
_
(
'Install Runner on Kubernetes'
),
project_clusters_path
(
@project
),
class:
'btn btn-info'
=
render
partial:
'ci/runner/how_to_setup_runner_automatically'
,
locals:
{
type:
'specific'
,
clusters_path:
project_clusters_path
(
@project
)
}
%hr
=
render
partial:
'ci/runner/how_to_setup_runner'
,
locals:
{
registration_token:
@project
.
runners_token
,
...
...
changelogs/unreleased/63768-group-settings-kubernetes-runner-section.yml
0 → 100644
View file @
d8d9d63b
---
title
:
Add kubernetes section to group runner settings
merge_request
:
16338
author
:
type
:
added
locale/gitlab.pot
View file @
d8d9d63b
...
...
@@ -14044,10 +14044,10 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up a %{type} Runner
manu
ally"
msgid "Set up a %{type} Runner
automatic
ally"
msgstr ""
msgid "Set up a
specific Runner automatic
ally"
msgid "Set up a
%{type} Runner manu
ally"
msgstr ""
msgid "Set up assertions/attributes/claims (email, first_name, last_name) and NameID according to %{docsLinkStart}the documentation %{icon}%{docsLinkEnd}"
...
...
spec/features/runners_spec.rb
View file @
d8d9d63b
...
...
@@ -272,6 +272,12 @@ describe 'Runners' do
expect
(
page
).
to
have_content
'This group does not provide any group Runners yet'
end
it
'user can see a link to install runners on kubernetes clusters'
do
visit
group_settings_ci_cd_path
(
group
)
expect
(
page
).
to
have_link
(
'Install Runner on Kubernetes'
,
href:
group_clusters_path
(
group
))
end
end
context
'group with a runner'
do
...
...
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