Skip to content

Commit

Permalink
Merge pull request #88 from gianrubio/fix-mutiple-tls
Browse files Browse the repository at this point in the history
Fix multiple tls hosts sharing the same secretName
  • Loading branch information
aledbf authored Dec 26, 2016
2 parents 09b17ed + e033772 commit c38868b
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions core/pkg/ingress/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
// TODO: TLS without secret?
if len(ing.Spec.TLS) > 0 && servers[host].SSLCertificate == "" && ing.Spec.TLS[0].SecretName != "" {
key := fmt.Sprintf("%v/%v", ing.Namespace, ing.Spec.TLS[0].SecretName)
if len(ing.Spec.TLS) > 0 && servers[host].SSLCertificate == "" {
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)
if exists {
cert := bc.(*ingress.SSLCert)
Expand Down

0 comments on commit c38868b

Please sign in to comment.