github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: changed manifest files to yaml

Browse Source
This commit is contained in:
Derek McQuay 2017-02-10 09:29:27 -08:00
parent 4ed86f5d46
commit 7c4d1375ad
No known key found for this signature in database
GPG Key ID: 92A7BC0C86B0B91A
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/reset.go
View File

@ -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 // 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 // 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 { if _, err := os.Stat(etcdManifestPath); err == nil {
dirsToClean = append(dirsToClean, "/var/lib/etcd") dirsToClean = append(dirsToClean, "/var/lib/etcd")
} else { } else {

12
cmd/kubeadm/app/cmd/reset_test.go
View File

@ -61,8 +61,8 @@ func TestConfigDirCleaner(t *testing.T) {
"pki", "pki",
}, },
setupFiles: []string{ setupFiles: []string{
"manifests/etcd.json", "manifests/etcd.yaml",
"manifests/kube-apiserver.json", "manifests/kube-apiserver.yaml",
"pki/ca.pem", "pki/ca.pem",
kubeconfig.AdminKubeConfigFileName, kubeconfig.AdminKubeConfigFileName,
kubeconfig.KubeletKubeConfigFileName, kubeconfig.KubeletKubeConfigFileName,
@ -93,8 +93,8 @@ func TestConfigDirCleaner(t *testing.T) {
"pki", "pki",
}, },
setupFiles: []string{ setupFiles: []string{
"manifests/etcd.json", "manifests/etcd.yaml",
"manifests/kube-apiserver.json", "manifests/kube-apiserver.yaml",
"pki/ca.pem", "pki/ca.pem",
kubeconfig.AdminKubeConfigFileName, kubeconfig.AdminKubeConfigFileName,
kubeconfig.KubeletKubeConfigFileName, kubeconfig.KubeletKubeConfigFileName,
@ -113,8 +113,8 @@ func TestConfigDirCleaner(t *testing.T) {
".mydir", ".mydir",
}, },
setupFiles: []string{ setupFiles: []string{
"manifests/etcd.json", "manifests/etcd.yaml",
"manifests/kube-apiserver.json", "manifests/kube-apiserver.yaml",
"pki/ca.pem", "pki/ca.pem",
kubeconfig.AdminKubeConfigFileName, kubeconfig.AdminKubeConfigFileName,
kubeconfig.KubeletKubeConfigFileName, kubeconfig.KubeletKubeConfigFileName,

1
cmd/kubeadm/app/master/BUILD
View File

@ -29,6 +29,7 @@ go_library(
"//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/kubectl/cmd/util: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/errors",
"//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/api/resource",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",

9
cmd/kubeadm/app/master/manifests.go
View File

@ -18,12 +18,13 @@ package master
import ( import (
"bytes" "bytes"
"encoding/json"
"fmt" "fmt"
"os" "os"
"path" "path"
"strings" "strings"
"github.com/ghodss/yaml"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "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) return fmt.Errorf("failed to create directory %q [%v]", manifestsPath, err)
} }
for name, spec := range staticPodSpecs { for name, spec := range staticPodSpecs {
filename := path.Join(manifestsPath, name+".json") filename := path.Join(manifestsPath, name+".yaml")
serialized, err := json.MarshalIndent(spec, "", " ") serialized, err := yaml.Marshal(spec)
if err != nil { 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 { 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) return fmt.Errorf("failed to create static pod manifest file for %q (%q) [%v]", name, filename, err)

2
cmd/kubeadm/app/master/selfhosted.go
View File

@ -335,7 +335,7 @@ func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration) ext.Deployment
} }
func buildStaticManifestFilepath(name string) string { 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 { func getMasterToleration() string {