Merge pull request #74 from droot/fix-watch-controller-of

fixed infinite loop in watchControllerOf API

Author: Phillip Wittrock

pkg/controller/eventhandlers/eventhandlers.go

@@ -127,29 +127,32 @@ func (m MapToController) Map(obj interface{}) string {
 	o := object
 	for len(m.Path) > 0 {
 		// Get the owner reference
-		if ownerRef := metav1.GetControllerOf(o); ownerRef != nil {
-			// Resolve the owner object and check if the UID of the looked up object matches the reference.
-			owner, err := m.Path[0](types.ReconcileKey{Name: ownerRef.Name, Namespace: o.GetNamespace()})
-			if err != nil || owner == nil {
-				glog.V(2).Infof("Could not lookup owner %v %v", owner, err)
-				return ""
-			}
-			var ownerObject metav1.Object
-			if ownerObject, ok = owner.(metav1.Object); !ok {
-				glog.V(2).Infof("No ObjectMeta for owner %v %v", owner, err)
-				return ""
-			}
-			if ownerObject.GetUID() != ownerRef.UID {
-				return ""
-			}
+		ownerRef := metav1.GetControllerOf(o)
+		if ownerRef == nil {
+			glog.V(2).Infof("object %v does not have any owner reference", o)
+			return ""
+		}
+		// Resolve the owner object and check if the UID of the looked up object matches the reference.
+		owner, err := m.Path[0](types.ReconcileKey{Name: ownerRef.Name, Namespace: o.GetNamespace()})
+		if err != nil || owner == nil {
+			glog.V(2).Infof("Could not lookup owner %v %v", owner, err)
+			return ""
+		}
+		var ownerObject metav1.Object
+		if ownerObject, ok = owner.(metav1.Object); !ok {
+			glog.V(2).Infof("No ObjectMeta for owner %v %v", owner, err)
+			return ""
+		}
+		if ownerObject.GetUID() != ownerRef.UID {
+			return ""
+		}
 
-			// Pop the path element or return the value
-			if len(m.Path) > 1 {
-				o = ownerObject
-				m.Path = m.Path[1:]
-			} else {
-				return object.GetNamespace() + "/" + ownerRef.Name
-			}
+		// Pop the path element or return the value
+		if len(m.Path) > 1 {
+			o = ownerObject
+			m.Path = m.Path[1:]
+		} else {
+			return object.GetNamespace() + "/" + ownerRef.Name
 		}
 	}
 	return ""