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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb index 41135ae62bb..bb2b209e793 100644 --- a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb +++ b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb @@ -6,7 +6,9 @@ module Gitlab module Prerequisite class KubernetesNamespace < Base def unmet? - deployment_cluster.present? && kubernetes_namespace.new_record? + deployment_cluster.present? && + !deployment_cluster.project_type? && + kubernetes_namespace.new_record? end def complete! |