diff options
| author | Tiger <twatson@gitlab.com> | 2019-04-15 12:11:50 +1000 |
|---|---|---|
| committer | Tiger <twatson@gitlab.com> | 2019-04-16 13:59:37 +1000 |
| commit | e33ecfdec30a8efee191f8c2dd85ca54011128ce (patch) | |
| tree | 9b97e13ff405e56add3a45ab1ce6ff4433e6e1d5 /lib/gitlab/ci/build | |
| parent | 0a99e0220d9371423039f05f700af3675b26624f (diff) | |
| download | gitlab-ce-e33ecfdec30a8efee191f8c2dd85ca54011128ce.tar.gz | |
Disable JIT resource creation for project clusters60500-disable-jit-kubernetes-resource-creation-for-project-level-clusters
JIT resource creation blocks deployments if a user is
self-managing their cluster, as it will fail the build
if unable to create a namespace and service account.
Using a custom namespace and service account was previously
supported for project level clusters, so we should preserve
this functionality.
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27352
Diffstat (limited to 'lib/gitlab/ci/build')
| -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! |