Merge branch 'ee-63768-group-settings-kubernetes-runner-section' into 'master'

Add kubernetes section to group runner settings

See merge request gitlab-org/gitlab!16338

app/views/ci/runner/_how_to_setup_runner_automatically.html.haml

+.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

@@ -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

@@ -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

+---
+title: Add kubernetes section to group runner settings
+merge_request: 16338
+author:
+type: added

locale/gitlab.pot

@@ -14044,10 +14044,10 @@ msgstr ""
 msgid "Set up CI/CD"
 msgstr ""
 
-msgid "Set up a %{type} Runner manually"
+msgid "Set up a %{type} Runner automatically"
 msgstr ""
 
-msgid "Set up a specific Runner automatically"
+msgid "Set up a %{type} Runner manually"
 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

@@ -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