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

Always reload after a change in the configuration

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-06-25 18:12:07 -04:00
parent 53ef03b0a7
commit 3b903c5913
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,11 @@ type GenericController struct {
stopCh chan struct{}
// runningConfig contains the running configuration in the Backend
runningConfig *ingress.Configuration
// configmapChanged indicates the configmap
configmapChanged bool
}
// Configuration contains all the settings required by an Ingress controller
@ -258,6 +262,7 @@ func newIngressController(config *Configuration) *GenericController {
if mapKey == ic.cfg.ConfigMapName {
glog.V(2).Infof("adding configmap %v to backend", mapKey)
ic.cfg.Backend.SetConfig(upCmap)
ic.configmapChanged = true
}
},
UpdateFunc: func(old, cur interface{}) {
@ -267,6 +272,7 @@ func newIngressController(config *Configuration) *GenericController {
if mapKey == ic.cfg.ConfigMapName {
glog.V(2).Infof("updating configmap backend (%v)", mapKey)
ic.cfg.Backend.SetConfig(upCmap)
ic.configmapChanged = true
}
// updates to configuration configmaps can trigger an update
if mapKey == ic.cfg.ConfigMapName || mapKey == ic.cfg.TCPConfigMapName || mapKey == ic.cfg.UDPConfigMapName {
@ -413,7 +419,7 @@ func (ic *GenericController) syncIngress(key interface{}) error {
PassthroughBackends: passUpstreams,
}
if ic.runningConfig != nil && ic.runningConfig.Equal(&pcfg) {
if !ic.configmapChanged && (ic.runningConfig != nil && ic.runningConfig.Equal(&pcfg)) {
glog.V(3).Infof("skipping backend reload (no changes detected)")
return nil
}
@ -427,6 +433,7 @@ func (ic *GenericController) syncIngress(key interface{}) error {
return err
}
ic.configmapChanged = false
glog.Infof("ingress backend successfully reloaded...")
incReloadCount()
setSSLExpireTime(servers)