From 5ee74d5838fd887e1ff9d9ff200bc0b04e6cd811 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Tue, 2 May 2017 13:28:05 +0200 Subject: [PATCH] Fix kube-proxy to watch services and endpoints --- pkg/kubemark/hollow_proxy.go | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go index 24a56943c0..e040784060 100644 --- a/pkg/kubemark/hollow_proxy.go +++ b/pkg/kubemark/hollow_proxy.go @@ -38,7 +38,10 @@ type HollowProxy struct { type FakeProxyHandler struct{} -func (*FakeProxyHandler) OnServiceUpdate(services []*api.Service) {} +func (*FakeProxyHandler) OnServiceAdd(service *api.Service) {} +func (*FakeProxyHandler) OnServiceUpdate(oldService, service *api.Service) {} +func (*FakeProxyHandler) OnServiceDelete(service *api.Service) {} +func (*FakeProxyHandler) OnServiceSynced() {} func (*FakeProxyHandler) OnEndpointsAdd(endpoints *api.Endpoints) {} func (*FakeProxyHandler) OnEndpointsUpdate(oldEndpoints, endpoints *api.Endpoints) {} func (*FakeProxyHandler) OnEndpointsDelete(endpoints *api.Endpoints) {} @@ -46,8 +49,7 @@ func (*FakeProxyHandler) OnEndpointsSynced() type FakeProxier struct{} -func (*FakeProxier) OnServiceUpdate(services []*api.Service) {} -func (*FakeProxier) Sync() {} +func (*FakeProxier) Sync() {} func (*FakeProxier) SyncLoop() { select {} } @@ -70,17 +72,19 @@ func NewHollowProxyOrDie( return &HollowProxy{ ProxyServer: &proxyapp.ProxyServer{ - Client: client, - EventClient: eventClient, - IptInterface: iptInterface, - Proxier: &FakeProxier{}, - Broadcaster: broadcaster, - Recorder: recorder, - ProxyMode: "fake", - NodeRef: nodeRef, - OOMScoreAdj: util.Int32Ptr(0), - ResourceContainer: "", - ConfigSyncPeriod: 30 * time.Second, + Client: client, + EventClient: eventClient, + IptInterface: iptInterface, + Proxier: &FakeProxier{}, + Broadcaster: broadcaster, + Recorder: recorder, + ProxyMode: "fake", + NodeRef: nodeRef, + OOMScoreAdj: util.Int32Ptr(0), + ResourceContainer: "", + ConfigSyncPeriod: 30 * time.Second, + ServiceEventHandler: &FakeProxyHandler{}, + EndpointsEventHandler: &FakeProxyHandler{}, }, } }