Merge pull request #550 from gianrubio/fix-args

Fix args
kubernetes · Apr 4, 2017 · 22c3226 · 22c3226
2 parents 79f8019 + c21f7ce
commit 22c3226
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -271,7 +271,7 @@ func (n *NGINXController) OverrideFlags(flags *pflag.FlagSet) {
 	}
 
 	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

diff --git a/core/pkg/ingress/controller/launch.go b/core/pkg/ingress/controller/launch.go
@@ -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.`)
 	)
 
-	backend.OverrideFlags(flags)
-
 	flags.AddGoFlagSet(flag.CommandLine)
 	flags.Parse(os.Args)
 
+	backend.OverrideFlags(flags)
+
 	flag.Set("logtostderr", "true")
 
 	glog.Info(backend.Info())