Merge pull request cri-o#630 from runcom/fix-insecure-reg-flag

Mrunal Patel · web-flow · commit 328e50fb50e0 · 2017-06-24T08:23:25.000-07:00
cmd/crio: fix reading insecure-registry flags
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
@@ -63,7 +63,7 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
 		config.StorageOptions = ctx.GlobalStringSlice("storage-opt")
 	}
 	if ctx.GlobalIsSet("insecure-registry") {
-		config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registries")
+		config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registry")
 	}
 	if ctx.GlobalIsSet("default-transport") {
 		config.DefaultTransport = ctx.GlobalString("default-transport")

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func mergeConfig(config server.Config, ctx cli.Context) error {`
`63`	`63`	`config.StorageOptions = ctx.GlobalStringSlice("storage-opt")`
`64`	`64`	`}`
`65`	`65`	`if ctx.GlobalIsSet("insecure-registry") {`
`66`		`- config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registries")`
	`66`	`+ config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registry")`
`67`	`67`	`}`
`68`	`68`	`if ctx.GlobalIsSet("default-transport") {`
`69`	`69`	`config.DefaultTransport = ctx.GlobalString("default-transport")`