test: configurable cluster name

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

e2e/common/cluster.go

@@ -47,8 +47,8 @@ type PrintLogConfig struct {
 	Limit      int
 }
 
-func WithCluster(t *testing.T, fn func(*testing.T, Cluster), beforeCleanup func(*testing.T, Cluster) error, opts ...cluster.Option) {
-	cluster, err := GetTestCluster(defaultClusterName, opts...)
+func WithCluster(name string, t *testing.T, fn func(*testing.T, Cluster), beforeCleanup func(*testing.T, Cluster) error, opts ...cluster.Option) {
+	cluster, err := GetTestCluster(name, opts...)
 	require.NoError(t, err)
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -60,7 +60,7 @@ func WithCluster(t *testing.T, fn func(*testing.T, Cluster), beforeCleanup func(
 		assert.NoError(t, beforeCleanup(t, cluster))
 		assert.NoError(t, cluster.Cleanup())
 		cancel()
-		require.NoError(t, DeleteTestCluster(defaultClusterName))
+		require.NoError(t, DeleteTestCluster(name))
 	}()
 
 	fn(t, cluster)

e2e/syslog-ng-aggregator/syslog_ng_aggregator_test.go

@@ -64,8 +64,8 @@ func init() {
 }
 
 func TestSyslogNGIsRunningAndForwardingLogs(t *testing.T) {
-	ns := "syslog-ng-1"
-	common.WithCluster(t, func(t *testing.T, c common.Cluster) {
+	ns := "default"
+	common.WithCluster("syslog-ng-1", t, func(t *testing.T, c common.Cluster) {
 		setup.LoggingOperator(t, c, setup.LoggingOperatorOptionFunc(func(options *setup.LoggingOperatorOptions) {
 			options.Config.DisableWebhook = true
 			options.Config.Namespace = ns

e2e/volumedrain/volumedrain_test.go

@@ -63,7 +63,7 @@ func init() {
 
 func TestVolumeDrain_Downscale(t *testing.T) {
 	ns := "testing-1"
-	common.WithCluster(t, func(t *testing.T, c common.Cluster) {
+	common.WithCluster("drain", t, func(t *testing.T, c common.Cluster) {
 		setup.LoggingOperator(t, c, setup.LoggingOperatorOptionFunc(func(options *setup.LoggingOperatorOptions) {
 			options.Config.DisableWebhook = true
 			options.Config.Namespace = ns
@@ -223,7 +223,7 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 
 func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 	ns := "testing-2"
-	common.WithCluster(t, func(t *testing.T, c common.Cluster) {
+	common.WithCluster("drain", t, func(t *testing.T, c common.Cluster) {
 		setup.LoggingOperator(t, c, setup.LoggingOperatorOptionFunc(func(options *setup.LoggingOperatorOptions) {
 			options.Config.DisableWebhook = true
 			options.Config.Namespace = ns