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

Merge pull request #3960 from Shopify/fix-add-headers-segfault

Browse source 
Fix segfault on reference to nonexistent configmap
This commit is contained in:
Kubernetes Prow Robot 2019-04-04 08:52:53 -07:00 committed by GitHub
commit d3f9fbb8fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -571,9 +571,9 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
cmap, err := n.store.GetConfigMap(cfg.ProxySetHeaders) cmap, err := n.store.GetConfigMap(cfg.ProxySetHeaders)
if err != nil { if err != nil {
klog.Warningf("Error reading ConfigMap %q from local store: %v", cfg.ProxySetHeaders, err) klog.Warningf("Error reading ConfigMap %q from local store: %v", cfg.ProxySetHeaders, err)
} else {
setHeaders = cmap.Data
} }
setHeaders = cmap.Data
} }
addHeaders := map[string]string{} addHeaders := map[string]string{}
@ -581,9 +581,9 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
cmap, err := n.store.GetConfigMap(cfg.AddHeaders) cmap, err := n.store.GetConfigMap(cfg.AddHeaders)
if err != nil { if err != nil {
klog.Warningf("Error reading ConfigMap %q from local store: %v", cfg.AddHeaders, err) klog.Warningf("Error reading ConfigMap %q from local store: %v", cfg.AddHeaders, err)
} else {
addHeaders = cmap.Data
} }
addHeaders = cmap.Data
} }
sslDHParam := "" sslDHParam := ""