Minor fixes

Author: calind

pkg/controller/controllerutil/controllerutil.go

@@ -28,7 +28,7 @@ import (
 // SetControllerReference sets owner as a Controller OwnerReference on owned.
 // This is used for garbage collection of the owned object and for
 // reconciling the owner object on changes to owned (with a Watch + EnqueueRequestForOwner).
-// Since only one OwnerRecerence can be a controller, it returns an error if
+// Since only one OwnerReference can be a controller, it returns an error if
 // there is another OwnerReference with Controller flag set.
 func SetControllerReference(owner, object v1.Object, scheme *runtime.Scheme) error {
 	ro, ok := owner.(runtime.Object)
@@ -52,9 +52,9 @@ func SetControllerReference(owner, object v1.Object, scheme *runtime.Scheme) err
 	existingRefs := object.GetOwnerReferences()
 	fi := -1
 	for i, r := range existingRefs {
-		if r.Kind == gvk.Kind && r.Name == owner.GetName() && r.UID == owner.GetUID() {
+		if r.Kind == ref.Kind && r.Name == ref.Name && r.UID == ref.UID {
 			fi = i
-		} else if r.Controller != nil && *r.Controller {
+		} else if *r.Controller {
 			return fmt.Errorf("Object %s/%s is already owned by another %s controller %s", object.GetNamespace(), object.GetName(), r.Kind, r.Name)
 		}
 	}