Refactor testrunner to use controller-runtime client

Gopkg.toml

@@ -10,7 +10,7 @@ required = [
 
 [[constraint]]
   name = "github.com/gardener/gardener"
-  version = "^0.17.0"
+  version = "^0.19.0"
 
 [[override]]
   name = "github.com/gardener/machine-controller-manager"

cmd/testrunner/cmd/runtemplate/run_template.go

@@ -18,6 +18,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/gardener/gardener/pkg/client/kubernetes"
+	"github.com/gardener/test-infra/pkg/testmachinery"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/gardener/test-infra/pkg/testrunner"
 	"github.com/gardener/test-infra/pkg/testrunner/result"
 	testrunnerTemplate "github.com/gardener/test-infra/pkg/testrunner/template"
@@ -87,12 +91,19 @@ var runCmd = &cobra.Command{
 			log.Debugf("Error loading .env file: %s", err.Error())
 		}
 
+		tmClient, err := kubernetes.NewClientFromFile("", tmKubeconfigPath, client.Options{
+			Scheme: testmachinery.TestMachineryScheme,
+		})
+		if err != nil {
+			log.Fatalf("Cannot build kubernetes client from %s: %s", tmKubeconfigPath, err.Error())
+		}
+
 		testrunName := fmt.Sprintf("%s-%s-", testrunNamePrefix, cloudprovider)
 		config := &testrunner.Config{
-			TmKubeconfigPath: tmKubeconfigPath,
-			Namespace:        namespace,
-			Timeout:          timeout,
-			Interval:         interval,
+			TmClient:  tmClient,
+			Namespace: namespace,
+			Timeout:   timeout,
+			Interval:  interval,
 		}
 
 		rsConfig := &result.Config{
@@ -129,13 +140,13 @@ var runCmd = &cobra.Command{
 			CloudProvider:     parameters.Cloudprovider,
 			KubernetesVersion: parameters.K8sVersion,
 		}
-		testruns, err := testrunnerTemplate.Render(config.TmKubeconfigPath, parameters, metadata)
+		testruns, err := testrunnerTemplate.Render(tmClient, parameters, metadata)
 		if err != nil {
 			log.Fatal(err)
 		}
 
 		finishedTestruns, err := testrunner.Run(config, testruns, testrunName)
-		failed, err := result.Collect(rsConfig, config.TmKubeconfigPath, config.Namespace, finishedTestruns, metadata)
+		failed, err := result.Collect(rsConfig, tmClient, config.Namespace, finishedTestruns, metadata)
 		if err != nil {
 			log.Fatal(err)
 		}

cmd/testrunner/cmd/runtestrun/run_testrun.go

@@ -17,6 +17,10 @@ package runtestrun
 import (
 	"fmt"
 
+	"github.com/gardener/gardener/pkg/client/kubernetes"
+	"github.com/gardener/test-infra/pkg/testmachinery"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/gardener/test-infra/pkg/util"
 	"github.com/joho/godotenv"
 
@@ -64,11 +68,18 @@ var runTestrunCmd = &cobra.Command{
 			log.Debugf("Error loading .env file: %s", err.Error())
 		}
 
+		tmClient, err := kubernetes.NewClientFromFile("", tmKubeconfigPath, client.Options{
+			Scheme: testmachinery.TestMachineryScheme,
+		})
+		if err != nil {
+			log.Fatalf("Cannot build kubernetes client from %s: %s", tmKubeconfigPath, err.Error())
+		}
+
 		config := &testrunner.Config{
-			TmKubeconfigPath: tmKubeconfigPath,
-			Namespace:        namespace,
-			Timeout:          timeout,
-			Interval:         interval,
+			TmClient:  tmClient,
+			Namespace: namespace,
+			Timeout:   timeout,
+			Interval:  interval,
 		}
 
 		tr, err := util.ParseTestrunFromFile(testrunPath)

pkg/testmachinery/types.go

@@ -14,6 +14,14 @@
 
 package testmachinery
 
+import (
+	argoscheme "github.com/argoproj/argo/pkg/client/clientset/versioned/scheme"
+	tmscheme "github.com/gardener/test-infra/pkg/client/testmachinery/clientset/versioned/scheme"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	corescheme "k8s.io/client-go/kubernetes/scheme"
+)
+
 const (
 	// TM_KUBECONFIG_PATH is the path where kubeconfigs are mounted to tests.
 	TM_KUBECONFIG_PATH = "/tmp/env/kubeconfig"
@@ -82,3 +90,16 @@ type TechnicalUser struct {
 	Password  string `yaml:"password"`
 	AuthToken string `yaml:"authToken"`
 }
+
+// TestMachineryScheme is the scheme used in the testmachinery and testrunner.
+var TestMachineryScheme = runtime.NewScheme()
+
+func init() {
+	testmachinerySchemeBuilder := runtime.NewSchemeBuilder(
+		corescheme.AddToScheme,
+		tmscheme.AddToScheme,
+		argoscheme.AddToScheme,
+	)
+
+	utilruntime.Must(testmachinerySchemeBuilder.AddToScheme(TestMachineryScheme))
+}

pkg/testrunner/result/collect.go

@@ -17,17 +17,18 @@ package result
 import (
 	"fmt"
 
+	"github.com/gardener/gardener/pkg/client/kubernetes"
 	tmv1beta1 "github.com/gardener/test-infra/pkg/apis/testmachinery/v1beta1"
 	"github.com/gardener/test-infra/pkg/util"
 	log "github.com/sirupsen/logrus"
 )
 
 // Collect collects results of all testruns and write them to a file.
 // It returns wheter there are failed testruns or not.
-func Collect(config *Config, tmKubeconfigPath, namespace string, testruns []*tmv1beta1.Testrun, metadata *Metadata) (bool, error) {
+func Collect(config *Config, tmClient kubernetes.Interface, namespace string, testruns []*tmv1beta1.Testrun, metadata *Metadata) (bool, error) {
 	testrunsFailed := false
 	for _, tr := range testruns {
-		err := Output(config, tmKubeconfigPath, namespace, tr, metadata)
+		err := Output(config, tmClient, namespace, tr, metadata)
 		if err != nil {
 			return false, err
 		}
@@ -36,7 +37,7 @@ func Collect(config *Config, tmKubeconfigPath, namespace string, testruns []*tmv
 		if err != nil {
 			log.Errorf("Cannot persist file %s: %s", config.OutputFile, err.Error())
 		} else {
-			err := MarkTestrunsAsIngested(tmKubeconfigPath, testruns)
+			err := MarkTestrunsAsIngested(tmClient, testruns)
 			if err != nil {
 				log.Warn(err.Error())
 			}

pkg/testrunner/result/ingest.go

@@ -15,14 +15,14 @@
 package result
 
 import (
-	"fmt"
+	"context"
 	"os"
 	"os/exec"
 
+	"github.com/gardener/gardener/pkg/client/kubernetes"
+
 	tmv1beta1 "github.com/gardener/test-infra/pkg/apis/testmachinery/v1beta1"
-	tmclientset "github.com/gardener/test-infra/pkg/client/testmachinery/clientset/versioned"
 	log "github.com/sirupsen/logrus"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 const (
@@ -46,18 +46,12 @@ func IngestFile(file, esCfgName string) error {
 }
 
 // MarkTestrunsAsIngested sets the ingest status of testruns to true
-func MarkTestrunsAsIngested(tmKubeconfigPath string, testruns []*tmv1beta1.Testrun) error {
-	tmConfig, err := clientcmd.BuildConfigFromFlags("", tmKubeconfigPath)
-	if err != nil {
-		return fmt.Errorf("Cannot build kubernetes client from %s: %s", tmKubeconfigPath, err.Error())
-	}
-	tmClient, err := tmclientset.NewForConfig(tmConfig)
-	if err != nil {
-		return fmt.Errorf("Canno build testmachinery kubernetes client: %s", err.Error())
-	}
+func MarkTestrunsAsIngested(tmClient kubernetes.Interface, testruns []*tmv1beta1.Testrun) error {
+	ctx := context.Background()
+	defer ctx.Done()
 	for _, tr := range testruns {
 		tr.Status.Ingested = true
-		_, err := tmClient.Testmachinery().Testruns(tr.Namespace).UpdateStatus(tr)
+		err := tmClient.Client().Update(ctx, tr)
 		if err != nil {
 			log.Errorf("Cannot update status off testrun %s in namespace %s: %s", tr.Name, tr.Namespace, err.Error())
 			continue

pkg/testrunner/result/output.go

@@ -18,6 +18,7 @@ import (
 	"archive/tar"
 	"bytes"
 	"compress/gzip"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -33,10 +34,11 @@ import (
 	tmv1beta1 "github.com/gardener/test-infra/pkg/apis/testmachinery/v1beta1"
 	minio "github.com/minio/minio-go"
 	log "github.com/sirupsen/logrus"
+	corev1 "k8s.io/api/core/v1"
 )
 
 // Output takes a completed testrun status and writes the results to elastic search bulk json file.
-func Output(config *Config, tmKubeconfigPath, namespace string, tr *tmv1beta1.Testrun, metadata *Metadata) error {
+func Output(config *Config, tmClient kubernetes.Interface, namespace string, tr *tmv1beta1.Testrun, metadata *Metadata) error {
 	if config.OutputFile == "" {
 		return nil
 	}
@@ -58,7 +60,7 @@ func Output(config *Config, tmKubeconfigPath, namespace string, tr *tmv1beta1.Te
 		return err
 	}
 
-	osConfig, err := getOSConfig(tmKubeconfigPath, namespace, config.S3Endpoint, config.S3SSL)
+	osConfig, err := getOSConfig(tmClient, namespace, config.S3Endpoint, config.S3SSL)
 	if err != nil {
 		log.Warnf("Cannot get exported Test results of steps: %s", err.Error())
 	} else {
@@ -225,16 +227,17 @@ func writeToFile(fielPath string, data []byte) error {
 	return nil
 }
 
-func getOSConfig(tmKubeconfigPath, namespace, minioEndpoint string, ssl bool) (*testmachinery.ObjectStoreConfig, error) {
-	clusterClient, err := kubernetes.NewClientFromFile(tmKubeconfigPath, nil, client.Options{})
-	if err != nil {
-		return nil, fmt.Errorf("Cannot create client for %s: %s", tmKubeconfigPath, err.Error())
-	}
-	minioConfig, err := clusterClient.GetConfigMap(namespace, "tm-config")
+func getOSConfig(tmClient kubernetes.Interface, namespace, minioEndpoint string, ssl bool) (*testmachinery.ObjectStoreConfig, error) {
+	ctx := context.Background()
+	defer ctx.Done()
+
+	minioConfig := &corev1.ConfigMap{}
+	err := tmClient.Client().Get(ctx, client.ObjectKey{Namespace: namespace, Name: "tm-config"}, minioConfig)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot get ConfigMap 'tm-config': %s", err.Error())
 	}
-	minioSecrets, err := clusterClient.GetSecret(namespace, minioConfig.Data["objectstore.secretName"])
+	minioSecrets := &corev1.Secret{}
+	err = tmClient.Client().Get(ctx, client.ObjectKey{Namespace: namespace, Name: minioConfig.Data["objectstore.secretName"]}, minioSecrets)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot get Secret '%s': %s", minioConfig.Data["objectstore.secretName"], err.Error())
 	}

pkg/testrunner/run.go

@@ -15,23 +15,28 @@
 package testrunner
 
 import (
+	"context"
 	"fmt"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/gardener/gardener/pkg/client/kubernetes"
+
 	tmv1beta1 "github.com/gardener/test-infra/pkg/apis/testmachinery/v1beta1"
-	tmclientset "github.com/gardener/test-infra/pkg/client/testmachinery/clientset/versioned"
 	"github.com/gardener/test-infra/pkg/util"
 	log "github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
-func runTestrun(tmClient *tmclientset.Clientset, tr *tmv1beta1.Testrun, namespace, name string) (*tmv1beta1.Testrun, error) {
+func runTestrun(tmClient kubernetes.Interface, tr *tmv1beta1.Testrun, namespace, name string) (*tmv1beta1.Testrun, error) {
+	ctx := context.Background()
+	defer ctx.Done()
 	// TODO: Remove legacy name attribute. Instead enforce usage of generateName.
 	tr.Name = ""
 	tr.GenerateName = name
 	tr.Namespace = namespace
-	tr, err := tmClient.Testmachinery().Testruns(namespace).Create(tr)
+	err := tmClient.Client().Create(ctx, tr)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot create testrun: %s", err.Error())
 	}
@@ -41,7 +46,7 @@ func runTestrun(tmClient *tmclientset.Clientset, tr *tmv1beta1.Testrun, namespac
 	interval := time.Duration(pollIntervalSeconds) * time.Second
 	timeout := time.Duration(maxWaitTimeSeconds) * time.Second
 	err = wait.PollImmediate(interval, timeout, func() (bool, error) {
-		tr, err = tmClient.Testmachinery().Testruns(namespace).Get(tr.Name, metav1.GetOptions{})
+		err := tmClient.Client().Get(ctx, client.ObjectKey{Namespace: namespace, Name: tr.Name}, tr)
 		if err != nil {
 			log.Errorf("Cannot get testrun: %s", err.Error())
 		}