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

Merge pull request #3990 from ElvinEfendi/fix-dynamic-cert-issue

Browse source 
Fix dynamic cert issue with default-ssl-certificate
This commit is contained in:
Kubernetes Prow Robot 2019-04-09 20:30:11 -07:00 • committed by GitHub
commit ac043771ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 89 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/store/backend_ssl.go
View file

@ -103,7 +103,7 @@ func (s *k8sStore) getPemCertificate(secretName string) (*ingress.SSLCert, error
return nil, fmt.Errorf("unexpected error creating SSL Cert: %v", err)
}
if !s.isDynamicCertificatesEnabled || len(ca) > 0 {
if !s.isDynamicCertificatesEnabled || len(ca) > 0 || s.defaultSSLCertificate == secretName {
err = ssl.StoreSSLCertOnDisk(s.filesystem, nsSecName, sslCert)
if err != nil {
return nil, fmt.Errorf("error while storing certificate and key: %v", err)