Merge branch '336229-remove-deprecated-runner-set-up-instruction' into 'master'

Remove deprecated runner set up instruction

See merge request gitlab-org/gitlab!66252

app/controllers/groups/settings/ci_cd_controller.rb

@@ -60,6 +60,7 @@ module Groups
 
       def define_variables
         define_ci_variables
+        define_view_variables
       end
 
       def define_ci_variables
@@ -69,6 +70,10 @@ module Groups
           .map { |variable| variable.present(current_user: current_user) }
       end
 
+      def define_view_variables
+        @content_class = 'limit-container-width' unless fluid_layout
+      end
+
       def authorize_admin_group!
         return render_404 unless can?(current_user, :admin_group, group)
       end

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

 - link = link_to _("Install GitLab Runner and ensure it's running."), 'https://docs.gitlab.com/runner/install/', target: '_blank'
 .gl-mb-3
-  %h5= _("Set up a %{type} runner manually") % { type: type }
-
+  %h5= _("Set up a %{type} Runner for a project") % { type: type }
 %ol
   %li
     = link.html_safe

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

-%h5= _('Set up a %{type} runner automatically') % { type: type }
-
-%p
-  - link_to_help_page = link_to(_('Learn more.'),
-                                help_page_path('user/project/clusters/index'),
-                                target: '_blank',
-                                rel: 'noopener noreferrer')
-
-  = _('Register 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.')
-  %li
-    = _('Select an existing Kubernetes cluster or create a new one.')
-  %li
-    = _('From the Kubernetes cluster details view, applications list, install GitLab Runner.')
-
-= link_to _('Install GitLab Runner on Kubernetes'),
-  clusters_path,
-  class: 'gl-button btn btn-info'

app/views/groups/runners/_group_runners.html.haml

@@ -3,17 +3,14 @@
 %h4
   = _('Group runners')
 
-%p
-  = _('These runners are shared across projects in this group.')
-  = _('Group runners can be managed with the %{link}.').html_safe % { link: link }
-
 -# Proper policies should be implemented per
 -# https://gitlab.com/gitlab-org/gitlab-foss/issues/45894
 .bs-callout.help-callout
+  %p
+    = _('These runners are shared across projects in this group.')
+    = _('Group runners can be managed with the %{link}.').html_safe % { link: link }
+
   - if can?(current_user, :admin_pipeline, @group) && valid_runner_registrars.include?('group')
-    = render partial: 'ci/runner/how_to_setup_runner_automatically',
-             locals: { type: 'group',
-                       clusters_path: group_clusters_path(@group) }
     - if params[:ci_runner_templates]
       %hr
       = render partial: 'ci/runner/setup_runner_in_aws',

app/views/projects/runners/_specific_runners.html.haml

@@ -4,10 +4,6 @@
 .bs-callout.help-callout
   - if valid_runner_registrars.include?('project')
     = _('These runners are specific to this project.')
-    %hr
-    = render partial: 'ci/runner/how_to_setup_runner_automatically',
-             locals: { type: s_('Runners|specific'),
-                       clusters_path: project_clusters_path(@project) }
     - if params[:ci_runner_templates]
       %hr
       = render partial: 'ci/runner/setup_runner_in_aws',

locale/gitlab.pot

@@ -6847,9 +6847,6 @@ msgstr ""
 msgid "Click %{link_to} to view the request."
 msgstr ""
 
-msgid "Click the button below."
-msgstr ""
-
 msgid "Click the link below to confirm your email address (%{email})"
 msgstr ""
 
@@ -14386,9 +14383,6 @@ msgstr ""
 msgid "From merge request merge until deploy to production"
 msgstr ""
 
-msgid "From the Kubernetes cluster details view, applications list, install GitLab Runner."
-msgstr ""
-
 msgid "Full"
 msgstr ""
 
@@ -17537,9 +17531,6 @@ msgstr ""
 msgid "Install GitLab Runner and ensure it's running."
 msgstr ""
 
-msgid "Install GitLab Runner on Kubernetes"
-msgstr ""
-
 msgid "Install on clusters"
 msgstr ""
 
@@ -27013,9 +27004,6 @@ msgstr ""
 msgid "Register WebAuthn Device"
 msgstr ""
 
-msgid "Register a runner on a Kubernetes cluster. %{link_to_help_page}"
-msgstr ""
-
 msgid "Register as many runners as you want. You can register runners as separate users, on separate servers, and on your local machine. Runners are either:"
 msgstr ""
 
@@ -29447,9 +29435,6 @@ msgstr ""
 msgid "Select an assignee"
 msgstr ""
 
-msgid "Select an existing Kubernetes cluster or create a new one."
-msgstr ""
-
 msgid "Select an iteration"
 msgstr ""
 
@@ -29927,7 +29912,7 @@ msgstr ""
 msgid "Set up Jira Integration"
 msgstr ""
 
-msgid "Set up a %{type} runner automatically"
+msgid "Set up a %{type} Runner for a project"
 msgstr ""
 
 msgid "Set up a %{type} runner manually"

spec/features/runners_spec.rb

@@ -16,10 +16,10 @@ RSpec.describe 'Runners' do
       project.add_maintainer(user)
     end
 
-    it 'user can see a button to install runners on kubernetes clusters' do
+    it 'user can see a link with instructions on how to install GitLab Runner' do
       visit project_runners_path(project)
 
-      expect(page).to have_link('Install GitLab Runner on Kubernetes', href: project_clusters_path(project))
+      expect(page).to have_link('Install GitLab Runner and ensure it\'s running.', href: "https://docs.gitlab.com/runner/install/")
     end
   end
 
@@ -343,12 +343,6 @@ RSpec.describe 'Runners' do
 
         expect(page).to have_content 'No runners found'
       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 GitLab Runner on Kubernetes', href: group_clusters_path(group))
-      end
     end
 
     context 'group with a runner' do