Merge pull request #1074 from aledbf/rem-lua

Remove lua and use fastcgi to render errors

core/pkg/ingress/controller/controller.go

@@ -110,6 +110,8 @@ type GenericController struct {
 
 	// runningConfig contains the running configuration in the Backend
 	runningConfig *ingress.Configuration
+
+	forceReload bool
 }
 
 // Configuration contains all the settings required by an Ingress controller
@@ -230,7 +232,9 @@ func newIngressController(config *Configuration) *GenericController {
 			ic.syncQueue.Enqueue(obj)
 		},
 		UpdateFunc: func(old, cur interface{}) {
-			if !reflect.DeepEqual(old, cur) {
+			oep := old.(*api.Endpoints)
+			ocur := cur.(*api.Endpoints)
+			if !reflect.DeepEqual(ocur.Subsets, oep.Subsets) {
 				ic.syncQueue.Enqueue(cur)
 			}
 		},
@@ -243,6 +247,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.forceReload = true
 			}
 		},
 		UpdateFunc: func(old, cur interface{}) {
@@ -252,6 +257,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.forceReload = true
 				}
 				// updates to configuration configmaps can trigger an update
 				if mapKey == ic.cfg.ConfigMapName || mapKey == ic.cfg.TCPConfigMapName || mapKey == ic.cfg.UDPConfigMapName {
@@ -405,7 +411,7 @@ func (ic *GenericController) syncIngress(key interface{}) error {
 		PassthroughBackends: passUpstreams,
 	}
 
-	if ic.runningConfig != nil && ic.runningConfig.Equal(&pcfg) {
+	if !ic.forceReload && ic.runningConfig != nil && ic.runningConfig.Equal(&pcfg) {
 		glog.V(3).Infof("skipping backend reload (no changes detected)")
 		return nil
 	}
@@ -424,6 +430,7 @@ func (ic *GenericController) syncIngress(key interface{}) error {
 	setSSLExpireTime(servers)
 
 	ic.runningConfig = &pcfg
+	ic.forceReload = false
 
 	return nil
 }
@@ -1255,7 +1262,7 @@ func (ic GenericController) Start() {
 		runtime.HandleError(fmt.Errorf("Timed out waiting for caches to sync"))
 	}
 
-	go ic.syncQueue.Run(10*time.Second, ic.stopCh)
+	go ic.syncQueue.Run(time.Second, ic.stopCh)
 
 	if ic.syncStatus != nil {
 		go ic.syncStatus.Run(ic.stopCh)

core/pkg/ingress/controller/launch.go

@@ -65,8 +65,8 @@ func NewIngressController(backend ingress.Controller) *GenericController {
 		service with the format namespace/serviceName and the port of the service could be a 
 		number of the name of the port.`)
 
-		resyncPeriod = flags.Duration("sync-period", 60*time.Second,
-			`Relist and confirm cloud resources this often.`)
+		resyncPeriod = flags.Duration("sync-period", 600*time.Second,
+			`Relist and confirm cloud resources this often. Default is 10 minutes`)
 
 		watchNamespace = flags.String("watch-namespace", api.NamespaceAll,
 			`Namespace to watch for Ingress. Default is to watch all namespaces`)
@@ -149,6 +149,10 @@ func NewIngressController(backend ingress.Controller) *GenericController {
 		}
 	}
 
+	if resyncPeriod.Seconds() < 10 {
+		glog.Fatalf("resync period (%vs) is too low", resyncPeriod.Seconds())
+	}
+
 	err = os.MkdirAll(ingress.DefaultSSLDirectory, 0655)
 	if err != nil {
 		glog.Errorf("Failed to mkdir SSL directory: %v", err)

core/pkg/ingress/status/status.go

@@ -92,10 +92,7 @@ type statusSync struct {
 // Run starts the loop to keep the status in sync
 func (s statusSync) Run(stopCh <-chan struct{}) {
 	go wait.Forever(s.elector.Run, 0)
-	go s.run()
-
 	go s.syncQueue.Run(time.Second, stopCh)
-
 	<-stopCh
 }
 
@@ -136,20 +133,6 @@ func (s statusSync) Shutdown() {
 	s.updateStatus([]v1.LoadBalancerIngress{})
 }
 
-func (s *statusSync) run() {
-	err := wait.PollInfinite(updateInterval, func() (bool, error) {
-		if s.syncQueue.IsShuttingDown() {
-			return true, nil
-		}
-		// send a dummy object to the queue to force a sync
-		s.syncQueue.Enqueue("dummy")
-		return false, nil
-	})
-	if err != nil {
-		glog.Errorf("error waiting shutdown: %v", err)
-	}
-}
-
 func (s *statusSync) sync(key interface{}) error {
 	s.runLock.Lock()
 	defer s.runLock.Unlock()