Fix oc policy remove-user to remove rolebindings too

Followup to openshift#18102 Signed-off-by: Simo Sorce <[email protected]>
simo5 · Feb 9, 2018 · 63d2cfd · 63d2cfd
1 parent 073bb37
commit 63d2cfd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/oc/admin/policy/remove_from_project.go b/pkg/oc/admin/policy/remove_from_project.go
@@ -176,7 +176,11 @@ func (o *RemoveFromProjectOptions) Run() error {
 		}
 
 		if !o.DryRun {
-			_, err = o.Client.RoleBindings(o.BindingNamespace).Update(&currBinding)
+			if len(currBinding.Subjects) > 0 {
+				_, err = o.Client.RoleBindings(o.BindingNamespace).Update(&currBinding)
+			} else {
+				_, err = o.Client.RoleBindings(o.BindingNamespace).Delete(currBinding.Name, &metav1.DeleteOptions{})
+			}
 			if err != nil {
 				return err
 			}