chore: some cleanups

Author: procinger

kubernetes-services/templates/argo-rollouts.yaml

@@ -23,4 +23,4 @@ spec:
       prune: true
       selfHeal: true
     syncOptions:
-      - CreateNamespace=true
+      - CreateNamespace=true

pkg/helm.go

@@ -0,0 +1,90 @@
+package helm
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"e2eutils/pkg/argo"
+
+	"sigs.k8s.io/e2e-framework/third_party/helm"
+)
+
+type HelmArguments struct {
+	Name           string
+	Namespace      string
+	Chart          string
+	Version        string
+	ValuesFilePath string
+	OciRepository  string
+}
+
+func NewHelmManager(kubeConfigFile string) *helm.Manager {
+	return helm.New(kubeConfigFile)
+}
+
+func AddHelmRepository(helmMgr *helm.Manager, repoURL, chartName string) error {
+	return helmMgr.RunRepo(helm.WithArgs("add", "--force-update", chartName, repoURL))
+}
+
+func DeployHelmChart(helmMgr *helm.Manager, src argo.ApplicationSource, namespace string) error {
+	opts, err := buildHelmArguments(src, namespace)
+	if err != nil {
+		return fmt.Errorf("building helm options: %w", err)
+	}
+
+	options := []helm.Option{
+		helm.WithName(opts.Name),
+		helm.WithNamespace(opts.Namespace),
+		helm.WithChart(opts.Chart),
+		helm.WithVersion(opts.Version),
+		helm.WithArgs("--install", "--create-namespace"),
+	}
+
+	if opts.ValuesFilePath != "" {
+		options = append(options, helm.WithArgs("-f", opts.ValuesFilePath))
+	}
+
+	if err := helmMgr.RunUpgrade(options...); err != nil {
+		return fmt.Errorf("helm upgrade/install failed: %w", err)
+	}
+
+	return nil
+}
+
+func buildHelmArguments(src argo.ApplicationSource, namespace string) (*HelmArguments, error) {
+	opts := &HelmArguments{
+		Name:      src.Chart,
+		Namespace: namespace,
+		Version:   src.TargetRevision,
+	}
+
+	if strings.HasPrefix(src.RepoURL, "oci://") {
+		base := strings.TrimSuffix(src.RepoURL, "/")
+		opts.Chart = fmt.Sprintf("%s/%s", base, src.Chart)
+		opts.OciRepository = ""
+	} else {
+		opts.Chart = fmt.Sprintf("%s/%s", src.Chart, src.Chart)
+	}
+
+	if src.Helm != nil && src.Helm.Values != "" {
+		valuesFilePath, err := writeValuesFile(src.Chart, src.TargetRevision, src.Helm.Values)
+		if err != nil {
+			return nil, fmt.Errorf("writing values file: %w", err)
+		}
+		opts.ValuesFilePath = valuesFilePath
+	}
+
+	return opts, nil
+}
+
+func writeValuesFile(chart, revision, valuesContent string) (string, error) {
+	valuesFilePath := fmt.Sprintf("values-%s-%s.yaml", chart, revision)
+	filePath := filepath.Join(os.TempDir(), valuesFilePath)
+	if err := os.WriteFile(filePath, []byte(valuesContent), 0o600); err != nil {
+		return "", err
+	}
+
+	return filePath, nil
+}

pkg/helm/helm.go

@@ -16,15 +16,13 @@ func GetKubernetesManifests(argoApplication argo.Application) ([]k8s.Object, err
 	var objects []k8s.Object
 	var err error
 
-	if argoApplication.Spec.Source != nil {
-		if argoApplication.Spec.Source.Path == "" {
-			return nil, nil
-		}
-
+	if argoApplication.Spec.Source != nil && argoApplication.Spec.Source.Path != "" {
 		objects, err = prepareKubernetesManifests(*argoApplication.Spec.Source)
 		if err != nil {
 			return nil, err
 		}
+
+		return objects, nil
 	}
 
 	var source argo.ApplicationSource

pkg/kustomize.go

@@ -3,6 +3,7 @@ package e2eutils
 import (
 	"context"
 	"e2eutils/pkg/argo"
+	"e2eutils/pkg/helm"
 	"errors"
 	"log/slog"
 	"reflect"
@@ -72,30 +73,8 @@ func PrepareArgoApp(gitRepository string, applicationYaml string) (argo.Applicat
 	return current, update, objects, nil
 }
 
-func deployHelmChart(applicationSource argo.ApplicationSource, namespace string, kubeConfigFile string) error {
-	helmMgr := GetHelmManager(kubeConfigFile)
-
-	if !strings.Contains(applicationSource.RepoURL, "oci://") {
-		err := AddHelmRepository(helmMgr, applicationSource.RepoURL, applicationSource.Chart)
-		if err != nil {
-			return err
-		}
-	}
-
-	err := DeployHelmChart(helmMgr, applicationSource, namespace)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func DeployHelmCharts(kubeConfigFile string, argoApplication argo.Application) error {
-	if argoApplication.Spec.Source != nil {
-		if argoApplication.Spec.Source.Chart == "" {
-			return nil
-		}
-
+	if argoApplication.Spec.Source != nil && argoApplication.Spec.Source.Chart != "" {
 		err := deployHelmChart(*argoApplication.Spec.Source, argoApplication.Spec.Destination.Namespace, kubeConfigFile)
 		if err != nil {
 			return errors.New(err.Error())
@@ -119,6 +98,24 @@ func DeployHelmCharts(kubeConfigFile string, argoApplication argo.Application) e
 	return nil
 }
 
+func deployHelmChart(applicationSource argo.ApplicationSource, namespace string, kubeConfigFile string) error {
+	helmMgr := helm.NewHelmManager(kubeConfigFile)
+
+	if !strings.HasPrefix(applicationSource.RepoURL, "oci://") {
+		err := helm.AddHelmRepository(helmMgr, applicationSource.RepoURL, applicationSource.Chart)
+		if err != nil {
+			return err
+		}
+	}
+
+	err := helm.DeployHelmChart(helmMgr, applicationSource, namespace)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func CheckJobsCompleted(ctx context.Context, client klient.Client, namespace string) error {
 	kubeConfig := client.RESTConfig()
 	clientSet, err := kubernetes.NewForConfig(kubeConfig)
@@ -183,7 +180,7 @@ func DaemonSetBecameReady(ctx context.Context, client klient.Client, namespace s
 		return err
 	}
 
-	daemonSetList, err := clientSet.AppsV1().DaemonSets(namespace).List(context.TODO(), metav1.ListOptions{})
+	daemonSetList, err := clientSet.AppsV1().DaemonSets(namespace).List(ctx, metav1.ListOptions{})
 	if err != nil {
 		return err
 	}

pkg/test.go

@@ -48,7 +48,6 @@ func TestK3sSystemUpgradeController(t *testing.T) {
 						continue
 					}
 
-					namespace = object.GetName()
 					err = e2eutils.Apply(*clientSet, &object)
 					require.NoError(t, err)