HybridProxy: Deal with removed service ObjectRef

Upstream removed our ObjectReference in the ServiceInfo.  Now, we have
to fake an object reference when we submit events using just the name
and namespace from the service info.

Author: DirectXMan12

pkg/proxy/unidler/unidlerproxy.go

@@ -4,6 +4,7 @@ import (
 	"net"
 	"time"
 
+	"k8s.io/apimachinery/pkg/types"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/record"
@@ -18,23 +19,20 @@ import (
 type NeedPodsSignaler interface {
 	// NeedPods signals that endpoint addresses are needed in order to
 	// service a traffic coming to the given service and port
-	NeedPods(serviceRef api.ObjectReference, port string) error
+	NeedPods(serviceName types.NamespacedName, port string) error
 }
 
 type eventSignaler struct {
 	recorder record.EventRecorder
 }
 
-func (sig *eventSignaler) NeedPods(serviceRefInt api.ObjectReference, port string) error {
-	// TODO(directxman12): fix upstream so that it passes around v1.ObjectReference instead of api.ObjectReference
-	// NB: api.ObjectReference doesn't appear to be registered as a type, so we have to do manual conversion...
+func (sig *eventSignaler) NeedPods(serviceName types.NamespacedName, port string) error {
+	// TODO: we need to fake this since upstream removed our handle to the ObjectReference
+	// This *should* be sufficient for the unidling controller
 	serviceRef := v1.ObjectReference{
-		Kind:            serviceRefInt.Kind,
-		Namespace:       serviceRefInt.Namespace,
-		Name:            serviceRefInt.Name,
-		UID:             serviceRefInt.UID,
-		APIVersion:      serviceRefInt.APIVersion,
-		ResourceVersion: serviceRefInt.ResourceVersion,
+		Kind:      "Service",
+		Namespace: serviceName.Namespace,
+		Name:      serviceName.Name,
 	}
 
 	// HACK: make the message different to prevent event aggregation

pkg/proxy/unidler/unidlersocket.go

@@ -199,7 +199,7 @@ func (tcp *tcpUnidlerSocket) acceptConns(ch chan<- net.Conn, svcInfo *userspace.
 // (and thus the hybrid proxy has switched this service over to using the normal proxy).  Connections will
 // be gradually timed out and dropped off the list of connections on a per-connection basis.  The list of current
 // connections is returned, in addition to whether or not we should retry this method.
-func (tcp *tcpUnidlerSocket) awaitAwakening(service proxy.ServicePortName, serviceRef api.ObjectReference, loadBalancer userspace.LoadBalancer, inConns <-chan net.Conn, endpointsAvail chan<- interface{}) (*connectionList, bool) {
+func (tcp *tcpUnidlerSocket) awaitAwakening(service proxy.ServicePortName, loadBalancer userspace.LoadBalancer, inConns <-chan net.Conn, endpointsAvail chan<- interface{}) (*connectionList, bool) {
 	// collect connections and wait for endpoints to be available
 	sent_need_pods := false
 	timeout_started := false
@@ -218,7 +218,7 @@ func (tcp *tcpUnidlerSocket) awaitAwakening(service proxy.ServicePortName, servi
 
 			if !sent_need_pods && !loadBalancer.ServiceHasEndpoints(service) {
 				glog.V(4).Infof("unidling TCP proxy sent unidle event to wake up service %s/%s:%s", service.Namespace, service.Name, service.Port)
-				tcp.signaler.NeedPods(serviceRef, service.Port)
+				tcp.signaler.NeedPods(service.NamespacedName, service.Port)
 
 				// only send NeedPods once
 				sent_need_pods = true
@@ -262,7 +262,7 @@ func (tcp *tcpUnidlerSocket) ProxyLoop(service proxy.ServicePortName, svcInfo *u
 		glog.V(4).Infof("unidling TCP proxy start/reset for service %s/%s:%s", service.Namespace, service.Name, service.Port)
 
 		var cont bool
-		if allConns, cont = tcp.awaitAwakening(service, svcInfo.ServiceRef, loadBalancer, inConns, endpointsAvail); !cont {
+		if allConns, cont = tcp.awaitAwakening(service, loadBalancer, inConns, endpointsAvail); !cont {
 			break
 		}
 	}
@@ -342,7 +342,7 @@ func (udp *udpUnidlerSocket) readFromSock(buffer []byte, svcInfo *userspace.Serv
 func (udp *udpUnidlerSocket) sendWakeup(svcPortName proxy.ServicePortName, svcInfo *userspace.ServiceInfo) *time.Timer {
 	timeoutTimer := time.NewTimer(needPodsWaitTimeout)
 	glog.V(4).Infof("unidling proxy sent unidle event to wake up service %s/%s:%s", svcPortName.Namespace, svcPortName.Name, svcPortName.Port)
-	udp.signaler.NeedPods(svcInfo.ServiceRef, svcPortName.Port)
+	udp.signaler.NeedPods(svcPortName.NamespacedName, svcPortName.Port)
 
 	return timeoutTimer
 }