added previously failing unit test and fix using pkg/util/merge.go instead of mergo to apply patch.

2015-01-31 10:59:08 -08:00
parent 3039f7846c
commit a4eca69e6c
5 changed files with 95 additions and 27 deletions
--- a/pkg/kubectl/cmd/run.go
+++ b/pkg/kubectl/cmd/run.go
@@ -74,7 +74,8 @@ Examples:

 			inline := util.GetFlagString(cmd, "overrides")
 			if len(inline) > 0 {
-				util.Merge(controller, inline, "ReplicationController")
+				controller, err = util.Merge(controller, inline, "ReplicationController")
+				checkErr(err)
 			}

 			// TODO: extract this flag to a central location, when such a location exists.