Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 6 deletions

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index 8b623a54e27..74937d320d3 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -101,10 +101,5 @@ FactoryBot.define do
     factory :clusters_applications_runner, class: 'Clusters::Applications::Runner' do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
-
-    factory :clusters_applications_knative, class: 'Clusters::Applications::Knative' do
-      hostname { 'example.com' }
-      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 6518d74a5d2..a0c2f85a89c 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -94,7 +94,6 @@ FactoryBot.define do
       application_helm factory: %i(clusters_applications_helm installed)
       application_ingress factory: %i(clusters_applications_ingress installed)
       application_runner factory: %i(clusters_applications_runner installed)
-      application_knative factory: %i(clusters_applications_knative installed)
     end
 
     trait :with_domain do