fix(cli): overwrite setups (#3488)

* fix(cli): possibility to overwrite setup steps

* chore: update cockroach version in go-dep

* fix(cli): init masterkey flags once

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

cmd/admin/setup/config.go

@@ -36,6 +36,7 @@ func MustNewConfig(v *viper.Viper) *Config {
 			mapstructure.StringToSliceHookFunc(","),
 		)),
 	)
+	logging.OnError(err).Fatal("unable to read default config")
 
 	err = config.Log.SetLogger()
 	logging.OnError(err).Fatal("unable to set logger")
@@ -58,6 +59,12 @@ func MustNewSteps(v *viper.Viper) *Steps {
 	err := v.ReadConfig(bytes.NewBuffer(defaultSteps))
 	logging.OnError(err).Fatal("unable to read setup steps")
 
+	for _, file := range stepFiles {
+		v.SetConfigFile(file)
+		err := v.MergeInConfig()
+		logging.WithFields("file", file).OnError(err).Warn("unable to read setup file")
+	}
+
 	steps := new(Steps)
 	err = v.Unmarshal(steps,
 		viper.DecodeHook(mapstructure.ComposeDecodeHookFunc(