Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 27 deletions

diff --git a/qa/qa/resource/kubernetes_cluster/project_cluster.rb b/qa/qa/resource/kubernetes_cluster/project_cluster.rb
index 5c61cc29236..78a24cdb677 100644
--- a/qa/qa/resource/kubernetes_cluster/project_cluster.rb
+++ b/qa/qa/resource/kubernetes_cluster/project_cluster.rb
@@ -5,7 +5,7 @@ module QA
     module KubernetesCluster
       class ProjectCluster < Base
         attr_writer :cluster,
-                    :install_helm_tiller, :install_ingress, :install_prometheus, :install_runner, :domain
+                    :install_ingress, :install_prometheus, :install_runner, :domain
 
         attribute :project do
           Resource::Project.fabricate!
@@ -36,33 +36,27 @@ module QA
             cluster_page.add_cluster!
           end
 
-          if @install_helm_tiller
-            Page::Project::Operations::Kubernetes::Show.perform do |show|
-              # We must wait a few seconds for permissions to be set up correctly for new cluster
-              sleep 10
+          Page::Project::Operations::Kubernetes::Show.perform do |show|
+            # We must wait a few seconds for permissions to be set up correctly for new cluster
+            sleep 25
 
-              # Open applications tab
-              show.open_applications
+            # Open applications tab
+            show.open_applications
 
-              # Helm must be installed before everything else
-              show.install!(:helm)
-              show.await_installed(:helm)
+            show.install!(:ingress) if @install_ingress
+            show.install!(:prometheus) if @install_prometheus
+            show.install!(:runner) if @install_runner
 
-              show.install!(:ingress) if @install_ingress
-              show.install!(:prometheus) if @install_prometheus
-              show.install!(:runner) if @install_runner
+            show.await_installed(:ingress) if @install_ingress
+            show.await_installed(:prometheus) if @install_prometheus
+            show.await_installed(:runner) if @install_runner
 
-              show.await_installed(:ingress) if @install_ingress
-              show.await_installed(:prometheus) if @install_prometheus
-              show.await_installed(:runner) if @install_runner
+            if @install_ingress
+              populate(:ingress_ip)
 
-              if @install_ingress
-                populate(:ingress_ip)
-
-                show.open_details
-                show.set_domain("#{ingress_ip}.nip.io")
-                show.save_domain
-              end
+              show.open_details
+              show.set_domain("#{ingress_ip}.nip.io")
+              show.save_domain
             end
           end
         end
diff --git a/qa/qa/service/docker_run/k3s.rb b/qa/qa/service/docker_run/k3s.rb
index bb9b6ca5179..07211b220f1 100644
--- a/qa/qa/service/docker_run/k3s.rb
+++ b/qa/qa/service/docker_run/k3s.rb
@@ -38,7 +38,7 @@ module QA
             --no-deploy traefik
           CMD
 
-          command.gsub!("--network #{network} ", '') unless QA::Runtime::Env.running_in_ci?
+          command.gsub!("--network #{network} --hostname #{host_name}", '') unless QA::Runtime::Env.running_in_ci?
 
           shell command
         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 b2d57e902cb..3e25ecfd45d 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
@@ -38,7 +38,6 @@ module QA
           Resource::KubernetesCluster::ProjectCluster.fabricate! do |k8s_cluster|
             k8s_cluster.project = project
             k8s_cluster.cluster = cluster
-            k8s_cluster.install_helm_tiller = true
             k8s_cluster.install_ingress = true
             k8s_cluster.install_prometheus = true
             k8s_cluster.install_runner = true
diff --git a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb b/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
index 1eef6c06cd8..d9e5944b72c 100644
--- a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
+++ b/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Monitor', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/230927', type: :stale } do
+  RSpec.describe 'Monitor' do
     describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes, :requires_admin do
       before :all do
         @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
@@ -98,7 +98,6 @@ module QA
         Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
           cluster_settings.project = @project
           cluster_settings.cluster = @cluster
-          cluster_settings.install_helm_tiller = true
           cluster_settings.install_runner = true
           cluster_settings.install_ingress = true
           cluster_settings.install_prometheus = true