From 7c4d1375ad857a374f44036069703ee193b4695f Mon Sep 17 00:00:00 2001
From: Derek McQuay <dmcquay@apprenda.com>
Date: Fri, 10 Feb 2017 09:29:27 -0800
Subject: [PATCH] kubeadm: changed manifest files to yaml

---
 cmd/kubeadm/app/cmd/reset.go         |  2 +-
 cmd/kubeadm/app/cmd/reset_test.go    | 12 ++++++------
 cmd/kubeadm/app/master/BUILD         |  1 +
 cmd/kubeadm/app/master/manifests.go  |  9 +++++----
 cmd/kubeadm/app/master/selfhosted.go |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go
index 813ca534e63a..c10d26f9bafe 100644
--- a/cmd/kubeadm/app/cmd/reset.go
+++ b/cmd/kubeadm/app/cmd/reset.go
@@ -124,7 +124,7 @@ func (r *Reset) Run(out io.Writer) error {
 
 	// Only clear etcd data when the etcd manifest is found. In case it is not found, we must assume that the user
 	// provided external etcd endpoints. In that case, it is his own responsibility to reset etcd
-	etcdManifestPath := filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests/etcd.json")
+	etcdManifestPath := filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests/etcd.yaml")
 	if _, err := os.Stat(etcdManifestPath); err == nil {
 		dirsToClean = append(dirsToClean, "/var/lib/etcd")
 	} else {
diff --git a/cmd/kubeadm/app/cmd/reset_test.go b/cmd/kubeadm/app/cmd/reset_test.go
index 7f073543b9b4..e7d3c325b940 100644
--- a/cmd/kubeadm/app/cmd/reset_test.go
+++ b/cmd/kubeadm/app/cmd/reset_test.go
@@ -61,8 +61,8 @@ func TestConfigDirCleaner(t *testing.T) {
 				"pki",
 			},
 			setupFiles: []string{
-				"manifests/etcd.json",
-				"manifests/kube-apiserver.json",
+				"manifests/etcd.yaml",
+				"manifests/kube-apiserver.yaml",
 				"pki/ca.pem",
 				kubeconfig.AdminKubeConfigFileName,
 				kubeconfig.KubeletKubeConfigFileName,
@@ -93,8 +93,8 @@ func TestConfigDirCleaner(t *testing.T) {
 				"pki",
 			},
 			setupFiles: []string{
-				"manifests/etcd.json",
-				"manifests/kube-apiserver.json",
+				"manifests/etcd.yaml",
+				"manifests/kube-apiserver.yaml",
 				"pki/ca.pem",
 				kubeconfig.AdminKubeConfigFileName,
 				kubeconfig.KubeletKubeConfigFileName,
@@ -113,8 +113,8 @@ func TestConfigDirCleaner(t *testing.T) {
 				".mydir",
 			},
 			setupFiles: []string{
-				"manifests/etcd.json",
-				"manifests/kube-apiserver.json",
+				"manifests/etcd.yaml",
+				"manifests/kube-apiserver.yaml",
 				"pki/ca.pem",
 				kubeconfig.AdminKubeConfigFileName,
 				kubeconfig.KubeletKubeConfigFileName,
diff --git a/cmd/kubeadm/app/master/BUILD b/cmd/kubeadm/app/master/BUILD
index 902b610b5d48..d9cc254171d8 100644
--- a/cmd/kubeadm/app/master/BUILD
+++ b/cmd/kubeadm/app/master/BUILD
@@ -29,6 +29,7 @@ go_library(
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
+        "//vendor:github.com/ghodss/yaml",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go
index e831277f2ea0..421c2250a8ef 100644
--- a/cmd/kubeadm/app/master/manifests.go
+++ b/cmd/kubeadm/app/master/manifests.go
@@ -18,12 +18,13 @@ package master
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"os"
 	"path"
 	"strings"
 
+	"github.com/ghodss/yaml"
+
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -129,10 +130,10 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 		return fmt.Errorf("failed to create directory %q [%v]", manifestsPath, err)
 	}
 	for name, spec := range staticPodSpecs {
-		filename := path.Join(manifestsPath, name+".json")
-		serialized, err := json.MarshalIndent(spec, "", "  ")
+		filename := path.Join(manifestsPath, name+".yaml")
+		serialized, err := yaml.Marshal(spec)
 		if err != nil {
-			return fmt.Errorf("failed to marshal manifest for %q to JSON [%v]", name, err)
+			return fmt.Errorf("failed to marshal manifest for %q to YAML [%v]", name, err)
 		}
 		if err := cmdutil.DumpReaderToFile(bytes.NewReader(serialized), filename); err != nil {
 			return fmt.Errorf("failed to create static pod manifest file for %q (%q) [%v]", name, filename, err)
diff --git a/cmd/kubeadm/app/master/selfhosted.go b/cmd/kubeadm/app/master/selfhosted.go
index 26c92d219649..9c2fe0f59393 100644
--- a/cmd/kubeadm/app/master/selfhosted.go
+++ b/cmd/kubeadm/app/master/selfhosted.go
@@ -335,7 +335,7 @@ func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration) ext.Deployment
 }
 
 func buildStaticManifestFilepath(name string) string {
-	return path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests", name+".json")
+	return path.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests", name+".yaml")
 }
 
 func getMasterToleration() string {