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

Fix ssl-dh-param issue when secret does not exit

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-03-05 16:31:33 -03:00
parent b1c2812dc5
commit d898169484
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
internal/ingress/controller/nginx.go
View file

@ -564,17 +564,16 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
secret, err := n.store.GetSecret(secretName) secret, err := n.store.GetSecret(secretName)
if err != nil { if err != nil {
klog.Warningf("Error reading Secret %q from local store: %v", secretName, err) klog.Warningf("Error reading Secret %q from local store: %v", secretName, err)
} } else {
nsSecName := strings.Replace(secretName, "/", "-", -1)
nsSecName := strings.Replace(secretName, "/", "-", -1) dh, ok := secret.Data["dhparam.pem"]
if ok {
dh, ok := secret.Data["dhparam.pem"] pemFileName, err := ssl.AddOrUpdateDHParam(nsSecName, dh, n.fileSystem)
if ok { if err != nil {
pemFileName, err := ssl.AddOrUpdateDHParam(nsSecName, dh, n.fileSystem) klog.Warningf("Error adding or updating dhparam file %v: %v", nsSecName, err)
if err != nil { } else {
klog.Warningf("Error adding or updating dhparam file %v: %v", nsSecName, err) sslDHParam = pemFileName
} else { }
sslDHParam = pemFileName
} }
} }
} }