From 63d2cfd501836001826130fe2963223b70d6c236 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 9 Feb 2018 10:23:49 -0500 Subject: [PATCH] Fix oc policy remove-user to remove rolebindings too Followup to #18102 Signed-off-by: Simo Sorce --- pkg/oc/admin/policy/remove_from_project.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/oc/admin/policy/remove_from_project.go b/pkg/oc/admin/policy/remove_from_project.go index cd641c889c7f..47bde91f51e0 100644 --- 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 }