fix: cleanup kustomization

Author: procinger

pkg/kustomize.go

@@ -1,14 +1,19 @@
 package e2eutils
 
 import (
+	"bytes"
 	"context"
 	"e2eutils/pkg/argo"
+	"fmt"
+	"io"
 	"os"
-	"strings"
 
+	"gopkg.in/yaml.v3"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/e2e-framework/klient/decoder"
 	"sigs.k8s.io/e2e-framework/klient/k8s"
 	"sigs.k8s.io/kustomize/api/krusty"
+	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
@@ -50,20 +55,39 @@ func prepareKubernetesManifests(applicationSource argo.ApplicationSource) ([]k8s
 	return objects, nil
 }
 
-func BuildKustomization(path string) ([]string, error) {
+func BuildKustomization(path string) ([]*unstructured.Unstructured, error) {
 	fSys := filesys.MakeFsOnDisk()
-	kustomizationDir := "../" + path
 	k := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
 
-	objects, err := k.Run(fSys, kustomizationDir)
+	resMap, err := k.Run(fSys, path)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("running kustomize: %w", err)
 	}
 
-	yaml, err := objects.AsYaml()
+	yamlData, err := resMap.AsYaml()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("convert resmap to yaml: %w", err)
 	}
 
-	return strings.Split(string(yaml), "---"), nil
+	dec := yaml.NewDecoder(bytes.NewReader(yamlData))
+
+	var objects []*unstructured.Unstructured
+	for {
+		var o unstructured.Unstructured
+		if err := dec.Decode(&o.Object); err != nil {
+			if errors.Is(err, io.EOF) {
+				break
+			}
+			return nil, fmt.Errorf("decode yaml: %w", err)
+		}
+
+		// skip empty documents
+		if len(o.Object) == 0 {
+			continue
+		}
+
+		objects = append(objects, &o)
+	}
+
+	return objects, nil
 }

pkg/test.go

@@ -117,7 +117,7 @@ func deployHelmChart(applicationSource argo.ApplicationSource, namespace string,
 }
 
 func CheckJobsCompleted(ctx context.Context, client klient.Client, namespace string) error {
-	kubeConfig := client.RESTConfig()
+	kubeConfig := GetRestConfig()
 	clientSet, err := kubernetes.NewForConfig(kubeConfig)
 	if err != nil {
 		return err
@@ -143,7 +143,7 @@ func CheckJobsCompleted(ctx context.Context, client klient.Client, namespace str
 }
 
 func DeploymentBecameReady(ctx context.Context, client klient.Client, namespace string) error {
-	kubeConfig := client.RESTConfig()
+	kubeConfig := GetRestConfig()
 	clientSet, err := kubernetes.NewForConfig(kubeConfig)
 	if err != nil {
 		return err
@@ -174,7 +174,7 @@ func DeploymentBecameReady(ctx context.Context, client klient.Client, namespace
 }
 
 func DaemonSetBecameReady(ctx context.Context, client klient.Client, namespace string) error {
-	kubeConfig := client.RESTConfig()
+	kubeConfig := GetRestConfig()
 	clientSet, err := kubernetes.NewForConfig(kubeConfig)
 	if err != nil {
 		return err
@@ -205,7 +205,7 @@ func DaemonSetBecameReady(ctx context.Context, client klient.Client, namespace s
 }
 
 func PersistentVolumeClaimIsBound(ctx context.Context, client klient.Client, namespace string) error {
-	kubeConfig := client.RESTConfig()
+	kubeConfig := GetRestConfig()
 	clientSet, err := kubernetes.NewForConfig(kubeConfig)
 	if err != nil {
 		return err
@@ -236,7 +236,7 @@ func PersistentVolumeClaimIsBound(ctx context.Context, client klient.Client, nam
 }
 
 func SnapshotIsReadyToUse(ctx context.Context, client klient.Client, namespace string) error {
-	kubeConfig := client.RESTConfig()
+	kubeConfig := GetRestConfig()
 	dynClient, err := dynamic.NewForConfig(kubeConfig)
 	if err != nil {
 		return err

test/k3s_system_upgrade_controller_test.go

@@ -10,7 +10,6 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
-	"sigs.k8s.io/yaml"
 )
 
 func TestK3sSystemUpgradeController(t *testing.T) {
@@ -22,49 +21,42 @@ func TestK3sSystemUpgradeController(t *testing.T) {
 
 	client := e2eutils.GetClient()
 
-	var kustomization []string
+	var kustomization []*unstructured.Unstructured
 	var namespace string
 
 	install := features.
 		New("Kustomization").
 		Setup(func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
 			if update.Spec.Sources != nil {
-				kustomization, err = e2eutils.BuildKustomization(update.Spec.Sources[0].Path)
+				kustomization, err = e2eutils.BuildKustomization("../" + update.Spec.Sources[0].Path)
 			} else {
-				kustomization, err = e2eutils.BuildKustomization(current.Spec.Sources[0].Path)
+				kustomization, err = e2eutils.BuildKustomization("../" + current.Spec.Sources[0].Path)
 			}
 			require.NoError(t, err)
 
 			return ctx
 		}).
 		Assess("Deployment",
 			func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
-				for _, resource := range kustomization {
-					var object unstructured.Unstructured
-					err = yaml.Unmarshal([]byte(resource), &object.Object)
-					require.NoError(t, err)
-
+				// deploy namespace
+				for _, object := range kustomization {
 					if object.GetKind() != "Namespace" {
 						continue
 					}
 
-					err = e2eutils.Apply(*clientSet, &object)
+					err = e2eutils.Apply(*clientSet, object)
 					require.NoError(t, err)
 
 					// give k8s api some time to create a resource
 					time.Sleep(100 * time.Millisecond)
 				}
 
-				for _, resource := range kustomization {
-					var object unstructured.Unstructured
-					err = yaml.Unmarshal([]byte(resource), &object.Object)
-					require.NoError(t, err)
-
+				for _, object := range kustomization {
 					if object.GetKind() == "Namespace" {
 						continue
 					}
 
-					err = e2eutils.Apply(*clientSet, &object)
+					err = e2eutils.Apply(*clientSet, object)
 					require.NoError(t, err)
 
 					// give k8s api some time to create a resource