diff options
Diffstat (limited to 'spec/factories/clusters')
-rw-r--r-- | spec/factories/clusters/applications/helm.rb | 26 | ||||
-rw-r--r-- | spec/factories/clusters/clusters.rb | 6 |
2 files changed, 1 insertions, 31 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb index 1ff1292c36e..29197768ec0 100644 --- a/spec/factories/clusters/applications/helm.rb +++ b/spec/factories/clusters/applications/helm.rb @@ -96,26 +96,7 @@ FactoryBot.define do end factory :clusters_applications_ingress, class: 'Clusters::Applications::Ingress' do - modsecurity_enabled { false } cluster factory: %i(cluster with_installed_helm provided_by_gcp) - - trait :modsecurity_blocking do - modsecurity_enabled { true } - modsecurity_mode { :blocking } - end - - trait :modsecurity_logging do - modsecurity_enabled { true } - modsecurity_mode { :logging } - end - - trait :modsecurity_disabled do - modsecurity_enabled { false } - end - - trait :modsecurity_not_installed do - modsecurity_enabled { nil } - end end factory :clusters_applications_cert_manager, class: 'Clusters::Applications::CertManager' do @@ -151,13 +132,6 @@ FactoryBot.define do cluster factory: %i(cluster with_installed_helm provided_by_gcp project) end - factory :clusters_applications_fluentd, class: 'Clusters::Applications::Fluentd' do - host { 'example.com' } - waf_log_enabled { true } - cilium_log_enabled { true } - cluster factory: %i(cluster with_installed_helm provided_by_gcp) - end - factory :clusters_applications_cilium, class: 'Clusters::Applications::Cilium' do cluster factory: %i(cluster with_installed_helm provided_by_gcp) end diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb index 0daf624ae7e..7666533691e 100644 --- a/spec/factories/clusters/clusters.rb +++ b/spec/factories/clusters/clusters.rb @@ -88,6 +88,7 @@ FactoryBot.define do trait :with_installed_prometheus do application_prometheus factory: %i(clusters_applications_prometheus installed) + integration_prometheus factory: %i(clusters_integrations_prometheus) end trait :with_all_applications do @@ -100,7 +101,6 @@ FactoryBot.define do application_jupyter factory: %i(clusters_applications_jupyter installed) application_knative factory: %i(clusters_applications_knative installed) application_elastic_stack factory: %i(clusters_applications_elastic_stack installed) - application_fluentd factory: %i(clusters_applications_fluentd installed) application_cilium factory: %i(clusters_applications_cilium installed) end @@ -138,10 +138,6 @@ FactoryBot.define do cleanup_status { 1 } end - trait :cleanup_uninstalling_applications do - cleanup_status { 2 } - end - trait :cleanup_removing_project_namespaces do cleanup_status { 3 } end |