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

Add e2e boilerplate

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-11-23 20:22:29 -03:00
parent 42b58e957c
commit 16c5800545
9 changed files with 397 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,8 @@ type GenericController struct {
syncStatus status.Sync
// controller for SSL certificates
// local store of SSL certificates
// (only certificates used in ingress)
sslCertTracker *sslCertTracker
// TaskQueue in charge of keep the secrets referenced from Ingress
// in sync with the files on disk
@ -922,7 +923,8 @@ func (ic *GenericController) createServers(data []interface{}, upstreams map[str
}
// only add a certificate if the server does not have one previously configured
if len(ing.Spec.TLS) > 0 && servers[host].SSLCertificate != "" {
// 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)
bc, exists := ic.sslCertTracker.Get(key)
if exists {
@ -931,6 +933,8 @@ func (ic *GenericController) createServers(data []interface{}, upstreams map[str
servers[host].SSLCertificate = cert.PemFileName
servers[host].SSLPemChecksum = cert.PemSHA
}
} else {
glog.Warningf("secret %v does not exists", key)
}
}