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

skip dynamic configuration in the first template rendering

Browse source
This commit is contained in:
Elvin Efendi 2018-04-01 11:24:32 -04:00
parent 9d21c42a25
commit 753b6a3450
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/controller.go
View file

@ -171,7 +171,7 @@ func (n *NGINXController) syncIngress(item interface{}) error {
return nil
}
if n.cfg.DynamicConfigurationEnabled {
if n.cfg.DynamicConfigurationEnabled && !n.runningConfig.Equal(&ingress.Configuration{}) {
err := n.ConfigureDynamically(&pcfg)
if err == nil {
glog.Infof("dynamic reconfiguration succeeded")

7
test/e2e/lua/dynamic_configuration.go
View file

@ -66,14 +66,9 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
Expect(len(errs)).Should(BeNumerically("==", 0))
Expect(resp.StatusCode).Should(Equal(http.StatusOK))
// NOTE(elvinefendi) this is to document the not so desired behaviour
// where the controller tries to POST to Lua endpoint right after starting
// Nginx when it does not have the correct endpoint configuration yet
log, err := f.NginxLogs()
Expect(err).ToNot(HaveOccurred())
index := strings.Index(log, "could not dynamically reconfigure")
Expect(index).Should(BeNumerically(">", -1))
Expect(strings.Index(log[index+1:], "could not dynamically reconfigure")).Should(Equal(-1))
Expect(log).ToNot(ContainSubstring("could not dynamically reconfigure"))
})
AfterEach(func() {