Merge pull request #19674 from mfojtik/up-30-write-yaml

openshift-merge-robot · web-flow · commit 617e2c2a84cf · 2018-05-12T22:57:32.000-07:00
up: use YAML instead of JSON for configs
diff --git a/pkg/oc/bootstrap/clusterup/kubeapiserver/openshift_apiserver.go b/pkg/oc/bootstrap/clusterup/kubeapiserver/openshift_apiserver.go
@@ -36,7 +36,7 @@ func MakeOpenShiftAPIServerConfig(existingMasterConfig string, routingSuffix, ba
 	// hardcode the route suffix to the old default.  If anyone wants to change it, they can modify their config.
 	masterconfig.RoutingConfig.Subdomain = routingSuffix
 
-	configBytes, err := runtime.Encode(configapilatest.Codec, masterconfig)
+	configBytes, err := configapilatest.WriteYAML(masterconfig)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/oc/bootstrap/clusterup/kubeapiserver/openshift_controller.go b/pkg/oc/bootstrap/clusterup/kubeapiserver/openshift_controller.go
@@ -33,7 +33,7 @@ func MakeOpenShiftControllerConfig(existingMasterConfig string, basedir string)
 	masterconfig := configObj.(*configapi.MasterConfig)
 	masterconfig.ServingInfo.BindAddress = "0.0.0.0:8444"
 
-	configBytes, err := runtime.Encode(configapilatest.Codec, masterconfig)
+	configBytes, err := configapilatest.WriteYAML(masterconfig)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/oc/bootstrap/clusterup/kubelet/dns.go b/pkg/oc/bootstrap/clusterup/kubelet/dns.go
@@ -46,7 +46,7 @@ func MakeKubeDNSConfig(existingNodeConfig string, basedir string) (string, error
 	nodeConfig := configObj.(*configapi.NodeConfig)
 	nodeConfig.DNSBindAddress = "0.0.0.0:53"
 	nodeConfig.DNSRecursiveResolvConf = "resolv.conf"
-	configBytes, err := runtime.Encode(configapilatest.Codec, nodeConfig)
+	configBytes, err := configapilatest.WriteYAML(nodeConfig)
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func MakeOpenShiftAPIServerConfig(existingMasterConfig string, routingSuffix, ba`
`36`	`36`	`// hardcode the route suffix to the old default. If anyone wants to change it, they can modify their config.`
`37`	`37`	`masterconfig.RoutingConfig.Subdomain = routingSuffix`
`38`	`38`
`39`		`- configBytes, err := runtime.Encode(configapilatest.Codec, masterconfig)`
	`39`	`+ configBytes, err := configapilatest.WriteYAML(masterconfig)`
`40`	`40`	`if err != nil {`
`41`	`41`	`return "", err`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func MakeOpenShiftControllerConfig(existingMasterConfig string, basedir string)`
`33`	`33`	`masterconfig := configObj.(*configapi.MasterConfig)`
`34`	`34`	`masterconfig.ServingInfo.BindAddress = "0.0.0.0:8444"`
`35`	`35`
`36`		`- configBytes, err := runtime.Encode(configapilatest.Codec, masterconfig)`
	`36`	`+ configBytes, err := configapilatest.WriteYAML(masterconfig)`
`37`	`37`	`if err != nil {`
`38`	`38`	`return "", err`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func MakeKubeDNSConfig(existingNodeConfig string, basedir string) (string, error`
`46`	`46`	`nodeConfig := configObj.(*configapi.NodeConfig)`
`47`	`47`	`nodeConfig.DNSBindAddress = "0.0.0.0:53"`
`48`	`48`	`nodeConfig.DNSRecursiveResolvConf = "resolv.conf"`
`49`		`- configBytes, err := runtime.Encode(configapilatest.Codec, nodeConfig)`
	`49`	`+ configBytes, err := configapilatest.WriteYAML(nodeConfig)`
`50`	`50`	`if err != nil {`
`51`	`51`	`return "", err`
`52`	`52`	`}`