Moves domain setting to Cluster setting

Changes domain field to be on the Cluster page show, removing it from
Auto DevOps setting. Also injects the new environment variable
KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables.

Migration to move the information from ProjectAutoDevops#domain
to Clusters::Cluster#domain. As well as necessary modifications to qa
selectors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363

3 files changed, 16 insertions, 9 deletions

diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index 12c2409a5a7..2de39b8ebf5 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -13,9 +13,7 @@ module QA # rubocop:disable Naming/FileName
 
           view 'app/views/projects/settings/ci_cd/_autodevops_form.html.haml' do
             element :enable_auto_devops_field, 'check_box :enabled' # rubocop:disable QA/ElementWithPattern
-            element :domain_field, 'text_field :domain' # rubocop:disable QA/ElementWithPattern
             element :enable_auto_devops_button, "%strong= s_('CICD|Default to Auto DevOps pipeline')" # rubocop:disable QA/ElementWithPattern
-            element :domain_input, "%strong= _('Domain')" # rubocop:disable QA/ElementWithPattern
             element :save_changes_button, "submit _('Save changes')" # rubocop:disable QA/ElementWithPattern
           end
 
@@ -31,10 +29,9 @@ module QA # rubocop:disable Naming/FileName
             end
           end
 
-          def enable_auto_devops_with_domain(domain)
+          def enable_auto_devops
             expand_section(:autodevops_settings) do
               check 'Default to Auto DevOps pipeline'
-              fill_in 'Domain', with: domain
               click_on 'Save changes'
             end
           end
diff --git a/qa/qa/resource/kubernetes_cluster.rb b/qa/qa/resource/kubernetes_cluster.rb
index d67e5f6da20..19c6dc8890d 100644
--- a/qa/qa/resource/kubernetes_cluster.rb
+++ b/qa/qa/resource/kubernetes_cluster.rb
@@ -6,10 +6,14 @@ module QA
   module Resource
     class KubernetesCluster < Base
       attr_writer :project, :cluster,
-        :install_helm_tiller, :install_ingress, :install_prometheus, :install_runner
+        :install_helm_tiller, :install_ingress, :install_prometheus, :install_runner, :domain
 
       attribute :ingress_ip do
-        Page::Project::Operations::Kubernetes::Show.perform(&:ingress_ip)
+        ingress_ip_value
+      end
+
+      attribute :domain do
+        "#{ingress_ip_value}.nip.io"
       end
 
       def fabricate!
@@ -52,6 +56,12 @@ module QA
           end
         end
       end
+
+      private
+
+      def ingress_ip_value
+        @ingress_ip_value ||= Page::Project::Operations::Kubernetes::Show.perform(&:ingress_ip)
+      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index b0ff83db86b..5c8ec465143 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -52,13 +52,13 @@ module QA
             end
 
             kubernetes_cluster.populate(:ingress_ip)
-
             @project.visit!
             Page::Project::Menu.act { click_ci_cd_settings }
             Page::Project::Settings::CICD.perform do |p|
-              p.enable_auto_devops_with_domain(
-                "#{kubernetes_cluster.ingress_ip}.nip.io")
+              p.enable_auto_devops
             end
+
+            kubernetes_cluster.populate(:domain)
           end
 
           after(:all) do