More refactoring, mainly tidy up of controller

nginx · Sep 5, 2018 · 5e66437 · 5e66437
1 parent 3a8b9fd
commit 5e66437
Show file tree

Hide file tree

Showing 6 changed files with 346 additions and 312 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ Session.vim
 # Ingress Controller binaries
 osx-nginx-ingress
 nginx-ingress
+!nginx-ingress/
 osx-nginx-plus-ingress
 nginx-plus-ingress
 cmd/nginx-ic/nginx-ic

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ TAG = $(VERSION)
 PREFIX = nginx/nginx-ingress
 
 DOCKER_RUN = docker run --rm -v $(shell pwd):/go/src/github.com/nginxinc/kubernetes-ingress
-DOCKER_BUILD_RUN = docker run --rm -v $(shell pwd):/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/cmd/nginx-ic/
+DOCKER_BUILD_RUN = docker run --rm -v $(shell pwd):/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/cmd/nginx-ingress/
 GOLANG_CONTAINER = golang:1.10
 DOCKERFILEPATH = build
 DOCKERFILE = Dockerfile

diff --git a/cmd/nginx-ic/main.go → cmd/nginx-ingress/main.go b/cmd/nginx-ic/main.go → cmd/nginx-ingress/main.go
@@ -230,19 +230,19 @@ func main() {
 	controllerNamespace := os.Getenv("POD_NAMESPACE")
 
 	lbcInput := controller.NewLoadBalancerControllerInput{
-		KubeClient:            kubeClient,
-		ResyncPeriod:          30 * time.Second,
-		Namespace:             *watchNamespace,
-		CNF:                   cnf,
-		NginxConfigMaps:       *nginxConfigMaps,
-		DefaultServerSecret:   *defaultServerSecret,
-		NginxPlus:             *nginxPlus,
-		IngressClass:          *ingressClass,
-		UseIngressClassOnly:   *useIngressClassOnly,
-		ExternalServiceName:   *externalService,
-		ControllerNamespace:   controllerNamespace,
-		ReportIngressStatus:   *reportIngressStatus,
-		LeaderElectionEnabled: *leaderElectionEnabled,
+		KubeClient:              kubeClient,
+		ResyncPeriod:            30 * time.Second,
+		Namespace:               *watchNamespace,
+		NginxConfigurator:       cnf,
+		NginxConfigMaps:         *nginxConfigMaps,
+		DefaultServerSecret:     *defaultServerSecret,
+		IsNginxPlus:             *nginxPlus,
+		IngressClass:            *ingressClass,
+		UseIngressClassOnly:     *useIngressClassOnly,
+		ExternalServiceName:     *externalService,
+		ControllerNamespace:     controllerNamespace,
+		ReportIngressStatus:     *reportIngressStatus,
+		IsLeaderElectionEnabled: *leaderElectionEnabled,
 	}
 	lbc := controller.NewLoadBalancerController(lbcInput)
 	go handleTermination(lbc, ngxc, nginxDone)