Merge pull request openshift#673 from enj/automated-cherry-pick-of-#13563-upstream-ose-enterprise-3.5

Merged by openshift-bot

Author: OpenShift Bot

pkg/project/controller/controller.go

@@ -97,6 +97,24 @@ func deleteAllContent(client osclient.Interface, namespace string) (err error) {
 	if err != nil {
 		return err
 	}
+	err = deleteRoleBindingRestrictions(client, namespace)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func deleteRoleBindingRestrictions(client osclient.Interface, ns string) error {
+	items, err := client.RoleBindingRestrictions(ns).List(kapi.ListOptions{})
+	if err != nil {
+		return err
+	}
+	for i := range items.Items {
+		err := client.RoleBindingRestrictions(ns).Delete(items.Items[i].Name)
+		if err != nil && !errors.IsNotFound(err) {
+			return err
+		}
+	}
 	return nil
 }
 

pkg/project/controller/controller_test.go

@@ -52,6 +52,7 @@ func TestSyncNamespaceThatIsTerminating(t *testing.T) {
 		core.NewListAction(unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "namespace"}, "", kapi.ListOptions{}),
 		core.NewListAction(unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "deploymentconfig"}, "", kapi.ListOptions{}),
 		core.NewListAction(unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "egressnetworkpolicy"}, "", kapi.ListOptions{}),
+		core.NewListAction(unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "rolebindingrestrictions"}, "", kapi.ListOptions{}),
 	}
 	kubeActionSet := []core.Action{}
 	originActionSet := []core.Action{}