e2e tests for dynamic configuration and Lua features and a bug fix (#2254)

* e2e tests for dynamic configuration and Lua features

* do not rely on force reload to dynamically configure when reload is needed

* fix misspelling

* skip dynamic configuration in the first template rendering

* dont error on first sync

internal/ingress/controller/controller.go

@@ -169,41 +169,41 @@ func (n *NGINXController) syncIngress(item interface{}) error {
 	if !n.isForceReload() && n.runningConfig.Equal(&pcfg) {
 		glog.V(3).Infof("skipping backend reload (no changes detected)")
 		return nil
-	} else if !n.isForceReload() && n.cfg.DynamicConfigurationEnabled && n.IsDynamicallyConfigurable(&pcfg) {
-		err := n.ConfigureDynamically(&pcfg)
-		if err == nil {
-			glog.Infof("dynamic reconfiguration succeeded, skipping reload")
-			n.runningConfig = &pcfg
-			return nil
+	}
+
+	if n.cfg.DynamicConfigurationEnabled && n.IsDynamicConfigurationEnough(&pcfg) && !n.isForceReload() {
+		glog.Infof("skipping reload")
+	} else {
+		glog.Infof("backend reload required")
+
+		err := n.OnUpdate(pcfg)
+		if err != nil {
+			incReloadErrorCount()
+			glog.Errorf("unexpected failure restarting the backend: \n%v", err)
+			return err
 		}
 
-		glog.Warningf("falling back to reload, could not dynamically reconfigure: %v", err)
+		glog.Infof("ingress backend successfully reloaded...")
+		incReloadCount()
+		setSSLExpireTime(servers)
 	}
 
-	glog.Infof("backend reload required")
+	if n.cfg.DynamicConfigurationEnabled {
+		isFirstSync := n.runningConfig.Equal(&ingress.Configuration{})
+		go func(isFirstSync bool) {
+			if isFirstSync {
+				glog.Infof("first sync of Nginx configuration")
 
-	err := n.OnUpdate(pcfg)
-	if err != nil {
-		incReloadErrorCount()
-		glog.Errorf("unexpected failure restarting the backend: \n%v", err)
-		return err
-	}
-
-	glog.Infof("ingress backend successfully reloaded...")
-	incReloadCount()
-	setSSLExpireTime(servers)
-
-	if n.isForceReload() && n.cfg.DynamicConfigurationEnabled {
-		go func() {
-			// it takes time for Nginx to start listening on the port
-			time.Sleep(1 * time.Second)
+				// it takes time for Nginx to start listening on the port
+				time.Sleep(1 * time.Second)
+			}
 			err := n.ConfigureDynamically(&pcfg)
 			if err == nil {
 				glog.Infof("dynamic reconfiguration succeeded")
 			} else {
 				glog.Warningf("could not dynamically reconfigure: %v", err)
 			}
-		}()
+		}(isFirstSync)
 	}
 
 	n.runningConfig = &pcfg

internal/ingress/controller/nginx.go

@@ -751,8 +751,8 @@ func (n *NGINXController) setupSSLProxy() {
 	}()
 }
 
-// IsDynamicallyConfigurable decides if the new configuration can be dynamically configured without reloading
-func (n *NGINXController) IsDynamicallyConfigurable(pcfg *ingress.Configuration) bool {
+// IsDynamicConfigurationEnough decides if the new configuration changes can be dynamically applied without reloading
+func (n *NGINXController) IsDynamicConfigurationEnough(pcfg *ingress.Configuration) bool {
 	var copyOfRunningConfig ingress.Configuration = *n.runningConfig
 	var copyOfPcfg ingress.Configuration = *pcfg
 

internal/ingress/controller/nginx_test.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-nginx/internal/ingress"
 )
 
-func TestIsDynamicallyConfigurable(t *testing.T) {
+func TestIsDynamicConfigurationEnough(t *testing.T) {
 	backends := []*ingress.Backend{{
 		Name: "fakenamespace-myapp-80",
 		Endpoints: []ingress.Endpoint{
@@ -60,7 +60,7 @@ func TestIsDynamicallyConfigurable(t *testing.T) {
 	}
 
 	newConfig := commonConfig
-	if !n.IsDynamicallyConfigurable(newConfig) {
+	if !n.IsDynamicConfigurationEnough(newConfig) {
 		t.Errorf("When new config is same as the running config it should be deemed as dynamically configurable")
 	}
 
@@ -68,7 +68,7 @@ func TestIsDynamicallyConfigurable(t *testing.T) {
 		Backends: []*ingress.Backend{{Name: "another-backend-8081"}},
 		Servers:  []*ingress.Server{{Hostname: "myapp1.fake"}},
 	}
-	if n.IsDynamicallyConfigurable(newConfig) {
+	if n.IsDynamicConfigurationEnough(newConfig) {
 		t.Errorf("Expected to not be dynamically configurable when there's more than just backends change")
 	}
 
@@ -76,7 +76,7 @@ func TestIsDynamicallyConfigurable(t *testing.T) {
 		Backends: []*ingress.Backend{{Name: "a-backend-8080"}},
 		Servers:  servers,
 	}
-	if !n.IsDynamicallyConfigurable(newConfig) {
+	if !n.IsDynamicConfigurationEnough(newConfig) {
 		t.Errorf("Expected to be dynamically configurable when only backends change")
 	}