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

Merge pull request #1310 from aledbf/fix-config

Browse source 
Refactoring nginx configuration configmap
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-09-07 09:45:32 -07:00 committed by GitHub
commit 6146bc4dc2
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -465,23 +465,22 @@ Error: %v
// SetConfig sets the configured configmap // SetConfig sets the configured configmap
func (n *NGINXController) SetConfig(cmap *api_v1.ConfigMap) { func (n *NGINXController) SetConfig(cmap *api_v1.ConfigMap) {
n.configmap = cmap n.configmap = cmap
n.isProxyProtocolEnabled = false n.isProxyProtocolEnabled = false
if cmap == nil {
n.backendDefaults = config.NewDefault().Backend m := map[string]string{}
return if cmap != nil {
m = cmap.Data
} }
val, ok := cmap.Data["use-proxy-protocol"] val, ok := m["use-proxy-protocol"]
if ok { if ok {
b, err := strconv.ParseBool(val) b, err := strconv.ParseBool(val)
if err == nil { if err == nil {
n.isProxyProtocolEnabled = b n.isProxyProtocolEnabled = b
return
} }
} }
n.backendDefaults = ngx_template.ReadConfig(n.configmap.Data).Backend n.backendDefaults = ngx_template.ReadConfig(m).Backend
} }
// SetListers sets the configured store listers in the generic ingress controller // SetListers sets the configured store listers in the generic ingress controller