From 07f75c4732c581b6ce09baa51e19e461aee09ac7 Mon Sep 17 00:00:00 2001
From: benjaminapetersen <admin@benjaminapetersen.me>
Date: Thu, 23 Feb 2017 10:35:41 -0500
Subject: [PATCH] Fix bug 1426118, ignore namespace except for service account

---
 app/scripts/controllers/membership.js | 6 ++++--
 dist/scripts/scripts.js               | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/scripts/controllers/membership.js b/app/scripts/controllers/membership.js
index 5f292e28d0..cfb3671c84 100644
--- a/app/scripts/controllers/membership.js
+++ b/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
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 8ca167fde9..73ac80f373 100644
--- a/dist/scripts/scripts.js
+++ b/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
 }