diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/services/clusters | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/services/clusters')
-rw-r--r-- | app/services/clusters/kubernetes/create_or_update_service_account_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/clusters/kubernetes/create_or_update_service_account_service.rb b/app/services/clusters/kubernetes/create_or_update_service_account_service.rb index b1820474c9d..2725a3aeaa5 100644 --- a/app/services/clusters/kubernetes/create_or_update_service_account_service.rb +++ b/app/services/clusters/kubernetes/create_or_update_service_account_service.rb @@ -117,9 +117,11 @@ module Clusters end def role_binding_resource + role_name = Feature.enabled?(:kubernetes_cluster_namespace_role_admin) ? 'admin' : Clusters::Kubernetes::PROJECT_CLUSTER_ROLE_NAME + Gitlab::Kubernetes::RoleBinding.new( name: role_binding_name, - role_name: Clusters::Kubernetes::PROJECT_CLUSTER_ROLE_NAME, + role_name: role_name, role_kind: :ClusterRole, namespace: service_account_namespace, service_account_name: service_account_name |