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

Simplify controller interface

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-06-11 15:56:30 -04:00
parent ecb95156ca
commit dca6de883c
2 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ func newIngressController(config *Configuration) *GenericController {
cfg: config,
stopLock: &sync.Mutex{},
stopCh: make(chan struct{}),
syncRateLimiter: flowcontrol.NewTokenBucketRateLimiter(0.5, 1),
syncRateLimiter: flowcontrol.NewTokenBucketRateLimiter(0.3, 1),
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, api.EventSource{
Component: "ingress-controller",
}),
@ -400,27 +400,23 @@ func (ic *GenericController) syncIngress(key interface{}) error {
}
}
data, err := ic.cfg.Backend.OnUpdate(ingress.Configuration{
err := ic.cfg.Backend.OnUpdate(ingress.Configuration{
Backends: upstreams,
Servers: servers,
TCPEndpoints: ic.getStreamServices(ic.cfg.TCPConfigMapName, api.ProtocolTCP),
UDPEndpoints: ic.getStreamServices(ic.cfg.UDPConfigMapName, api.ProtocolUDP),
PassthroughBackends: passUpstreams,
})
if err != nil {
incReloadErrorCount()
glog.Errorf("unexpected failure restarting the backend: \n%v", err)
return err
}
out, reloaded, err := ic.cfg.Backend.Reload(data)
if err != nil {
incReloadErrorCount()
glog.Errorf("unexpected failure restarting the backend: \n%v", string(out))
return err
}
if reloaded {
glog.Infof("ingress backend successfully reloaded...")
incReloadCount()
}
glog.Infof("ingress backend successfully reloaded...")
incReloadCount()
return nil
}