Merge pull request #258 from jcmoraisjr/jm-fix-sslpassthrough

Fix ssl-passthrough
jcmoraisjr · Nov 29, 2018 · e366bfe · e366bfe
2 parents 6fd2d92 + d5e75e3
commit e366bfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -290,11 +290,14 @@ func (cfg *haConfig) createHAProxyServers() {
 	for _, server := range cfg.ingress.PassthroughBackends {
 		haServer := &types.HAProxyPassthrough{
 			Hostname:           server.Hostname,
-			Alias:              false,
 			ACLLabel:           labelizeACL(server.Hostname),
 			Backend:            server.Backend,
 			HTTPPassBackend:    server.HTTPPassBackend,
 			HostnameIsWildcard: idHasWildcard(server.Hostname),
+			// implements the "interface" of the "acl" template
+			AliasHost:        false,
+			AliasHostIsRegex: false,
+			AliasRegex:       false,
 		}
 		haPassthrough = append(haPassthrough, haServer)
 	}

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -183,11 +183,13 @@ type (
 	// HAProxyPassthrough has SSL passthrough configurations
 	HAProxyPassthrough struct {
 		Hostname           string `json:"hostname"`
-		Alias              bool   `json:"alias"`
 		ACLLabel           string `json:"aclLabel"`
 		Backend            string `json:"backend"`
 		HTTPPassBackend    string `json:"httpPassBackend"`
 		HostnameIsWildcard bool   `json:"hostnameIsWildcard"`
+		AliasHost          bool   `json:"aliasHost"`
+		AliasHostIsRegex   bool   `json:"aliasHostIsRegex"`
+		AliasRegex         bool   `json:"aliasRegex"`
 	}
 	// HAProxyBackendSlots contains used and empty backend server definitions
 	HAProxyBackendSlots struct {