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

Merge remote-tracking branch 'master/master' into refactor-template-headers

Browse source 
Merge
This commit is contained in:
Manuel de Brito Fontes 2017-09-26 14:08:17 -03:00
commit d73edb8176
42 changed files with 2115 additions and 1102 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ type NGINXController struct {
configmap *apiv1.ConfigMap
storeLister ingress.StoreLister
storeLister *ingress.StoreLister
binary string
resolver []net.IP
@ -463,7 +463,7 @@ func (n *NGINXController) SetConfig(cmap *apiv1.ConfigMap) {
}
// SetListers sets the configured store listers in the generic ingress controller
func (n *NGINXController) SetListers(lister ingress.StoreLister) {
func (n *NGINXController) SetListers(lister *ingress.StoreLister) {
n.storeLister = lister
}