k8sutil: Rename YAML imports

This commit makes sure that the import-naming is consistent with the
project.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>

Author: surajssd

pkg/k8sutil/create.go

@@ -30,9 +30,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	yamlserializer "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
-	"k8s.io/apimachinery/pkg/util/yaml"
+	yamlutil "k8s.io/apimachinery/pkg/util/yaml"
 	corev1typed "k8s.io/client-go/kubernetes/typed/core/v1"
-	sigyaml "sigs.k8s.io/yaml"
+	"sigs.k8s.io/yaml"
 
 	"github.com/kinvolk/lokomotive/internal"
 )
@@ -93,7 +93,7 @@ func LoadManifests(files map[string]string) ([]manifest, error) {
 // parseManifests parses a YAML or JSON document that may contain one or more
 // kubernetes resources.
 func parseManifests(r io.Reader) ([]manifest, error) {
-	reader := yaml.NewYAMLReader(bufio.NewReader(r))
+	reader := yamlutil.NewYAMLReader(bufio.NewReader(r))
 	var manifests []manifest
 	for {
 		yamlManifest, err := reader.Read()
@@ -108,7 +108,7 @@ func parseManifests(r io.Reader) ([]manifest, error) {
 			continue
 		}
 
-		jsonManifest, err := yaml.ToJSON(yamlManifest)
+		jsonManifest, err := yamlutil.ToJSON(yamlManifest)
 		if err != nil {
 			return nil, fmt.Errorf("invalid manifest: %w", err)
 		}
@@ -256,12 +256,12 @@ func YAMLToUnstructured(yamlObj []byte) (*unstructured.Unstructured, error) {
 // removeYAMLComments converts YAML to JSON and back again, this removes the comments in the YAML
 // and any extra whitespaces spaces.
 func removeYAMLComments(yamlObj []byte) ([]byte, error) {
-	jsonObj, err := sigyaml.YAMLToJSON(yamlObj)
+	jsonObj, err := yaml.YAMLToJSON(yamlObj)
 	if err != nil {
 		return nil, fmt.Errorf("converting YAML to JSON: %w", err)
 	}
 
-	yamlObj, err = sigyaml.JSONToYAML(jsonObj)
+	yamlObj, err = yaml.JSONToYAML(jsonObj)
 	if err != nil {
 		return nil, fmt.Errorf("converting JSON to YAML: %w", err)
 	}
@@ -274,7 +274,7 @@ func removeYAMLComments(yamlObj []byte) ([]byte, error) {
 func SplitYAMLDocuments(yamlObj string) ([]string, error) {
 	var ret []string
 
-	reader := yaml.NewYAMLReader(bufio.NewReader(strings.NewReader(yamlObj)))
+	reader := yamlutil.NewYAMLReader(bufio.NewReader(strings.NewReader(yamlObj)))
 
 	for {
 		// Read the YAML document delimited by `---`.