From d8981694849776e83fc8c477146d7743604953ee Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Tue, 5 Mar 2019 16:31:33 -0300 Subject: [PATCH] Fix ssl-dh-param issue when secret does not exit --- internal/ingress/controller/nginx.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go index b35c2912f..234f77640 100644 --- a/internal/ingress/controller/nginx.go +++ b/internal/ingress/controller/nginx.go @@ -564,17 +564,16 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error { secret, err := n.store.GetSecret(secretName) if err != nil { klog.Warningf("Error reading Secret %q from local store: %v", secretName, err) - } - - nsSecName := strings.Replace(secretName, "/", "-", -1) - - dh, ok := secret.Data["dhparam.pem"] - if ok { - pemFileName, err := ssl.AddOrUpdateDHParam(nsSecName, dh, n.fileSystem) - if err != nil { - klog.Warningf("Error adding or updating dhparam file %v: %v", nsSecName, err) - } else { - sslDHParam = pemFileName + } else { + nsSecName := strings.Replace(secretName, "/", "-", -1) + dh, ok := secret.Data["dhparam.pem"] + if ok { + pemFileName, err := ssl.AddOrUpdateDHParam(nsSecName, dh, n.fileSystem) + if err != nil { + klog.Warningf("Error adding or updating dhparam file %v: %v", nsSecName, err) + } else { + sslDHParam = pemFileName + } } } }