diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-17 18:41:15 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-17 18:41:15 +0000 |
| commit | a6a1afe070ffe4fa66b5ace9d35ca8c6ee481986 (patch) | |
| tree | c2a72f4fb532f6a35605f4e59f7041a5714e80c5 /app/services | |
| parent | 52375ed701370939f4fd50e68131954d9285794f (diff) | |
| parent | e33ecfdec30a8efee191f8c2dd85ca54011128ce (diff) | |
| download | gitlab-ce-a6a1afe070ffe4fa66b5ace9d35ca8c6ee481986.tar.gz | |
Merge branch '60500-disable-jit-kubernetes-resource-creation-for-project-level-clusters' into 'master'
Disable JIT Kubernetes resource creation for project level clusters
Closes #60500
See merge request gitlab-org/gitlab-ce!27352
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/clusters/refresh_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/clusters/refresh_service.rb b/app/services/clusters/refresh_service.rb index 7c82b98a33f..76ad8dd0fb0 100644 --- a/app/services/clusters/refresh_service.rb +++ b/app/services/clusters/refresh_service.rb @@ -21,7 +21,11 @@ module Clusters private_class_method :projects_with_missing_kubernetes_namespaces_for_cluster def self.clusters_with_missing_kubernetes_namespaces_for_project(project) - project.all_clusters.missing_kubernetes_namespace(project.kubernetes_namespaces) + if Feature.enabled?(:ci_preparing_state, default_enabled: true) + project.clusters.missing_kubernetes_namespace(project.kubernetes_namespaces) + else + project.all_clusters.missing_kubernetes_namespace(project.kubernetes_namespaces) + end end private_class_method :clusters_with_missing_kubernetes_namespaces_for_project |