diff --git a/cmd/kubeadm/app/cmd/config_test.go b/cmd/kubeadm/app/cmd/config_test.go index d65c8105740..7a9d3813d9f 100644 --- a/cmd/kubeadm/app/cmd/config_test.go +++ b/cmd/kubeadm/app/cmd/config_test.go @@ -399,9 +399,9 @@ func TestNewCmdConfigPrintActionDefaults(t *testing.T) { t.Fatalf("Error from running the print command: %v", err) } - gvkmap, err := kubeadmutil.SplitYAMLDocuments(output.Bytes()) + gvkmap, err := kubeadmutil.SplitConfigDocuments(output.Bytes()) if err != nil { - t.Fatalf("unexpected failure of SplitYAMLDocuments: %v", err) + t.Fatalf("unexpected failure of SplitConfigDocuments: %v", err) } gotKinds := []string{} diff --git a/cmd/kubeadm/app/componentconfigs/configset.go b/cmd/kubeadm/app/componentconfigs/configset.go index a25d96ad4b3..693d5a60b75 100644 --- a/cmd/kubeadm/app/componentconfigs/configset.go +++ b/cmd/kubeadm/app/componentconfigs/configset.go @@ -86,7 +86,7 @@ func (h *handler) fromConfigMap(client clientset.Interface, cmName, cmKey string return nil, errors.Errorf("unexpected error when reading %s ConfigMap: %s key value pair missing", cmName, cmKey) } - gvkmap, err := kubeadmutil.SplitYAMLDocuments([]byte(configData)) + gvkmap, err := kubeadmutil.SplitConfigDocuments([]byte(configData)) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/componentconfigs/configset_test.go b/cmd/kubeadm/app/componentconfigs/configset_test.go index cfa2837d199..d41317997bb 100644 --- a/cmd/kubeadm/app/componentconfigs/configset_test.go +++ b/cmd/kubeadm/app/componentconfigs/configset_test.go @@ -78,9 +78,9 @@ func TestFetchFromDocumentMap(t *testing.T) { apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration `) - gvkmap, err := kubeadmutil.SplitYAMLDocuments([]byte(test)) + gvkmap, err := kubeadmutil.SplitConfigDocuments([]byte(test)) if err != nil { - t.Fatalf("unexpected failure of SplitYAMLDocuments: %v", err) + t.Fatalf("unexpected failure of SplitConfigDocuments: %v", err) } clusterCfg := testClusterCfg() diff --git a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go index 1c1ac7301a4..a8f3bf90eae 100644 --- a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go +++ b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go @@ -293,9 +293,9 @@ func TestConfigBaseUnmarshal(t *testing.T) { config: validUnmarshallableClusterConfig.obj, } - gvkmap, err := kubeadmutil.SplitYAMLDocuments([]byte(validUnmarshallableClusterConfig.yaml)) + gvkmap, err := kubeadmutil.SplitConfigDocuments([]byte(validUnmarshallableClusterConfig.yaml)) if err != nil { - t.Fatalf("unexpected failure of SplitYAMLDocuments: %v", err) + t.Fatalf("unexpected failure of SplitConfigDocuments: %v", err) } got := &clusterConfig{ @@ -461,9 +461,9 @@ func runClusterConfigFromTest(t *testing.T, perform func(t *testing.T, in string func TestLoadingFromDocumentMap(t *testing.T) { runClusterConfigFromTest(t, func(t *testing.T, in string) (kubeadmapi.ComponentConfig, error) { - gvkmap, err := kubeadmutil.SplitYAMLDocuments([]byte(in)) + gvkmap, err := kubeadmutil.SplitConfigDocuments([]byte(in)) if err != nil { - t.Fatalf("unexpected failure of SplitYAMLDocuments: %v", err) + t.Fatalf("unexpected failure of SplitConfigDocuments: %v", err) } return clusterConfigHandler.FromDocumentMap(gvkmap) diff --git a/cmd/kubeadm/app/phases/kubelet/config.go b/cmd/kubeadm/app/phases/kubelet/config.go index 5005d443bbf..df835639526 100644 --- a/cmd/kubeadm/app/phases/kubelet/config.go +++ b/cmd/kubeadm/app/phases/kubelet/config.go @@ -110,7 +110,7 @@ func ApplyPatchesToConfig(cfg *kubeadmapi.ClusterConfiguration, patchesDir strin } } - gvkmap, err := kubeadmutil.SplitYAMLDocuments(kubeletBytes) + gvkmap, err := kubeadmutil.SplitConfigDocuments(kubeletBytes) if err != nil { return err } diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go index 7edadd2d2fd..353bef93751 100644 --- a/cmd/kubeadm/app/util/config/common.go +++ b/cmd/kubeadm/app/util/config/common.go @@ -256,7 +256,7 @@ func MigrateOldConfig(oldConfig []byte, allowExperimental bool, mutators migrate mutators = defaultMigrateMutators() } - gvkmap, err := kubeadmutil.SplitYAMLDocuments(oldConfig) + gvkmap, err := kubeadmutil.SplitConfigDocuments(oldConfig) if err != nil { return []byte{}, err } @@ -329,7 +329,7 @@ func MigrateOldConfig(oldConfig []byte, allowExperimental bool, mutators migrate // ValidateConfig takes a byte slice containing a kubeadm configuration and performs conversion // to internal types and validation. func ValidateConfig(config []byte, allowExperimental bool) error { - gvkmap, err := kubeadmutil.SplitYAMLDocuments(config) + gvkmap, err := kubeadmutil.SplitConfigDocuments(config) if err != nil { return err } diff --git a/cmd/kubeadm/app/util/config/initconfiguration.go b/cmd/kubeadm/app/util/config/initconfiguration.go index 203d219c1f9..b04ecafde1c 100644 --- a/cmd/kubeadm/app/util/config/initconfiguration.go +++ b/cmd/kubeadm/app/util/config/initconfiguration.go @@ -295,7 +295,7 @@ func LoadOrDefaultInitConfiguration(cfgPath string, versionedInitCfg *kubeadmapi // and well-known ComponentConfig GroupVersionKinds are stored inside of the internal InitConfiguration struct. // The resulting InitConfiguration is then dynamically defaulted and validated prior to return. func BytesToInitConfiguration(b []byte, skipCRIDetect bool) (*kubeadmapi.InitConfiguration, error) { - gvkmap, err := kubeadmutil.SplitYAMLDocuments(b) + gvkmap, err := kubeadmutil.SplitConfigDocuments(b) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/util/config/joinconfiguration.go b/cmd/kubeadm/app/util/config/joinconfiguration.go index 08540d568a0..f1676133879 100644 --- a/cmd/kubeadm/app/util/config/joinconfiguration.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration.go @@ -87,7 +87,7 @@ func LoadJoinConfigurationFromFile(cfgPath string, opts LoadOrDefaultConfigurati return nil, errors.Wrapf(err, "unable to read config from %q ", cfgPath) } - gvkmap, err := kubeadmutil.SplitYAMLDocuments(b) + gvkmap, err := kubeadmutil.SplitConfigDocuments(b) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/util/config/resetconfiguration.go b/cmd/kubeadm/app/util/config/resetconfiguration.go index 2cc02e6fff7..769c899b37c 100644 --- a/cmd/kubeadm/app/util/config/resetconfiguration.go +++ b/cmd/kubeadm/app/util/config/resetconfiguration.go @@ -91,7 +91,7 @@ func LoadResetConfigurationFromFile(cfgPath string, opts LoadOrDefaultConfigurat return nil, errors.Wrapf(err, "unable to read config from %q ", cfgPath) } - gvkmap, err := kubeadmutil.SplitYAMLDocuments(b) + gvkmap, err := kubeadmutil.SplitConfigDocuments(b) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/util/config/upgradeconfiguration.go b/cmd/kubeadm/app/util/config/upgradeconfiguration.go index 19488422d4a..855da37ab79 100644 --- a/cmd/kubeadm/app/util/config/upgradeconfiguration.go +++ b/cmd/kubeadm/app/util/config/upgradeconfiguration.go @@ -94,7 +94,7 @@ func LoadUpgradeConfigurationFromFile(cfgPath string, _ LoadOrDefaultConfigurati } // Split the YAML/JSON documents in the file into a DocumentMap - docmap, err := kubeadmutil.SplitYAMLDocuments(configBytes) + docmap, err := kubeadmutil.SplitConfigDocuments(configBytes) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/util/config/upgradeconfiguration_test.go b/cmd/kubeadm/app/util/config/upgradeconfiguration_test.go index 8143cbd47be..f682ee32582 100644 --- a/cmd/kubeadm/app/util/config/upgradeconfiguration_test.go +++ b/cmd/kubeadm/app/util/config/upgradeconfiguration_test.go @@ -122,9 +122,9 @@ func TestDocMapToUpgradeConfiguration(t *testing.T) { if err != nil { t.Fatalf("unexpected error while marshalling to YAML: %v", err) } - docmap, err := kubeadmutil.SplitYAMLDocuments(b) + docmap, err := kubeadmutil.SplitConfigDocuments(b) if err != nil { - t.Fatalf("Unexpected error of SplitYAMLDocuments: %v", err) + t.Fatalf("Unexpected error of SplitConfigDocuments: %v", err) } cfg, err := DocMapToUpgradeConfiguration(docmap) if (err != nil) != tc.expectedError { diff --git a/cmd/kubeadm/app/util/marshal.go b/cmd/kubeadm/app/util/marshal.go index c82e3022016..68c42f3fd7c 100644 --- a/cmd/kubeadm/app/util/marshal.go +++ b/cmd/kubeadm/app/util/marshal.go @@ -65,13 +65,13 @@ func UniversalUnmarshal(buffer []byte) (runtime.Object, error) { return obj, nil } -// SplitYAMLDocuments reads the YAML bytes per-document, unmarshals the TypeMeta information from each document +// SplitConfigDocuments reads the YAML/JSON bytes per-document, unmarshals the TypeMeta information from each document // and returns a map between the GroupVersionKind of the document and the document bytes -func SplitYAMLDocuments(yamlBytes []byte) (kubeadmapi.DocumentMap, error) { +func SplitConfigDocuments(documentBytes []byte) (kubeadmapi.DocumentMap, error) { gvkmap := kubeadmapi.DocumentMap{} knownKinds := map[string]bool{} errs := []error{} - buf := bytes.NewBuffer(yamlBytes) + buf := bytes.NewBuffer(documentBytes) reader := utilyaml.NewYAMLReader(bufio.NewReader(buf)) for { // Read one YAML document at a time, until io.EOF is returned @@ -111,7 +111,7 @@ func SplitYAMLDocuments(yamlBytes []byte) (kubeadmapi.DocumentMap, error) { // GroupVersionKindsFromBytes parses the bytes and returns a gvk slice func GroupVersionKindsFromBytes(b []byte) ([]schema.GroupVersionKind, error) { - gvkmap, err := SplitYAMLDocuments(b) + gvkmap, err := SplitConfigDocuments(b) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/util/marshal_test.go b/cmd/kubeadm/app/util/marshal_test.go index 4814fc6292d..246d22ba482 100644 --- a/cmd/kubeadm/app/util/marshal_test.go +++ b/cmd/kubeadm/app/util/marshal_test.go @@ -199,7 +199,7 @@ func TestSplitYAMLDocuments(t *testing.T) { for _, rt := range tests { t.Run(rt.name, func(t2 *testing.T) { - gvkmap, err := SplitYAMLDocuments(rt.fileContents) + gvkmap, err := SplitConfigDocuments(rt.fileContents) if (err != nil) != rt.expectedErr { t2.Errorf("expected error: %t, actual: %t", rt.expectedErr, err != nil) }