Fix build

aledbf · Oct 18, 2016 · 6f8cf30 · 6f8cf30
1 parent ff9dd0b
commit 6f8cf30
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/pkg/ingress/controller/controller.go b/pkg/ingress/controller/controller.go
@@ -129,6 +129,8 @@ type Configuration struct {
 	PublishService        string
 
 	UpstreamDefaults defaults.Upstream
+
+	Backend ingress.IController
 }
 
 // newIngressController creates a controller for nginx loadbalancer
@@ -332,25 +334,25 @@ func (ic *GenericController) sync(key interface{}) error {
 	}
 
 	// by default no custom configuration configmap
-	//cfg := &api.ConfigMap{}
+	cfg := &api.ConfigMap{}
 
-	/*	if ic.cfg.ConfigMapName != "" {
-			// Search for custom configmap (defined in main args)
-			var err error
-			ns, name, _ := k8s.ParseNameNS(ic.cfg.ConfigMapName)
-			cfg, err = ic.getConfigMap(ns, name)
-			if err != nil {
-				return fmt.Errorf("unexpected error searching configmap %v: %v", ic.cfg.ConfigMapName, err)
-			}
+	if ic.cfg.ConfigMapName != "" {
+		// Search for custom configmap (defined in main args)
+		var err error
+		ns, name, _ := k8s.ParseNameNS(ic.cfg.ConfigMapName)
+		cfg, err = ic.getConfigMap(ns, name)
+		if err != nil {
+			return fmt.Errorf("unexpected error searching configmap %v: %v", ic.cfg.ConfigMapName, err)
 		}
-	*/
+	}
+
 	//ngxConfig := ic.backend.ReadConfig(cfg)
 	//ngxConfig.HealthzURL = ic.cfg.DefaultHealthzURL
 
 	ings := ic.ingLister.Store.List()
 	upstreams, servers := ic.getUpstreamServers(ings)
 
-	err := ic.backend.OnUpdate(ingress.Configuration{
+	err := ic.backend.OnUpdate(cfg, ingress.Configuration{
 		Upstreams:    upstreams,
 		Servers:      servers,
 		TCPUpstreams: ic.getTCPServices(),

diff --git a/pkg/ingress/controller/launch.go b/pkg/ingress/controller/launch.go
@@ -12,6 +12,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/pflag"
 
+	"github.com/aledbf/ingress-controller/pkg/ingress"
 	"github.com/aledbf/ingress-controller/pkg/k8s"
 
 	"k8s.io/kubernetes/pkg/api"
@@ -23,7 +24,7 @@ import (
 )
 
 // NewIngressController returns a configured Ingress controller ready to start
-func NewIngressController() IngressController {
+func NewIngressController(backend ingress.IController) IngressController {
 	var (
 		flags = pflag.NewFlagSet("", pflag.ExitOnError)
 
@@ -146,6 +147,7 @@ func NewIngressController() IngressController {
 		DefaultSSLCertificate: *defSSLCertificate,
 		DefaultHealthzURL:     *defHealthzURL,
 		PublishService:        *publishSvc,
+		Backend:               backend,
 	}
 
 	ic := newIngressController(config)

diff --git a/pkg/ingress/types.go b/pkg/ingress/types.go
@@ -19,6 +19,7 @@ package ingress
 import (
 	"os/exec"
 
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/healthz"
 
 	"github.com/aledbf/ingress-controller/pkg/ingress/annotations/auth"
@@ -32,19 +33,15 @@ import (
 
 // IController ...
 type IController interface {
-	Name() string
-
-	HealthzPort() int
+	healthz.HealthzChecker
 
 	Start() *exec.Cmd
 	Stop() *exec.Cmd
 	Restart() *exec.Cmd
 
 	Test(file string) *exec.Cmd
 
-	HealthzChecker() healthz.HealthzChecker
-
-	OnUpdate(Configuration) error
+	OnUpdate(*api.ConfigMap, Configuration) error
 }
 
 // Configuration describes