Port in redirect

controllers/nginx/pkg/cmd/controller/nginx.go

@@ -29,6 +29,8 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"github.com/mitchellh/mapstructure"
+
 	"k8s.io/kubernetes/pkg/api"
 
 	"k8s.io/ingress/controllers/nginx/pkg/config"
@@ -58,7 +60,10 @@ func newNGINXController() ingress.Controller {
 	if ngx == "" {
 		ngx = binary
 	}
-	n := NGINXController{binary: ngx}
+	n := NGINXController{
+		binary:    ngx,
+		configmap: &api.ConfigMap{},
+	}
 
 	var onChange func()
 	onChange = func() {
@@ -87,13 +92,15 @@ Error loading new template : %v
 
 	go n.Start()
 
-	return n
+	return ingress.Controller(&n)
 }
 
 // NGINXController ...
 type NGINXController struct {
 	t *ngx_template.Template
 
+	configmap *api.ConfigMap
+
 	binary string
 }
 
@@ -170,11 +177,31 @@ func (n NGINXController) Reload(data []byte) ([]byte, bool, error) {
 
 // BackendDefaults returns the nginx defaults
 func (n NGINXController) BackendDefaults() defaults.Backend {
+	if n.configmap == nil {
+		d := config.NewDefault()
+		return d.Backend
+	}
+
+	return n.backendDefaults()
+}
+
+func (n *NGINXController) backendDefaults() defaults.Backend {
 	d := config.NewDefault()
+	config := &mapstructure.DecoderConfig{
+		Metadata:         nil,
+		WeaklyTypedInput: true,
+		Result:           &d,
+		TagName:          "json",
+	}
+	decoder, err := mapstructure.NewDecoder(config)
+	if err != nil {
+		glog.Warningf("unexpected error merging defaults: %v", err)
+	}
+	decoder.Decode(n.configmap.Data)
 	return d.Backend
 }
 
-// IsReloadRequired check if the new configuration file is different
+// isReloadRequired check if the new configuration file is different
 // from the current one.
 func (n NGINXController) isReloadRequired(data []byte) bool {
 	in, err := os.Open(cfgPath)
@@ -249,6 +276,11 @@ Error: %v
 	return nil
 }
 
+// SetConfig ...
+func (n *NGINXController) SetConfig(cmap *api.ConfigMap) {
+	n.configmap = cmap
+}
+
 // OnUpdate is called by syncQueue in https://github.com/aledbf/ingress-controller/blob/master/pkg/ingress/controller/controller.go#L82
 // periodically to keep the configuration in sync.
 //
@@ -257,7 +289,7 @@ Error: %v
 // write the configuration file
 // returning nill implies the backend will be reloaded.
 // if an error is returned means requeue the update
-func (n NGINXController) OnUpdate(cmap *api.ConfigMap, ingressCfg ingress.Configuration) ([]byte, error) {
+func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, error) {
 	var longestName int
 	var serverNames int
 	for _, srv := range ingressCfg.Servers {
@@ -267,7 +299,7 @@ func (n NGINXController) OnUpdate(cmap *api.ConfigMap, ingressCfg ingress.Config
 		}
 	}
 
-	cfg := ngx_template.ReadConfig(cmap)
+	cfg := ngx_template.ReadConfig(n.configmap.Data)
 
 	// NGINX cannot resize the has tables used to store server names.
 	// For this reason we check if the defined size defined is correct

controllers/nginx/pkg/config/config.go

@@ -270,6 +270,7 @@ func NewDefault() Configuration {
 			CustomHTTPErrors:     []int{},
 			WhitelistSourceRange: []string{},
 			SkipAccessLogURLs:    []string{},
+			UsePortInRedirects:   false,
 		},
 	}
 

controllers/nginx/pkg/template/configmap.go

@@ -23,8 +23,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/mitchellh/mapstructure"
 
-	"k8s.io/kubernetes/pkg/api"
-
 	"k8s.io/ingress/controllers/nginx/pkg/config"
 	"k8s.io/ingress/core/pkg/net/dns"
 )
@@ -36,13 +34,21 @@ const (
 )
 
 // ReadConfig obtains the configuration defined by the user merged with the defaults.
-func ReadConfig(conf *api.ConfigMap) config.Configuration {
+func ReadConfig(src map[string]string) config.Configuration {
+	conf := map[string]string{}
+	if src != nil {
+		// we need to copy the configmap data because the content is altered
+		for k, v := range src {
+			conf[k] = v
+		}
+	}
+
 	errors := make([]int, 0)
 	skipUrls := make([]string, 0)
 	whitelist := make([]string, 0)
 
-	if val, ok := conf.Data[customHTTPErrors]; ok {
-		delete(conf.Data, customHTTPErrors)
+	if val, ok := conf[customHTTPErrors]; ok {
+		delete(conf, customHTTPErrors)
 		for _, i := range strings.Split(val, ",") {
 			j, err := strconv.Atoi(i)
 			if err != nil {
@@ -52,12 +58,12 @@ func ReadConfig(conf *api.ConfigMap) config.Configuration {
 			}
 		}
 	}
-	if val, ok := conf.Data[skipAccessLogUrls]; ok {
-		delete(conf.Data, skipAccessLogUrls)
+	if val, ok := conf[skipAccessLogUrls]; ok {
+		delete(conf, skipAccessLogUrls)
 		skipUrls = strings.Split(val, ",")
 	}
-	if val, ok := conf.Data[whitelistSourceRange]; ok {
-		delete(conf.Data, whitelistSourceRange)
+	if val, ok := conf[whitelistSourceRange]; ok {
+		delete(conf, whitelistSourceRange)
 		whitelist = append(whitelist, strings.Split(val, ",")...)
 	}
 
@@ -84,7 +90,7 @@ func ReadConfig(conf *api.ConfigMap) config.Configuration {
 	if err != nil {
 		glog.Warningf("unexpected error merging defaults: %v", err)
 	}
-	err = decoder.Decode(conf.Data)
+	err = decoder.Decode(conf)
 	if err != nil {
 		glog.Warningf("unexpected error merging defaults: %v", err)
 	}

controllers/nginx/pkg/template/configmap_test.go

@@ -23,7 +23,6 @@ import (
 
 	"k8s.io/ingress/controllers/nginx/pkg/config"
 	"k8s.io/ingress/core/pkg/net/dns"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 func TestFilterErrors(t *testing.T) {
@@ -34,17 +33,15 @@ func TestFilterErrors(t *testing.T) {
 }
 
 func TestMergeConfigMapToStruct(t *testing.T) {
-	conf := &api.ConfigMap{
-		Data: map[string]string{
-			"custom-http-errors":         "300,400,demo",
-			"proxy-read-timeout":         "1",
-			"proxy-send-timeout":         "2",
-			"skip-access-log-urls":       "/log,/demo,/test",
-			"use-proxy-protocol":         "true",
-			"use-gzip":                   "true",
-			"enable-dynamic-tls-records": "false",
-			"gzip-types":                 "text/html",
-		},
+	conf := map[string]string{
+		"custom-http-errors":         "300,400,demo",
+		"proxy-read-timeout":         "1",
+		"proxy-send-timeout":         "2",
+		"skip-access-log-urls":       "/log,/demo,/test",
+		"use-proxy-protocol":         "true",
+		"use-gzip":                   "true",
+		"enable-dynamic-tls-records": "false",
+		"gzip-types":                 "text/html",
 	}
 	def := config.NewDefault()
 	def.CustomHTTPErrors = []int{300, 400}
@@ -68,18 +65,16 @@ func TestMergeConfigMapToStruct(t *testing.T) {
 
 	def = config.NewDefault()
 	def.Resolver = h
-	to = ReadConfig(&api.ConfigMap{})
+	to = ReadConfig(map[string]string{})
 	if diff := pretty.Compare(to, def); diff != "" {
 		t.Errorf("unexpected diff: (-got +want)\n%s", diff)
 	}
 
 	def = config.NewDefault()
 	def.Resolver = h
 	def.WhitelistSourceRange = []string{"1.1.1.1/32"}
-	to = ReadConfig(&api.ConfigMap{
-		Data: map[string]string{
-			"whitelist-source-range": "1.1.1.1/32",
-		},
+	to = ReadConfig(map[string]string{
+		"whitelist-source-range": "1.1.1.1/32",
 	})
 
 	if diff := pretty.Compare(to, def); diff != "" {

controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl

@@ -251,6 +251,8 @@ http {
             deny all;
             {{ end }}
 
+            port_in_redirect {{ if $location.UsePortInRedirects }}on{{ else }}off{{ end }};
+
             {{ if not (empty $authPath) }}
             # this location requires authentication
             auth_request {{ $authPath }};

core/pkg/ingress/annotations/parser/main.go

@@ -36,7 +36,7 @@ func (a ingAnnotations) parseBool(name string) (bool, error) {
 	if ok {
 		b, err := strconv.ParseBool(val)
 		if err != nil {
-			return false, errors.NewInvalidAnnotationContent(name)
+			return false, errors.NewInvalidAnnotationContent(name, val)
 		}
 		return b, nil
 	}
@@ -56,7 +56,7 @@ func (a ingAnnotations) parseInt(name string) (int, error) {
 	if ok {
 		i, err := strconv.Atoi(val)
 		if err != nil {
-			return 0, errors.NewInvalidAnnotationContent(name)
+			return 0, errors.NewInvalidAnnotationContent(name, val)
 		}
 		return i, nil
 	}

core/pkg/ingress/annotations/portinredirect/main.go

@@ -0,0 +1,48 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package portinredirect
+
+import (
+	"k8s.io/kubernetes/pkg/apis/extensions"
+
+	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress/core/pkg/ingress/resolver"
+)
+
+const (
+	annotation = "ingress.kubernetes.io/use-port-in-redirects"
+)
+
+type portInRedirect struct {
+	backendResolver resolver.DefaultBackend
+}
+
+// NewParser creates a new port in redirect annotation parser
+func NewParser(db resolver.DefaultBackend) parser.IngressAnnotation {
+	return portInRedirect{db}
+}
+
+// Parse parses the annotations contained in the ingress
+// rule used to indicate if the redirects must
+func (a portInRedirect) Parse(ing *extensions.Ingress) (interface{}, error) {
+	up, err := parser.GetBoolAnnotation(annotation, ing)
+	if err != nil {
+		return a.backendResolver.GetDefaultBackend().UsePortInRedirects, nil
+	}
+
+	return up, nil
+}