remove owner passed in to RemoveControlleReference only when that owner controller equals true

Signed-off-by: Troy Connor <[email protected]>

Author: troy0820

pkg/controller/controllerutil/controllerutil.go

@@ -171,7 +171,14 @@ func RemoveControllerReference(owner, object metav1.Object, scheme *runtime.Sche
 	if ok := HasControllerReference(object); !ok {
 		return fmt.Errorf("%T does not have a owner reference with controller equals true", object)
 	}
-	return RemoveOwnerReference(owner, object, scheme)
+	ownerRefs := object.GetOwnerReferences()
+	for _, ownerRef := range ownerRefs {
+		t := ptr.To(true)
+		if ownerRef.Controller == t && ownerRef.Name == owner.GetName() {
+			return RemoveOwnerReference(owner, object, scheme)
+		}
+	}
+	return fmt.Errorf("%T is not owned reference by %T where controller equals true", object, owner)
 }
 
 func upsertOwnerRef(ref metav1.OwnerReference, object metav1.Object) {