Revert "Enable receiving a rest config on TestSuite (#348)" (#359)

This reverts commit 769fd23.
kudobuilder · Apr 14, 2022 · 32dba58 · 32dba58
1 parent 769fd23
commit 32dba58
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 30 deletions.
diff --git a/pkg/apis/testharness/v1beta1/test_types.go b/pkg/apis/testharness/v1beta1/test_types.go
@@ -3,7 +3,6 @@ package v1beta1
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/rest"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -68,8 +67,6 @@ type TestSuite struct {
 	Namespace string `json:"namespace"`
 	// Suppress is used to suppress logs
 	Suppress []string `json:"suppress"`
-
-	Config *rest.Config `json:"config,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/test/harness.go b/pkg/test/harness.go
@@ -238,9 +238,6 @@ func (h *Harness) Config() (*rest.Config, error) {
 
 	var err error
 	switch {
-	case h.TestSuite.Config != nil:
-		h.T.Log("running tests with passed rest config.")
-		h.config = h.TestSuite.Config
 	case h.TestSuite.StartControlPlane:
 		h.T.Log("running tests with a mocked control plane (kube-apiserver and etcd).")
 		h.config, err = h.RunTestEnv()

diff --git a/pkg/test/harness_integration_test.go b/pkg/test/harness_integration_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	harness "github.com/kudobuilder/kuttl/pkg/apis/testharness/v1beta1"
-	testutils "github.com/kudobuilder/kuttl/pkg/test/utils"
 )
 
 func TestHarnessRunIntegration(t *testing.T) {
@@ -26,29 +25,6 @@ func TestHarnessRunIntegration(t *testing.T) {
 	harness.Run()
 }
 
-func TestHarnessRunIntegrationWithConfig(t *testing.T) {
-	testenv, err := testutils.StartTestEnvironment(nil, false)
-	if err != nil {
-		t.Fatalf("fatal error starting environment: %s", err)
-	}
-	harness := Harness{
-		TestSuite: harness.TestSuite{
-			TestDirs: []string{
-				"./test_data/",
-			},
-			// set as true to skip service account check
-			StartControlPlane: true,
-			Config:            testenv.Config,
-			CRDDir:            "./test_crds/",
-		},
-		T: t,
-	}
-	harness.Run()
-	if err := testenv.Environment.Stop(); err != nil {
-		t.Log("error tearing down mock control plane", err)
-	}
-}
-
 // This test requires external KinD support to run thus is an integration test
 func TestRunBackgroundCommands(t *testing.T) {
 	h := Harness{