DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #88 from gianrubio/fix-mutiple-tls

Browse source 
Fix multiple tls hosts sharing the same secretName
This commit is contained in:
Manuel Alejandro de Brito Fontes 2016-12-26 14:04:11 -03:00 committed by GitHub
commit c38868b018
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/pkg/ingress/controller/controller.go
View file

@ -902,8 +902,18 @@ func (ic *GenericController) createServers(data []interface{}, upstreams map[str
// only add a certificate if the server does not have one previously configured // only add a certificate if the server does not have one previously configured
// TODO: TLS without secret? // TODO: TLS without secret?
if len(ing.Spec.TLS) > 0 && servers[host].SSLCertificate == "" && ing.Spec.TLS[0].SecretName != "" { if len(ing.Spec.TLS) > 0 && servers[host].SSLCertificate == "" {
key := fmt.Sprintf("%v/%v", ing.Namespace, ing.Spec.TLS[0].SecretName) tlsSecretName := ""
for _, tls := range ing.Spec.TLS {
for _, tlsHost := range tls.Hosts {
if tlsHost == host {
tlsSecretName = tls.SecretName
break
}
}
}
key := fmt.Sprintf("%v/%v", ing.Namespace, tlsSecretName)
bc, exists := ic.sslCertTracker.Get(key) bc, exists := ic.sslCertTracker.Get(key)
if exists { if exists {
cert := bc.(*ingress.SSLCert) cert := bc.(*ingress.SSLCert)