Merge pull request #1295 from benjaminapetersen/bug-1426118-rolebinding

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/membership.js

@@ -327,9 +327,11 @@ angular
             addRoleTo:function(subjectName, subjectKind, role, subjectNamespace) {
               var subject = {
                 name: subjectName,
-                kind: subjectKind,
-                namespace: subjectNamespace
+                kind: subjectKind
               };
+              if(subjectKind === 'ServiceAccount') {
+                subject.namespace = subjectNamespace;
+              }
               // TODO (bpeterse): future. Role/ClusterRole roleRef disambiguation
               // Edge case a user creates a local Role with same name as ClusterRole,
               // roleRef doesn't necessarily contain namespace. There may be a way to

dist/scripts/scripts.js

@@ -5669,9 +5669,10 @@ httpErr:a("getErrorDetails")(b)
 addRoleTo:function(a, b, c, e) {
 var f = {
 name:a,
-kind:b,
-namespace:e
-}, g = _.find(d.roleBindings, {
+kind:b
+};
+"ServiceAccount" === b && (f.namespace = e);
+var g = _.find(d.roleBindings, {
 roleRef:{
 name:c.metadata.name
 }