ci: preparation of go code decoupling

Author: procinger

.gitignore

@@ -3,7 +3,7 @@
 kubeconfig
 hosts.yml
 vendor/*
-tls.crt
-tls.key
-public-key-cert.pem
-**/kind-logs
+*.crt
+*.key
+*.pem
+**/kind-logs

go.mod

@@ -1,4 +1,4 @@
-module test
+module e2eutils
 
 go 1.24.0
 

test/pkg/api/api.go renamed to pkg/api.go

@@ -1,8 +1,9 @@
-package api
+package e2eutils
 
 import (
 	"context"
 	"errors"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -12,7 +13,6 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/e2e-framework/klient/k8s"
-	"test/test/pkg/test"
 )
 
 func Apply(clientset kubernetes.Clientset, object runtime.Object) error {
@@ -33,7 +33,7 @@ func Apply(clientset kubernetes.Clientset, object runtime.Object) error {
 		_, err := createPersistentVolumeClaim(clientset, *object.(*corev1.PersistentVolumeClaim))
 		return err
 	case *unstructured.Unstructured:
-		dynClient, err := test.GetDynClient()
+		dynClient, err := GetDynClient()
 		if err != nil {
 			return err
 		}
@@ -75,7 +75,7 @@ func createPersistentVolumeClaim(clientset kubernetes.Clientset, object corev1.P
 }
 
 func getResourceName(object unstructured.Unstructured) (string, error) {
-	discoveryClient, err := test.GetDiscoveryClient()
+	discoveryClient, err := GetDiscoveryClient()
 	if err != nil {
 		return "", errors.New("Failed to get discovery client " + err.Error())
 	}

test/pkg/argo/application.go renamed to pkg/argo/application.go

@@ -5,9 +5,10 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"sigs.k8s.io/yaml"
 	"strconv"
 	"strings"
+
+	"sigs.k8s.io/yaml"
 )
 
 func GetArgoApplication(applicationYaml string) (Application, error) {

test/pkg/argo/argo.go renamed to pkg/argo/argo.go

@@ -0,0 +1,40 @@
+package e2eutils
+
+import (
+	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/e2e-framework/klient"
+	"sigs.k8s.io/e2e-framework/pkg/envconf"
+)
+
+func GetClient() klient.Client {
+	cfg := envconf.Config{}
+	return cfg.Client()
+}
+
+func GetRestConfig() *rest.Config {
+	client := GetClient()
+	return client.RESTConfig()
+}
+
+func GetClientSet() (*kubernetes.Clientset, error) {
+	kubeConfig := GetRestConfig()
+	clientSet, err := kubernetes.NewForConfig(kubeConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return clientSet, nil
+}
+
+func GetDynClient() (*dynamic.DynamicClient, error) {
+	kubeConfig := GetRestConfig()
+	return dynamic.NewForConfig(kubeConfig)
+}
+
+func GetDiscoveryClient() (*discovery.DiscoveryClient, error) {
+	kubeConfig := GetRestConfig()
+	return discovery.NewDiscoveryClientForConfig(kubeConfig)
+}

pkg/client.go

@@ -1,4 +1,4 @@
-package git
+package e2eutils
 
 import (
 	"os/exec"

test/pkg/git/git.go renamed to pkg/git.go

@@ -1,11 +1,12 @@
-package helm
+package e2eutils
 
 import (
+	"e2eutils/pkg/argo"
 	"fmt"
 	"os"
-	"sigs.k8s.io/e2e-framework/third_party/helm"
 	"strings"
-	"test/test/pkg/argo"
+
+	"sigs.k8s.io/e2e-framework/third_party/helm"
 )
 
 type HelmOptions struct {
@@ -34,7 +35,7 @@ func AddHelmRepository(helmMgr *helm.Manager, helmRepoUrl string, helmChartName
 	return nil
 }
 
-func helmifyApp(app argo.ApplicationSource, namespace string) (HelmOptions, error) {
+func helmifyArgoApp(app argo.ApplicationSource, namespace string) (HelmOptions, error) {
 	fullChartName := getFullChartName(app.Chart, app.Chart)
 	helmOciRepository := ""
 
@@ -90,7 +91,7 @@ func helmValuesToFile(applicationSource argo.ApplicationSource) error {
 }
 
 func DeployHelmChart(helmMgr *helm.Manager, applicationSource argo.ApplicationSource, namespace string) error {
-	helmOptions, err := helmifyApp(applicationSource, namespace)
+	helmOptions, err := helmifyArgoApp(applicationSource, namespace)
 	if err != nil {
 		return err
 	}

test/pkg/helm/helm.go renamed to pkg/helm.go

@@ -1,14 +1,15 @@
-package manifest
+package e2eutils
 
 import (
 	"context"
+	"e2eutils/pkg/argo"
 	"os"
+	"strings"
+
 	"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/filesys"
-	"strings"
-	"test/test/pkg/argo"
 )
 
 func GetKubernetesManifests(argoApplication argo.Application) ([]k8s.Object, error) {

test/pkg/manifest/manifest.go renamed to pkg/kustomize.go

@@ -1,36 +1,31 @@
-package test
+package e2eutils
 
 import (
 	"context"
+	"e2eutils/pkg/argo"
 	"errors"
+	"log/slog"
+	"reflect"
+	"strings"
+	"time"
+
 	snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"log/slog"
-	"reflect"
 	"sigs.k8s.io/e2e-framework/klient"
 	"sigs.k8s.io/e2e-framework/klient/k8s"
 	"sigs.k8s.io/e2e-framework/klient/wait"
 	"sigs.k8s.io/e2e-framework/klient/wait/conditions"
-	"sigs.k8s.io/e2e-framework/pkg/envconf"
-	"strings"
-	"test/test/pkg/argo"
-	"test/test/pkg/git"
-	"test/test/pkg/helm"
-	"test/test/pkg/manifest"
-	"time"
 )
 
-func PrepareTest(gitRepository string, applicationYaml string) (argo.Application, argo.Application, []k8s.Object, error) {
-	currGitBranch, err := git.GetCurrentGitBranch()
+func PrepareArgoApp(gitRepository string, applicationYaml string) (argo.Application, argo.Application, []k8s.Object, error) {
+	currGitBranch, err := GetCurrentGitBranch()
 	if err != nil {
 		return argo.Application{}, argo.Application{}, nil, err
 	}
@@ -41,7 +36,7 @@ func PrepareTest(gitRepository string, applicationYaml string) (argo.Application
 			return argo.Application{}, argo.Application{}, nil, err
 		}
 
-		objects, err := manifest.GetKubernetesManifests(current)
+		objects, err := GetKubernetesManifests(current)
 		if err != nil {
 			return current, argo.Application{}, nil, err
 		}
@@ -54,7 +49,7 @@ func PrepareTest(gitRepository string, applicationYaml string) (argo.Application
 		return argo.Application{}, argo.Application{}, nil, err
 	}
 
-	objects, err := manifest.GetKubernetesManifests(update)
+	objects, err := GetKubernetesManifests(update)
 	if err != nil {
 		return argo.Application{}, argo.Application{}, nil, err
 	}
@@ -78,16 +73,16 @@ func PrepareTest(gitRepository string, applicationYaml string) (argo.Application
 }
 
 func deployHelmChart(applicationSource argo.ApplicationSource, namespace string, kubeConfigFile string) error {
-	helmMgr := helm.GetHelmManager(kubeConfigFile)
+	helmMgr := GetHelmManager(kubeConfigFile)
 
 	if !strings.Contains(applicationSource.RepoURL, "oci://") {
-		err := helm.AddHelmRepository(helmMgr, applicationSource.RepoURL, applicationSource.Chart)
+		err := AddHelmRepository(helmMgr, applicationSource.RepoURL, applicationSource.Chart)
 		if err != nil {
 			return err
 		}
 	}
 
-	err := helm.DeployHelmChart(helmMgr, applicationSource, namespace)
+	err := DeployHelmChart(helmMgr, applicationSource, namespace)
 	if err != nil {
 		return err
 	}
@@ -124,36 +119,6 @@ func DeployHelmCharts(kubeConfigFile string, argoApplication argo.Application) e
 	return nil
 }
 
-func GetClient() (klient.Client, error) {
-	cfg := envconf.Config{}
-	return cfg.Client(), nil
-}
-
-func GetRestConfig() *rest.Config {
-	client, _ := GetClient()
-	return client.RESTConfig()
-}
-
-func GetClientSet() (*kubernetes.Clientset, error) {
-	kubeConfig := GetRestConfig()
-	clientSet, err := kubernetes.NewForConfig(kubeConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	return clientSet, nil
-}
-
-func GetDynClient() (*dynamic.DynamicClient, error) {
-	kubeConfig := GetRestConfig()
-	return dynamic.NewForConfig(kubeConfig)
-}
-
-func GetDiscoveryClient() (*discovery.DiscoveryClient, error) {
-	kubeConfig := GetRestConfig()
-	return discovery.NewDiscoveryClientForConfig(kubeConfig)
-}
-
 func CheckJobsCompleted(ctx context.Context, client klient.Client, namespace string) error {
 	kubeConfig := client.RESTConfig()
 	clientSet, err := kubernetes.NewForConfig(kubeConfig)