Fix config with long fqdn #112

jcmoraisjr · Mar 16, 2018 · 2d4dceb · 2d4dceb
1 parent f31e25f
commit 2d4dceb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -18,6 +18,8 @@ package controller
 
 import (
 	"bufio"
+	"crypto/md5"
+	"fmt"
 	"github.com/golang/glog"
 	"github.com/jcmoraisjr/haproxy-ingress/pkg/common/file"
 	"github.com/jcmoraisjr/haproxy-ingress/pkg/common/ingress"
@@ -170,6 +172,7 @@ func (cfg *haConfig) createHAProxyServers() {
 			UseHTTPS:        server.SSLCertificate != "" || isDefaultServer,
 			Hostname:        server.Hostname,
 			HostnameLabel:   labelizeHostname(server.Hostname),
+			HostnameHash:    hashHostname(server.Hostname),
 			SSLCertificate:  server.SSLCertificate,
 			SSLPemChecksum:  server.SSLPemChecksum,
 			RootLocation:    haRootLocation,
@@ -244,6 +247,10 @@ func labelizeHostname(hostname string) string {
 	return re.ReplaceAllLiteralString(hostname, "_")
 }
 
+func hashHostname(hostname string) string {
+	return fmt.Sprintf("%x", md5.Sum([]byte(hostname)))
+}
+
 // This could be improved creating a list of auth secrets (or even configMaps)
 // on Ingress and saving usr(s)/pwd in auth.BasicDigest struct
 func (cfg *haConfig) createUserlists() {

diff --git a/pkg/controller/template.go b/pkg/controller/template.go
@@ -33,6 +33,12 @@ type template struct {
 }
 
 var funcMap = gotemplate.FuncMap{
+	"iif": func(q bool, o1, o2 string) string {
+		if q {
+			return o1
+		}
+		return o2
+	},
 	"backendHash": func(endpoint string) string {
 		return utils.BackendHash(endpoint)
 	},

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -105,6 +105,7 @@ type (
 		UseHTTPS        bool                  `json:"useHTTPS"`
 		Hostname        string                `json:"hostname"`
 		HostnameLabel   string                `json:"hostnameLabel"`
+		HostnameHash    string                `json:"hostnameHash"`
 		SSLCertificate  string                `json:"sslCertificate"`
 		SSLPemChecksum  string                `json:"sslPemChecksum"`
 		RootLocation    *HAProxyLocation      `json:"defaultLocation"`

diff --git a/rootfs/etc/haproxy/template/haproxy.tmpl b/rootfs/etc/haproxy/template/haproxy.tmpl
@@ -235,34 +235,35 @@ frontend httpsfront
 ######
 {{- range $server := $ing.HAProxies }}
 {{- $host := $server.HostnameLabel }}
+{{- $sock := iif (lt (len $host) 65) $host $server.HostnameHash }}
 ##
 ## {{ if $server.IsDefaultServer }}Default backend{{ else }}{{ $server.Hostname }}{{ end }}
 
 {{- if or $server.UseHTTP $hasHTTPStoHTTP }}
 backend httpback-{{ $host }}
     mode http
-    server {{ $host }} unix@/var/run/haproxy-http-{{ $host }}.sock send-proxy-v2
+    server {{ $host }} unix@/var/run/haproxy-http-{{ $sock }}.sock send-proxy-v2
 {{- end }}
 
 {{- if $server.UseHTTPS }}
 backend httpsback-{{ $host }}
     mode tcp
-    server {{ $host }} unix@/var/run/haproxy-https-{{ $host }}.sock send-proxy-v2
+    server {{ $host }} unix@/var/run/haproxy-https-{{ $sock }}.sock send-proxy-v2
 {{- end }}
 
 {{- $sslconn := or $server.UseHTTPS $hasHTTPStoHTTP }}
 {{- $authSSLCert := $server.CertificateAuth.AuthSSLCert }}
 frontend httpfront-{{ $host }}
 {{- if or $server.UseHTTP $hasHTTPStoHTTP }}
-    bind unix@/var/run/haproxy-http-{{ $host }}.sock accept-proxy
+    bind unix@/var/run/haproxy-http-{{ $sock }}.sock accept-proxy
 {{- end }}
 
 {{- if $server.UseHTTPS }}
     # CRT PEM checksum: {{ $server.SSLPemChecksum }}
 {{- if ne $authSSLCert.PemSHA "" }}
     # CA PEM checksum: {{ $authSSLCert.PemSHA }}
 {{- end }}
-    bind unix@/var/run/haproxy-https-{{ $host }}.sock ssl crt {{ $server.SSLCertificate }}{{ if ne $authSSLCert.CAFileName "" }} ca-file {{ $authSSLCert.CAFileName }} verify optional ca-ignore-err all crt-ignore-err all{{ end }} accept-proxy
+    bind unix@/var/run/haproxy-https-{{ $sock }}.sock ssl crt {{ $server.SSLCertificate }}{{ if ne $authSSLCert.CAFileName "" }} ca-file {{ $authSSLCert.CAFileName }} verify optional ca-ignore-err all crt-ignore-err all{{ end }} accept-proxy
 {{- end }}
     mode http