Remove dns from nginx. Use upstreams for default backend service

controllers/nginx-third-party/nginx/command.go

@@ -54,7 +54,7 @@ func (ngx *NginxManager) Start() {
 // shut down, stop accepting new connections and continue to service current requests
 // until all such requests are serviced. After that, the old worker processes exit.
 // http://nginx.org/en/docs/beginners_guide.html#control
-func (ngx *NginxManager) CheckAndReload(cfg *nginxConfiguration, upstreams []*Upstream, servers []*Server, servicesL4 []Service) {
+func (ngx *NginxManager) CheckAndReload(cfg *nginxConfiguration, upstreams []*Upstream, servers []*Server, servicesL4 []*Upstream) {
 	ngx.reloadLock.Lock()
 	defer ngx.reloadLock.Unlock()
 

controllers/nginx-third-party/nginx/main.go

@@ -212,9 +212,7 @@ type Service struct {
 
 // NginxManager ...
 type NginxManager struct {
-	defBackend  Service
 	defCfg      *nginxConfiguration
-	defError    Service
 	defResolver string
 
 	// path to the configuration file to be used by nginx
@@ -272,12 +270,10 @@ func newDefaultNginxCfg() *nginxConfiguration {
 }
 
 // NewManager ...
-func NewManager(kubeClient *client.Client, defaultSvc, customErrorSvc Service) *NginxManager {
+func NewManager(kubeClient *client.Client) *NginxManager {
 	ngx := &NginxManager{
 		ConfigFile:  "/etc/nginx/nginx.conf",
-		defBackend:  defaultSvc,
 		defCfg:      newDefaultNginxCfg(),
-		defError:    customErrorSvc,
 		defResolver: strings.Join(getDnsServers(), " "),
 		reloadLock:  &sync.Mutex{},
 	}

controllers/nginx-third-party/nginx/template.go

@@ -19,12 +19,12 @@ package nginx
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"text/template"
 
 	"github.com/fatih/structs"
 	"github.com/golang/glog"
+	"github.com/imdario/mergo"
 )
 
 var funcMap = template.FuncMap{
@@ -36,20 +36,6 @@ var funcMap = template.FuncMap{
 
 		return true
 	},
-	"dict": func(values ...interface{}) (map[string]interface{}, error) {
-		if len(values)%2 != 0 {
-			return nil, errors.New("invalid dict call")
-		}
-		dict := make(map[string]interface{}, len(values)/2)
-		for i := 0; i < len(values); i += 2 {
-			key, ok := values[i].(string)
-			if !ok {
-				return nil, errors.New("dict keys must be strings")
-			}
-			dict[key] = values[i+1]
-		}
-		return dict, nil
-	},
 }
 
 func (ngx *NginxManager) loadTemplate() {
@@ -57,26 +43,19 @@ func (ngx *NginxManager) loadTemplate() {
 	ngx.template = tmpl
 }
 
-func (ngx *NginxManager) writeCfg(cfg *nginxConfiguration, upstreams []*Upstream, servers []*Server, servicesL4 []Service) (bool, error) {
+func (ngx *NginxManager) writeCfg(cfg *nginxConfiguration, upstreams []*Upstream, servers []*Server, tcpUpstreams []*Upstream) (bool, error) {
 	fromMap := structs.Map(cfg)
 	toMap := structs.Map(ngx.defCfg)
-	curNginxCfg := merge(toMap, fromMap)
+	curNginxCfg := mergo.MergeWithOverwrite(toMap, fromMap)
 
 	conf := make(map[string]interface{})
 	conf["upstreams"] = upstreams
 	conf["servers"] = servers
-	conf["tcpServices"] = servicesL4
-	conf["defBackend"] = ngx.defBackend
+	conf["tcpUpstreams"] = tcpUpstreams
 	conf["defResolver"] = ngx.defResolver
 	conf["sslDHParam"] = ngx.sslDHParam
 	conf["cfg"] = curNginxCfg
 
-	if ngx.defError.ServiceName != "" {
-		conf["defErrorSvc"] = ngx.defError
-	} else {
-		conf["defErrorSvc"] = false
-	}
-
 	buffer := new(bytes.Buffer)
 	err := ngx.template.Execute(buffer, conf)
 	if err != nil {
@@ -93,7 +72,7 @@ func (ngx *NginxManager) writeCfg(cfg *nginxConfiguration, upstreams []*Upstream
 		if err != nil {
 			fmt.Println("error:", err)
 		}
-		glog.Infof("nginx configuration: %v", string(b))
+		glog.Infof("NGINX configuration: %v", string(b))
 	}
 
 	return changed, nil

controllers/nginx-third-party/nginx/utils.go

@@ -24,10 +24,12 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"reflect"
 	"strings"
 
 	"github.com/golang/glog"
+
+	"github.com/imdario/mergo"
+	"k8s.io/kubernetes/pkg/api"
 )
 
 // IsHealthy checks if nginx is running
@@ -76,48 +78,22 @@ func getDnsServers() []string {
 
 // ReadConfig obtains the configuration defined by the user or returns the default if it does not
 // exists or if is not a well formed json object
-func (ngx *NginxManager) ReadConfig(data string) (*nginxConfiguration, error) {
-	if data == "" {
+func (ngx *NginxManager) ReadConfig(config *api.ConfigMap) (*nginxConfiguration, error) {
+	if len(config.Data) == 0 {
 		return newDefaultNginxCfg(), nil
 	}
 
-	cfg := nginxConfiguration{}
-	err := json.Unmarshal([]byte(data), &cfg)
+	cfg := newDefaultNginxCfg()
+
+	data, err := json.Marshal(config.Data)
 	if err != nil {
-		glog.Errorf("invalid json: %v", err)
-		return newDefaultNginxCfg(), fmt.Errorf("invalid custom nginx configuration: %v", err)
-	}
-
-	return &cfg, nil
-}
-
-func merge(dst, src map[string]interface{}) map[string]interface{} {
-	for key, srcVal := range src {
-		if dstVal, ok := dst[key]; ok {
-			srcMap, srcMapOk := toMap(srcVal)
-			dstMap, dstMapOk := toMap(dstVal)
-			if srcMapOk && dstMapOk {
-				srcVal = merge(dstMap, srcMap)
-			}
+		err = mergo.Merge(cfg, data)
+		if err != nil {
+			return cfg, nil
 		}
-		dst[key] = srcVal
 	}
 
-	return dst
-}
-
-func toMap(iface interface{}) (map[string]interface{}, bool) {
-	value := reflect.ValueOf(iface)
-	if value.Kind() == reflect.Map {
-		m := map[string]interface{}{}
-		for _, k := range value.MapKeys() {
-			m[k.String()] = value.MapIndex(k).Interface()
-		}
-
-		return m, true
-	}
-
-	return map[string]interface{}{}, false
+	return cfg, nil
 }
 
 func (ngx *NginxManager) needsReload(data *bytes.Buffer) (bool, error) {