use metrics cli to configure config

haircommander · openshift-cherrypick-robot · commit 64a3892258e0 · 2019-10-30T19:44:25.000Z
Signed-off-by: Peter Hunt &lt;pehunt@redhat.com&gt;
diff --git a/internal/pkg/criocli/criocli.go b/internal/pkg/criocli/criocli.go
@@ -236,6 +236,12 @@ func mergeConfig(config *libconfig.Config, ctx *cli.Context) (string, error) {
 	if ctx.GlobalIsSet("version-file") {
 		config.VersionFile = ctx.GlobalString("version-file")
 	}
+	if ctx.GlobalIsSet("enable-metrics") {
+		config.EnableMetrics = ctx.GlobalBool("enable-metrics")
+	}
+	if ctx.GlobalIsSet("metrics-port") {
+		config.MetricsPort = ctx.GlobalInt("metrics-port")
+	}
 
 	return path, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,12 @@ func mergeConfig(config libconfig.Config, ctx cli.Context) (string, error) {`
`236`	`236`	`if ctx.GlobalIsSet("version-file") {`
`237`	`237`	`config.VersionFile = ctx.GlobalString("version-file")`
`238`	`238`	`}`
	`239`	`+ if ctx.GlobalIsSet("enable-metrics") {`
	`240`	`+ config.EnableMetrics = ctx.GlobalBool("enable-metrics")`
	`241`	`+ }`
	`242`	`+ if ctx.GlobalIsSet("metrics-port") {`
	`243`	`+ config.MetricsPort = ctx.GlobalInt("metrics-port")`
	`244`	`+ }`
`239`	`245`
`240`	`246`	`return path, nil`
`241`	`247`	`}`