Commit e3df8e79 authored by svistas's avatar svistas

Remove helm installation button

Prior to this change, the Helm
button was required to install further
applications on the Kubernetes cluster.
The Helm installation button has been
 removed and tests are currently failing
in qa-master as they needed it to be
installed.
This change, removes the need to install
Helm via the UI.
parent a4274e82
...@@ -5,7 +5,7 @@ module QA ...@@ -5,7 +5,7 @@ module QA
module KubernetesCluster module KubernetesCluster
class ProjectCluster < Base class ProjectCluster < Base
attr_writer :cluster, attr_writer :cluster,
:install_helm_tiller, :install_ingress, :install_prometheus, :install_runner, :domain :install_ingress, :install_prometheus, :install_runner, :domain
attribute :project do attribute :project do
Resource::Project.fabricate! Resource::Project.fabricate!
...@@ -36,33 +36,27 @@ module QA ...@@ -36,33 +36,27 @@ module QA
cluster_page.add_cluster! cluster_page.add_cluster!
end end
if @install_helm_tiller Page::Project::Operations::Kubernetes::Show.perform do |show|
Page::Project::Operations::Kubernetes::Show.perform do |show| # We must wait a few seconds for permissions to be set up correctly for new cluster
# We must wait a few seconds for permissions to be set up correctly for new cluster sleep 25
sleep 10
# Open applications tab # Open applications tab
show.open_applications show.open_applications
# Helm must be installed before everything else show.install!(:ingress) if @install_ingress
show.install!(:helm) show.install!(:prometheus) if @install_prometheus
show.await_installed(:helm) show.install!(:runner) if @install_runner
show.install!(:ingress) if @install_ingress show.await_installed(:ingress) if @install_ingress
show.install!(:prometheus) if @install_prometheus show.await_installed(:prometheus) if @install_prometheus
show.install!(:runner) if @install_runner show.await_installed(:runner) if @install_runner
show.await_installed(:ingress) if @install_ingress if @install_ingress
show.await_installed(:prometheus) if @install_prometheus populate(:ingress_ip)
show.await_installed(:runner) if @install_runner
if @install_ingress show.open_details
populate(:ingress_ip) show.set_domain("#{ingress_ip}.nip.io")
show.save_domain
show.open_details
show.set_domain("#{ingress_ip}.nip.io")
show.save_domain
end
end end
end end
end end
......
...@@ -38,7 +38,7 @@ module QA ...@@ -38,7 +38,7 @@ module QA
--no-deploy traefik --no-deploy traefik
CMD 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 shell command
end end
......
...@@ -38,7 +38,6 @@ module QA ...@@ -38,7 +38,6 @@ module QA
Resource::KubernetesCluster::ProjectCluster.fabricate! do |k8s_cluster| Resource::KubernetesCluster::ProjectCluster.fabricate! do |k8s_cluster|
k8s_cluster.project = project k8s_cluster.project = project
k8s_cluster.cluster = cluster k8s_cluster.cluster = cluster
k8s_cluster.install_helm_tiller = true
k8s_cluster.install_ingress = true k8s_cluster.install_ingress = true
k8s_cluster.install_prometheus = true k8s_cluster.install_prometheus = true
k8s_cluster.install_runner = true k8s_cluster.install_runner = true
......
# frozen_string_literal: true # frozen_string_literal: true
module QA 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 describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes, :requires_admin do
before :all do before :all do
@cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create! @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
...@@ -98,7 +98,6 @@ module QA ...@@ -98,7 +98,6 @@ module QA
Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings| Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
cluster_settings.project = @project cluster_settings.project = @project
cluster_settings.cluster = @cluster cluster_settings.cluster = @cluster
cluster_settings.install_helm_tiller = true
cluster_settings.install_runner = true cluster_settings.install_runner = true
cluster_settings.install_ingress = true cluster_settings.install_ingress = true
cluster_settings.install_prometheus = true cluster_settings.install_prometheus = true
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
require 'pathname' require 'pathname'
module QA 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 do describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes, :requires_admin do
before :all do before :all do
@cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create! @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
@project = Resource::Project.fabricate_via_api! do |project| @project = Resource::Project.fabricate_via_api! do |project|
...@@ -70,7 +70,6 @@ module QA ...@@ -70,7 +70,6 @@ module QA
Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings| Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
cluster_settings.project = @project cluster_settings.project = @project
cluster_settings.cluster = @cluster cluster_settings.cluster = @cluster
cluster_settings.install_helm_tiller = true
cluster_settings.install_runner = true cluster_settings.install_runner = true
cluster_settings.install_ingress = true cluster_settings.install_ingress = true
cluster_settings.install_prometheus = true cluster_settings.install_prometheus = true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment