DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a Node StoreLister type to support writing ingress controllers that use NodePorts

Browse source
This commit is contained in:
Kraig Amador 2017-02-10 21:07:28 -08:00
parent b5819d8f4d
commit 0d05db2d66
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/pkg/ingress/controller/controller.go
View file

@ -76,11 +76,13 @@ type GenericController struct {
ingController *cache.Controller ingController *cache.Controller
endpController *cache.Controller endpController *cache.Controller
svcController *cache.Controller svcController *cache.Controller
nodeController *cache.Controller
secrController *cache.Controller secrController *cache.Controller
mapController *cache.Controller mapController *cache.Controller
ingLister cache_store.StoreToIngressLister ingLister cache_store.StoreToIngressLister
svcLister cache.StoreToServiceLister svcLister cache.StoreToServiceLister
nodeLister cache.StoreToNodeLister
endpLister cache.StoreToEndpointsLister endpLister cache.StoreToEndpointsLister
secrLister cache_store.StoreToSecretsLister secrLister cache_store.StoreToSecretsLister
mapLister cache_store.StoreToConfigmapLister mapLister cache_store.StoreToConfigmapLister
@ -292,6 +294,10 @@ func newIngressController(config *Configuration) *GenericController {
cache.ResourceEventHandlerFuncs{}, cache.ResourceEventHandlerFuncs{},
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
ic.nodeLister.Store, ic.nodeController = cache.NewInformer(
cache.NewListWatchFromClient(ic.cfg.Client.Core().RESTClient(), "nodes", ic.cfg.Namespace, fields.Everything()),
&api.Node{}, ic.cfg.ResyncPeriod, eventHandler)
if config.UpdateStatus { if config.UpdateStatus {
ic.syncStatus = status.NewStatusSyncer(status.Config{ ic.syncStatus = status.NewStatusSyncer(status.Config{
Client: config.Client, Client: config.Client,
@ -307,6 +313,7 @@ func newIngressController(config *Configuration) *GenericController {
ic.cfg.Backend.SetListers(ingress.StoreLister{ ic.cfg.Backend.SetListers(ingress.StoreLister{
Ingress: ic.ingLister, Ingress: ic.ingLister,
Service: ic.svcLister, Service: ic.svcLister,
Node: ic.nodeLister,
Endpoint: ic.endpLister, Endpoint: ic.endpLister,
Secret: ic.secrLister, Secret: ic.secrLister,
ConfigMap: ic.mapLister, ConfigMap: ic.mapLister,
@ -1039,6 +1046,7 @@ func (ic GenericController) Start() {
go ic.ingController.Run(ic.stopCh) go ic.ingController.Run(ic.stopCh)
go ic.endpController.Run(ic.stopCh) go ic.endpController.Run(ic.stopCh)
go ic.svcController.Run(ic.stopCh) go ic.svcController.Run(ic.stopCh)
go ic.nodeController.Run(ic.stopCh)
go ic.secrController.Run(ic.stopCh) go ic.secrController.Run(ic.stopCh)
go ic.mapController.Run(ic.stopCh) go ic.mapController.Run(ic.stopCh)

1
core/pkg/ingress/types.go
View file

@ -102,6 +102,7 @@ type Controller interface {
type StoreLister struct { type StoreLister struct {
Ingress cache_store.StoreToIngressLister Ingress cache_store.StoreToIngressLister
Service cache.StoreToServiceLister Service cache.StoreToServiceLister
Node cache.StoreToNodeLister
Endpoint cache.StoreToEndpointsLister Endpoint cache.StoreToEndpointsLister
Secret cache_store.StoreToSecretsLister Secret cache_store.StoreToSecretsLister
ConfigMap cache_store.StoreToConfigmapLister ConfigMap cache_store.StoreToConfigmapLister