diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-06-17 22:28:36 +0000 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-17 22:28:36 +0000 |
commit | 12d262c23f5a783106c08cd385ecb86ccb4b899c (patch) | |
tree | 5c454f40babbd137d16119bd914ac7052451e2c1 /lib/gitlab/ci | |
parent | 2dea03bf103a05d98366d6a8e9e906e890147bdc (diff) | |
parent | ee28255b21b712bf3d92db548915fee43658a430 (diff) | |
download | gitlab-ce-12d262c23f5a783106c08cd385ecb86ccb4b899c.tar.gz |
Merge branch '55362-refresh-blank-service-account-token' into 'master'
Refresh service_account_token for kubernetes_namespaces
See merge request gitlab-org/gitlab-ce!29657
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r-- | lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb index dbdc59505ac..531c9ce4256 100644 --- a/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb +++ b/lib/gitlab/ci/build/prerequisite/kubernetes_namespace.rb @@ -9,7 +9,7 @@ module Gitlab deployment_cluster.present? && deployment_cluster.managed? && !deployment_cluster.project_type? && - kubernetes_namespace.new_record? + (kubernetes_namespace.new_record? || kubernetes_namespace.service_account_token.blank?) end def complete! |