summaryrefslogtreecommitdiff
path: root/spec/factories/clusters
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-07-31 13:15:18 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-07-31 13:15:18 +0000
commitb21730116ea14fc1ac153478ed058e505bceed17 (patch)
treeb3c6c481f1a3368ad13cb2b1471b94a4b1034965 /spec/factories/clusters
parent5a3948a5733d7d4dc09bfa2daeaad5cc15ba2a00 (diff)
downloadgitlab-ce-b21730116ea14fc1ac153478ed058e505bceed17.tar.gz
Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"
This reverts merge request !20801
Diffstat (limited to 'spec/factories/clusters')
-rw-r--r--spec/factories/clusters/applications/helm.rb16
-rw-r--r--spec/factories/clusters/clusters.rb4
2 files changed, 3 insertions, 17 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index 7c4a440b9a9..3e4277e4ba6 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -32,21 +32,11 @@ FactoryBot.define do
updated_at ClusterWaitForAppInstallationWorker::TIMEOUT.ago
end
- factory :clusters_applications_ingress, class: Clusters::Applications::Ingress do
- cluster factory: %i(cluster with_installed_helm provided_by_gcp)
- end
-
- factory :clusters_applications_prometheus, class: Clusters::Applications::Prometheus do
- cluster factory: %i(cluster with_installed_helm provided_by_gcp)
- end
-
- factory :clusters_applications_runner, class: Clusters::Applications::Runner do
- cluster factory: %i(cluster with_installed_helm provided_by_gcp)
- end
-
+ factory :clusters_applications_ingress, class: Clusters::Applications::Ingress
+ factory :clusters_applications_prometheus, class: Clusters::Applications::Prometheus
+ factory :clusters_applications_runner, class: Clusters::Applications::Runner
factory :clusters_applications_jupyter, class: Clusters::Applications::Jupyter do
oauth_application factory: :oauth_application
- cluster factory: %i(cluster with_installed_helm provided_by_gcp)
end
end
end
diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index bbeba8ce8b9..0430762c1ff 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -36,9 +36,5 @@ FactoryBot.define do
trait :production_environment do
sequence(:environment_scope) { |n| "production#{n}/*" }
end
-
- trait :with_installed_helm do
- application_helm factory: %i(clusters_applications_helm installed)
- end
end
end