Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/reconciler/knativeserving/knativeserving_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,16 @@ func (r *Reconciler) delete(instance *servingv1alpha1.KnativeServing) error {
if len(instance.GetFinalizers()) == 0 || instance.GetFinalizers()[0] != finalizerName {
return nil
}
var RBAC = mf.Any(mf.ByKind("Role"), mf.ByKind("ClusterRole"), mf.ByKind("RoleBinding"), mf.ByKind("ClusterRoleBinding"))
if len(r.servings) == 0 {
if err := r.config.Filter(mf.ByKind("Deployment")).Delete(); err != nil {
return err
}
if err := r.config.Filter(mf.NoCRDs).Delete(); err != nil {
if err := r.config.Filter(mf.NoCRDs, mf.None(RBAC)).Delete(); err != nil {
return err
}
// Delete Roles last, as they may be useful for human operators to clean up.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add a unit test to verify this behavior

if err := r.config.Filter(RBAC).Delete(); err != nil {
Comment thread
Cynocracy marked this conversation as resolved.
return err
}
}
Expand Down