MAISTRA-1755 invoke UpdateNamespaces() as part of MemberRollController.Register() (istio#169)

rcernich · mergify[bot] · web-flow · commit f0eed15f7a0c · 2020-08-17T16:33:02.000Z
Signed-off-by: rcernich &lt;rcernich@redhat.com&gt;

Co-authored-by: mergify[bot] &lt;37929162+mergify[bot]@users.noreply.github.com&gt;
diff --git a/galley/pkg/config/source/kube/rt/dynamic.go b/galley/pkg/config/source/kube/rt/dynamic.go
@@ -74,7 +74,7 @@ func (p *Provider) getDynamicAdapter(r resource.Schema) *Adapter {
 			})
 
 			if p.mrc != nil {
-				p.mrc.Register(mlw)
+				p.mrc.Register(mlw, fmt.Sprintf("galley-%s", r.GroupVersionKind().String()))
 			}
 
 			informer := cache.NewSharedIndexInformer(mlw, &unstructured.Unstructured{}, p.resyncPeriod,
diff --git a/galley/pkg/config/source/kube/rt/known.go b/galley/pkg/config/source/kube/rt/known.go
@@ -68,7 +68,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-service")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &v1.Service{}, p.resyncPeriod,
@@ -177,7 +177,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-pods")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &v1.Pod{}, p.resyncPeriod,
@@ -226,7 +226,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-secrets")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &v1.Secret{}, p.resyncPeriod,
@@ -274,7 +274,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-endpoints")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &v1.Endpoints{}, p.resyncPeriod,
@@ -334,7 +334,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-ingresses")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &v1beta1.Ingress{}, p.resyncPeriod,
@@ -421,7 +421,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-deployments")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &appsv1.Deployment{}, p.resyncPeriod,
@@ -468,7 +468,7 @@ func (p *Provider) initKnownAdapters() {
 					})
 
 				if p.mrc != nil {
-					p.mrc.Register(mlw)
+					p.mrc.Register(mlw, "galley-configmaps")
 				}
 
 				informer := cache.NewSharedIndexInformer(mlw, &v1.ConfigMap{}, p.resyncPeriod,
diff --git a/mixer/pkg/runtime/handler/env.go b/mixer/pkg/runtime/handler/env.go
@@ -154,7 +154,7 @@ func (e env) NewInformer(
 
 	mlw := listwatch.MultiNamespaceListerWatcher(*e.namespaces, listerWatcher)
 	if e.mrc != nil {
-		e.mrc.Register(mlw)
+		e.mrc.Register(mlw, "mixer-env")
 	}
 	return cache.NewSharedIndexInformer(mlw, objType, duration, indexers)
 }
diff --git a/pilot/pkg/config/kube/crd/controller/controller.go b/pilot/pkg/config/kube/crd/controller/controller.go
@@ -232,7 +232,7 @@ func (c *controller) newCacheHandler(
 
 	mlw := listwatch.MultiNamespaceListerWatcher(namespaces, lwf)
 	if mrc != nil {
-		mrc.Register(mlw)
+		mrc.Register(mlw, fmt.Sprintf("pilot-cache-%s", otype))
 	}
 
 	// TODO: finer-grained index (perf)
diff --git a/pilot/pkg/config/kube/ingress/controller.go b/pilot/pkg/config/kube/ingress/controller.go
@@ -153,7 +153,7 @@ func NewController(client kubernetes.Interface, mrc meshcontroller.MemberRollCon
 	})
 
 	if mrc != nil {
-		mrc.Register(mlw)
+		mrc.Register(mlw, "pilot-ingress-controller")
 	}
 
 	informer := cache.NewSharedIndexInformer(mlw, &ingress.Ingress{}, options.ResyncPeriod,
diff --git a/pilot/pkg/config/kube/ingress/status.go b/pilot/pkg/config/kube/ingress/status.go
@@ -101,7 +101,7 @@ func NewStatusSyncer(mesh *meshconfig.MeshConfig,
 	})
 
 	if mrc != nil {
-		mrc.Register(mlw)
+		mrc.Register(mlw, "pilot-ingress-status")
 	}
 
 	informer := cache.NewSharedIndexInformer(mlw, &v1beta1.Ingress{}, options.ResyncPeriod,
diff --git a/pilot/pkg/serviceregistry/kube/controller/controller.go b/pilot/pkg/serviceregistry/kube/controller/controller.go
@@ -278,7 +278,7 @@ func NewController(client kubernetes.Interface, metadataClient metadata.Interfac
 	})
 
 	if mrc != nil {
-		mrc.Register(svcMlw)
+		mrc.Register(svcMlw, "pilot-service")
 	}
 
 	c.services = cache.NewSharedIndexInformer(svcMlw, &v1.Service{}, options.ResyncPeriod,
diff --git a/pilot/pkg/serviceregistry/kube/controller/endpoints.go b/pilot/pkg/serviceregistry/kube/controller/endpoints.go
@@ -56,7 +56,7 @@ func newEndpointsController(c *Controller, mrc meshcontroller.MemberRollControll
 	})
 
 	if mrc != nil {
-		mrc.Register(mlw)
+		mrc.Register(mlw, "pilot-endpoints")
 	}
 
 	informer := cache.NewSharedIndexInformer(mlw, &v1.Endpoints{}, options.ResyncPeriod,
diff --git a/pilot/pkg/serviceregistry/kube/controller/endpointslice.go b/pilot/pkg/serviceregistry/kube/controller/endpointslice.go
@@ -60,7 +60,7 @@ func newEndpointSliceController(c *Controller, mrc meshcontroller.MemberRollCont
 	})
 
 	if mrc != nil {
-		mrc.Register(mlw)
+		mrc.Register(mlw, "pilot-endpointslice")
 	}
 
 	informer := cache.NewSharedIndexInformer(mlw, &discoveryv1alpha1.EndpointSlice{}, options.ResyncPeriod,
diff --git a/pilot/pkg/serviceregistry/kube/controller/namespacecontroller.go b/pilot/pkg/serviceregistry/kube/controller/namespacecontroller.go
@@ -66,9 +66,9 @@ type NamespaceController struct {
 	// Controller and store for ConfigMap objects
 	configMapController cache.Controller
 
-	// if this is true, we don't create a K8s controller, but only react on namespace changes
+	// if this is not null, we don't create a K8s controller, but only react on namespace changes
 	// coming from the MRC
-	usesMemberRollController bool
+	mrc meshcontroller.MemberRollController
 
 	// only used if usesMemberRollController is true
 	started    bool
@@ -140,9 +140,8 @@ func NewNamespaceController(data func() map[string]string, options Options, kube
 	c.configMapController = configmapInformer
 
 	if mrc != nil {
-		mrc.Register(mlw)
-		mrc.Register(c)
-		c.usesMemberRollController = true
+		mrc.Register(mlw, "pilot-configmap")
+		c.mrc = mrc
 		return c
 	}
 
@@ -166,22 +165,28 @@ func NewNamespaceController(data func() map[string]string, options Options, kube
 
 // Run starts the NamespaceController until a value is sent to stopCh.
 func (nc *NamespaceController) Run(stopCh <-chan struct{}) {
-	if nc.usesMemberRollController {
+	var syncs []cache.InformerSynced
+	if nc.mrc != nil {
 		nc.mutex.Lock()
 		nc.started = true
 		nc.mutex.Unlock()
+
+		log.Infof("Namespace controller (MRC) started")
+		nc.mrc.Register(nc, "pilot-namespace")
+
 		go func() {
 			<-stopCh
 			nc.mutex.Lock()
 			nc.started = false
 			nc.mutex.Unlock()
 		}()
-		log.Infof("Namespace controller (MRC) started")
-		return
+	} else {
+		go nc.namespaceController.Run(stopCh)
+		syncs = append(syncs, nc.namespaceController.HasSynced)
 	}
-	go nc.namespaceController.Run(stopCh)
 	go nc.configMapController.Run(stopCh)
-	cache.WaitForCacheSync(stopCh, nc.namespaceController.HasSynced, nc.configMapController.HasSynced)
+	syncs = append(syncs, nc.configMapController.HasSynced)
+	cache.WaitForCacheSync(stopCh, syncs...)
 	log.Infof("Namespace controller started")
 	go nc.queue.Run(stopCh)
 }
diff --git a/pilot/pkg/serviceregistry/kube/controller/pod.go b/pilot/pkg/serviceregistry/kube/controller/pod.go
@@ -65,7 +65,7 @@ func newPodCache(c *Controller, mrc meshcontroller.MemberRollController, options
 	})
 
 	if mrc != nil {
-		mrc.Register(mlw)
+		mrc.Register(mlw, "pilot-pod")
 	}
 
 	informer := cache.NewSharedIndexInformer(mlw, &v1.Pod{}, options.ResyncPeriod,
diff --git a/pkg/servicemesh/controller/controller.go b/pkg/servicemesh/controller/controller.go
@@ -44,7 +44,7 @@ type MemberRollListener interface {
 }
 
 type MemberRollController interface {
-	Register(listener MemberRollListener)
+	Register(listener MemberRollListener, name string)
 	Start(stop chan struct{})
 }
 
@@ -85,8 +85,8 @@ func (smmrc *serviceMeshMemberRollController) Start(stop chan struct{}) {
 	}
 }
 
-func (smmrc *serviceMeshMemberRollController) Register(listener MemberRollListener) {
-	smmrc.informer.AddEventHandler(smmrc.newServiceMeshMemberRollListener(listener))
+func (smmrc *serviceMeshMemberRollController) Register(listener MemberRollListener, name string) {
+	smmrc.informer.AddEventHandler(smmrc.newServiceMeshMemberRollListener(listener, name))
 }
 
 func (smmrc *serviceMeshMemberRollController) getNamespaces(namespaces []string) []string {
@@ -105,18 +105,22 @@ func (smmrc *serviceMeshMemberRollController) getNamespaces(namespaces []string)
 	return result
 }
 
-func (smmrc *serviceMeshMemberRollController) newServiceMeshMemberRollListener(listener MemberRollListener) cache.ResourceEventHandler {
-	return &serviceMeshMemberRollListener{
+func (smmrc *serviceMeshMemberRollController) newServiceMeshMemberRollListener(listener MemberRollListener, name string) cache.ResourceEventHandler {
+	handler := &serviceMeshMemberRollListener{
 		smmrc:             smmrc,
 		listener:          listener,
-		currentNamespaces: smmrc.getNamespaces(nil),
+		currentNamespaces: nil,
+		name:              name,
 	}
+	handler.updateNamespaces("add", smmrc.memberRollName, smmrc.getNamespaces(nil))
+	return handler
 }
 
 type serviceMeshMemberRollListener struct {
 	smmrc             *serviceMeshMemberRollController
 	listener          MemberRollListener
 	currentNamespaces []string
+	name              string
 }
 
 func (smmrl *serviceMeshMemberRollListener) checkEquality(lhs, rhs []string) bool {
@@ -142,7 +146,7 @@ func (smmrl *serviceMeshMemberRollListener) updateNamespaces(operation string, m
 		sort.Strings(namespaces)
 		if !smmrl.checkEquality(smmrl.currentNamespaces, namespaces) {
 			smmrl.currentNamespaces = namespaces
-			log.Infof("ServiceMeshMemberRoll %v %s, namespaces now %q", memberRollName, operation, smmrl.currentNamespaces)
+			log.Infof("ServiceMeshMemberRoll %v %s, namespaces for listener %s now %q", memberRollName, operation, smmrl.name, smmrl.currentNamespaces)
 			smmrl.listener.UpdateNamespaces(smmrl.currentNamespaces)
 		}
 	}
diff --git a/security/pkg/k8s/chiron/controller.go b/security/pkg/k8s/chiron/controller.go
@@ -164,7 +164,7 @@ func NewWebhookController(gracePeriodRatio float32, minGracePeriod time.Duration
 		})
 
 		if mrc != nil {
-			mrc.Register(scrtLW)
+			mrc.Register(scrtLW, "chiron-secret")
 		}
 
 		// The certificate rotation is handled by scrtUpdated().
diff --git a/security/pkg/registry/kube/service.go b/security/pkg/registry/kube/service.go
@@ -68,7 +68,7 @@ func NewServiceController(core corev1.CoreV1Interface, namespaces []string, reg
 	})
 
 	if mrc != nil {
-		mrc.Register(LW)
+		mrc.Register(LW, "security-namespaces")
 	}
 
 	handler := cache.ResourceEventHandlerFuncs{
diff --git a/security/pkg/registry/kube/serviceaccount.go b/security/pkg/registry/kube/serviceaccount.go
@@ -68,7 +68,7 @@ func NewServiceAccountController(core corev1.CoreV1Interface, namespaces []strin
 	})
 
 	if mrc != nil {
-		mrc.Register(LW)
+		mrc.Register(LW, "security-serviceaccounts")
 	}
 
 	_, c.controller = cache.NewInformer(LW, &v1.ServiceAccount{}, time.Minute, cache.ResourceEventHandlerFuncs{

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func (p Provider) getDynamicAdapter(r resource.Schema) Adapter {`
`74`	`74`	`})`
`75`	`75`
`76`	`76`	`if p.mrc != nil {`
`77`		`- p.mrc.Register(mlw)`
	`77`	`+ p.mrc.Register(mlw, fmt.Sprintf("galley-%s", r.GroupVersionKind().String()))`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`informer := cache.NewSharedIndexInformer(mlw, &unstructured.Unstructured{}, p.resyncPeriod,`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func (e env) NewInformer(`
`154`	`154`
`155`	`155`	`mlw := listwatch.MultiNamespaceListerWatcher(*e.namespaces, listerWatcher)`
`156`	`156`	`if e.mrc != nil {`
`157`		`- e.mrc.Register(mlw)`
	`157`	`+ e.mrc.Register(mlw, "mixer-env")`
`158`	`158`	`}`
`159`	`159`	`return cache.NewSharedIndexInformer(mlw, objType, duration, indexers)`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ func (c *controller) newCacheHandler(`
`232`	`232`
`233`	`233`	`mlw := listwatch.MultiNamespaceListerWatcher(namespaces, lwf)`
`234`	`234`	`if mrc != nil {`
`235`		`- mrc.Register(mlw)`
	`235`	`+ mrc.Register(mlw, fmt.Sprintf("pilot-cache-%s", otype))`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`// TODO: finer-grained index (perf)`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func NewController(client kubernetes.Interface, mrc meshcontroller.MemberRollCon`
`153`	`153`	`})`
`154`	`154`
`155`	`155`	`if mrc != nil {`
`156`		`- mrc.Register(mlw)`
	`156`	`+ mrc.Register(mlw, "pilot-ingress-controller")`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`informer := cache.NewSharedIndexInformer(mlw, &ingress.Ingress{}, options.ResyncPeriod,`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func NewStatusSyncer(mesh *meshconfig.MeshConfig,`
`101`	`101`	`})`
`102`	`102`
`103`	`103`	`if mrc != nil {`
`104`		`- mrc.Register(mlw)`
	`104`	`+ mrc.Register(mlw, "pilot-ingress-status")`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`informer := cache.NewSharedIndexInformer(mlw, &v1beta1.Ingress{}, options.ResyncPeriod,`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ func NewController(client kubernetes.Interface, metadataClient metadata.Interfac`
`278`	`278`	`})`
`279`	`279`
`280`	`280`	`if mrc != nil {`
`281`		`- mrc.Register(svcMlw)`
	`281`	`+ mrc.Register(svcMlw, "pilot-service")`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`c.services = cache.NewSharedIndexInformer(svcMlw, &v1.Service{}, options.ResyncPeriod,`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func newEndpointsController(c *Controller, mrc meshcontroller.MemberRollControll`
`56`	`56`	`})`
`57`	`57`
`58`	`58`	`if mrc != nil {`
`59`		`- mrc.Register(mlw)`
	`59`	`+ mrc.Register(mlw, "pilot-endpoints")`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`informer := cache.NewSharedIndexInformer(mlw, &v1.Endpoints{}, options.ResyncPeriod,`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func newEndpointSliceController(c *Controller, mrc meshcontroller.MemberRollCont`
`60`	`60`	`})`
`61`	`61`
`62`	`62`	`if mrc != nil {`
`63`		`- mrc.Register(mlw)`
	`63`	`+ mrc.Register(mlw, "pilot-endpointslice")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`informer := cache.NewSharedIndexInformer(mlw, &discoveryv1alpha1.EndpointSlice{}, options.ResyncPeriod,`