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

Merge pull request #550 from gianrubio/fix-args

Browse source 
Fix args
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-04-04 09:16:43 -03:00 committed by GitHub
commit 22c3226377
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,7 @@ func (n *NGINXController) OverrideFlags(flags *pflag.FlagSet) {
} }
flags.Set("ingress-class", ic) flags.Set("ingress-class", ic)
n.stats = newStatsCollector(ic, wc, n.binary) n.stats = newStatsCollector(wc, ic, n.binary)
} }
// DefaultIngressClass just return the default ingress class // DefaultIngressClass just return the default ingress class

4
core/pkg/ingress/controller/launch.go
View file

@ -86,11 +86,11 @@ func NewIngressController(backend ingress.Controller) *GenericController {
electionID = flags.String("election-id", "ingress-controller-leader", `Election id to use for status update.`) electionID = flags.String("election-id", "ingress-controller-leader", `Election id to use for status update.`)
) )
backend.OverrideFlags(flags)
flags.AddGoFlagSet(flag.CommandLine) flags.AddGoFlagSet(flag.CommandLine)
flags.Parse(os.Args) flags.Parse(os.Args)
backend.OverrideFlags(flags)
flag.Set("logtostderr", "true") flag.Set("logtostderr", "true")
glog.Info(backend.Info()) glog.Info(backend.Info())