Make small modification on RoleBinding service51716-create-kube-namespace

- Changes RoleRef to use cluster-edit instead of simple edit, as this one
does not exists
- Also include minor comments from BE review regarding useless if/else
  branching.

1 files changed, 2 insertions, 6 deletions

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 78aa9216f4d..cd14137d08e 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -85,7 +85,7 @@ module Clusters
           else
             # From 11.5, every Clusters::Project should have at least one
             # Clusters::KubernetesNamespace, so once migration has been completed,
-            # this else will be removed. For more information, please see
+            # this 'else' branch will be removed. For more information, please see
             # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22433
             config = YAML.dump(kubeconfig)
 
@@ -129,14 +129,10 @@ module Clusters
         to_kubeconfig(
           url: api_url,
           namespace: actual_namespace,
-          token: default_service_account_token,
+          token: token,
           ca_pem: ca_pem)
       end
 
-      def default_service_account_token
-        kubernetes_namespace&.service_account_token.presence || token
-      end
-
       def default_namespace
         kubernetes_namespace&.namespace.presence || fallback_default_namespace
       end