Fix merge conflict

nginxinc · Jul 8, 2020 · dbb5a24 · dbb5a24
1 parent 2b68d04
commit dbb5a24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go
@@ -523,23 +523,21 @@ func main() {
 	}
 
 	lbc := k8s.NewLoadBalancerController(lbcInput)
-<<<<<<< HEAD
 
-	if *appProtect {
-		go handleTerminationWithAppProtect(lbc, nginxManager, nginxDone, aPAgentDone, aPPluginDone)
-	} else {
-		go handleTermination(lbc, nginxManager, nginxDone)
-	}
-=======
 	if *readyStatus {
 		go func() {
 			port := fmt.Sprintf(":%v", *readyStatusPort)
 			http.HandleFunc("/nginx-ready", ready(lbc))
 			glog.Fatal(http.ListenAndServe(port, nil))
 		}()
 	}
-	go handleTermination(lbc, nginxManager, nginxDone)
->>>>>>> 8611280a... Add readiness endpoint
+
+	if *appProtect {
+		go handleTerminationWithAppProtect(lbc, nginxManager, nginxDone, aPAgentDone, aPPluginDone)
+	} else {
+		go handleTermination(lbc, nginxManager, nginxDone)
+	}
+
 	lbc.Run()
 
 	for {

diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go
@@ -838,6 +838,12 @@ func (lbc *LoadBalancerController) sync(task task) {
 	case appProtectLogConf:
 		lbc.syncAppProtectLogConf(task)
 	}
+
+	if lbc.firstRun && lbc.syncQueue.Len() == 0 {
+		lbc.firstRun = false
+		lbc.isNginxReady = true
+		glog.V(3).Infof("NGINX is ready")
+	}
 }
 
 func (lbc *LoadBalancerController) syncPolicy(task task) {
@@ -939,11 +945,6 @@ func (lbc *LoadBalancerController) syncPolicy(task task) {
 		}
 	}
 
-	if lbc.firstRun && lbc.syncQueue.Len() == 0 {
-		lbc.firstRun = false
-		lbc.isNginxReady = true
-		glog.V(3).Infof("NGINX is ready")
-	}
 }
 
 func (lbc *LoadBalancerController) syncTransportServer(task task) {