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

Merge pull request #3947 from vncntvandriessche/bug/silent-custom-default-certificate-failure

Browse source 
Adds a log warning when falling back to default fake cert
This commit is contained in:
Kubernetes Prow Robot 2019-03-31 08:42:32 -07:00 committed by GitHub
commit 4bee401d16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/ingress/controller/controller.go
View file

@ -866,10 +866,14 @@ func (n *NGINXController) createServers(data []*ingress.Ingress,
defaultPemSHA := n.cfg.FakeCertificateSHA defaultPemSHA := n.cfg.FakeCertificateSHA
// read custom default SSL certificate, fall back to generated default certificate // read custom default SSL certificate, fall back to generated default certificate
defaultCertificate, err := n.store.GetLocalSSLCert(n.cfg.DefaultSSLCertificate) if n.cfg.DefaultSSLCertificate != "" {
if err == nil { defaultCertificate, err := n.store.GetLocalSSLCert(n.cfg.DefaultSSLCertificate)
defaultPemFileName = defaultCertificate.PemFileName if err == nil {
defaultPemSHA = defaultCertificate.PemSHA defaultPemFileName = defaultCertificate.PemFileName
defaultPemSHA = defaultCertificate.PemSHA
} else {
klog.Warningf("Error loading custom default certificate, falling back to generated default:\n%v", err)
}
} }
// initialize default server and root location // initialize default server and root location