Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 0 deletions

diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index d294e6d055e..29aea5e403e 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -58,6 +58,10 @@ FactoryBot.define do
       platform_kubernetes factory: [:cluster_platform_kubernetes, :configured, :rbac_disabled]
     end
 
+    trait :cloud_run_enabled do
+      provider_gcp factory: [:cluster_provider_gcp, :created, :cloud_run_enabled]
+    end
+
     trait :disabled do
       enabled false
     end
diff --git a/spec/factories/clusters/providers/gcp.rb b/spec/factories/clusters/providers/gcp.rb
index 22462651b6a..7fdcdebad34 100644
--- a/spec/factories/clusters/providers/gcp.rb
+++ b/spec/factories/clusters/providers/gcp.rb
@@ -34,5 +34,9 @@ FactoryBot.define do
     trait :abac_enabled do
       legacy_abac true
     end
+
+    trait :cloud_run_enabled do
+      cloud_run true
+    end
   end
 end