Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 0 insertions, 26 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