Fix Envoy service status watching

We all missed in #2583 that not all informers handle Unstructured objects; wrap the service status informer in the dynamicHandler to ensure that no Unstructured objects make it through. Service status watching was broken before this, as it didn't handle Unstructured. Signed-off-by: Nick Young <[email protected]>
projectcontour · Jun 19, 2020 · 3db40fd · 3db40fd
1 parent 8067ec9
commit 3db40fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cmd/contour/serve.go b/cmd/contour/serve.go
@@ -343,12 +343,16 @@ func doServe(log logrus.FieldLogger, ctx *serveContext) error {
 
 	// step 12. register an informer to watch envoy's service if we haven't been given static details.
 	if ctx.IngressStatusAddress == "" {
-		ssw := &k8s.ServiceStatusLoadBalancerWatcher{
-			ServiceName: ctx.EnvoyServiceName,
-			LBStatus:    lbsw.lbStatus,
+		dynamicServiceHandler := &k8s.DynamicClientHandler{
+			Next: &k8s.ServiceStatusLoadBalancerWatcher{
+				ServiceName: ctx.EnvoyServiceName,
+				LBStatus:    lbsw.lbStatus,
+			},
+			Converter: converter,
+			Logger:    log.WithField("context", "serviceStatusLoadBalancerWatcher"),
 		}
 		factory := clients.NewInformerFactoryForNamespace(ctx.EnvoyServiceNamespace)
-		informerSyncList.InformOnResources(factory, ssw, k8s.ServicesResources()...)
+		informerSyncList.InformOnResources(factory, dynamicServiceHandler, k8s.ServicesResources()...)
 		g.Add(startInformer(factory, log.WithField("context", "serviceStatusLoadBalancerWatcher")))
 		log.WithField("envoy-service-name", ctx.EnvoyServiceName).
 			WithField("envoy-service-namespace", ctx.EnvoyServiceNamespace).

diff --git a/internal/k8s/syncer.go b/internal/k8s/syncer.go
@@ -26,7 +26,8 @@ type InformerSyncList struct {
 }
 
 // InformOnResources creates informers for each of the given resources and registers their sync callbacks.
-func (sl *InformerSyncList) InformOnResources(f InformerFactory, handler cache.ResourceEventHandler, resources ...schema.GroupVersionResource) {
+func (sl *InformerSyncList) InformOnResources(f InformerFactory, handler *DynamicClientHandler, resources ...schema.GroupVersionResource) {
+
 	for _, r := range resources {
 		informer := f.ForResource(r).Informer()
 		informer.AddEventHandler(handler)