test: fix kind image in go tests, improve test debug

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

Author: pepov

Makefile

@@ -35,7 +35,7 @@ GOLANGCI_LINT_VERSION := v1.51.2
 
 KIND := ${BIN}/kind
 KIND_VERSION := v0.19.0
-KIND_IMAGE := v1.23.17@sha256:f77f8cf0b30430ca4128cc7cfafece0c274a118cd0cdb251049664ace0dee4ff
+KIND_IMAGE := kindest/node:v1.23.17@sha256:f77f8cf0b30430ca4128cc7cfafece0c274a118cd0cdb251049664ace0dee4ff
 
 KUBEBUILDER := ${BIN}/kubebuilder
 KUBEBUILDER_VERSION = v3.1.0

e2e/common/cluster.go

@@ -25,7 +25,6 @@ import (
 	"emperror.dev/errors"
 	"github.com/spf13/cast"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
@@ -49,18 +48,18 @@ type PrintLogConfig struct {
 
 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)
+	RequireNoError(t, err)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	go func() {
-		require.NoError(t, cluster.Start(ctx))
+		RequireNoError(t, cluster.Start(ctx))
 	}()
 
 	defer func() {
 		assert.NoError(t, beforeCleanup(t, cluster))
 		assert.NoError(t, cluster.Cleanup())
 		cancel()
-		require.NoError(t, DeleteTestCluster(name))
+		RequireNoError(t, DeleteTestCluster(name))
 	}()
 
 	fn(t, cluster)

e2e/common/helpers.go

@@ -0,0 +1,30 @@
+// Copyright © 2023 Kube logging authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"fmt"
+	"testing"
+
+	"emperror.dev/errors"
+	"github.com/stretchr/testify/assert"
+)
+
+func RequireNoError(t *testing.T, err error) {
+	if err != nil {
+		assert.Fail(t, fmt.Sprintf("Received unexpected error:\n%#v %+v", err, errors.GetDetails(err)))
+		t.FailNow()
+	}
+}

e2e/common/kind/commands.go

@@ -39,7 +39,12 @@ func CreateCluster(options CreateClusterOptions) error {
 		options.Image = KindImage
 	}
 	args = options.AppendToArgs(args)
-	_, err := exec.Command(KindPath, args...).Output()
+	cmd := exec.Command(KindPath, args...)
+	cmd.Stderr = os.Stderr
+	o, err := cmd.Output()
+	if err != nil {
+		fmt.Println(o)
+	}
 	return err
 }
 

e2e/common/setup/logconsumer.go

@@ -24,6 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/kube-logging/logging-operator/e2e/common"
 	"github.com/kube-logging/logging-operator/e2e/common/cond"
 )
 
@@ -142,8 +143,8 @@ func LogConsumer(t *testing.T, c client.Client, opts ...LogConsumerOption) LogCo
 		},
 	}
 	ctx := context.Background()
-	require.NoError(t, c.Create(ctx, &logConsumerPod))
-	require.NoError(t, c.Create(ctx, &logConsumerSvc))
+	common.RequireNoError(t, c.Create(ctx, &logConsumerPod))
+	common.RequireNoError(t, c.Create(ctx, &logConsumerSvc))
 	require.Eventually(t, cond.PodShouldBeRunning(t, c, client.ObjectKeyFromObject(&logConsumerPod)), 5*time.Minute, 5*time.Second)
 	return LogConsumerResult{
 		PodKey:     client.ObjectKeyFromObject(&logConsumerPod),

e2e/common/setup/loggingoperator.go

@@ -25,11 +25,12 @@ import (
 	"github.com/cisco-open/operator-tools/pkg/utils"
 	"github.com/go-logr/logr"
 	logrtesting "github.com/go-logr/logr/testing"
-	"github.com/kube-logging/logging-operator/pkg/sdk/resourcebuilder"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/kube-logging/logging-operator/pkg/sdk/resourcebuilder"
+
 	"github.com/kube-logging/logging-operator/e2e/common"
 )
 
@@ -50,7 +51,7 @@ func LoggingOperator(t *testing.T, c common.Cluster, opts ...LoggingOperatorOpti
 	}
 
 	if img := os.Getenv("LOGGING_OPERATOR_IMAGE"); img != "" {
-		require.NoError(t, c.LoadImages(img))
+		common.RequireNoError(t, c.LoadImages(img))
 
 		if options.Config.ContainerOverrides == nil {
 			options.Config.ContainerOverrides = new(types.ContainerBase)
@@ -69,9 +70,9 @@ func LoggingOperator(t *testing.T, c common.Cluster, opts ...LoggingOperatorOpti
 	})
 	for _, rb := range resourceBuilders {
 		obj, ds, err := rb()
-		require.NoError(t, err)
+		common.RequireNoError(t, err)
 		res, err := reconciler.ReconcileResource(obj, ds)
-		require.NoError(t, err)
+		common.RequireNoError(t, err)
 		require.Nil(t, res)
 	}
 

e2e/common/setup/logproducer.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/kube-logging/logging-operator/e2e/common"
 	"github.com/kube-logging/logging-operator/e2e/common/cond"
 )
 
@@ -75,7 +76,7 @@ func LogProducer(t *testing.T, c client.Client, opts ...LogProducerOption) {
 			},
 		},
 	}
-	require.NoError(t, c.Create(context.Background(), &logProducerDeployment))
+	common.RequireNoError(t, c.Create(context.Background(), &logProducerDeployment))
 	require.Eventually(t, cond.AnyPodShouldBeRunning(t, c, client.MatchingLabels(lbls)), 2*time.Minute, 5*time.Second)
 }
 

e2e/syslog-ng-aggregator/syslog_ng_aggregator_test.go

@@ -117,7 +117,7 @@ func TestSyslogNGIsRunningAndForwardingLogs(t *testing.T) {
 				},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &logging))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &logging))
 		output := v1beta1.SyslogNGOutput{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-output",
@@ -134,7 +134,7 @@ func TestSyslogNGIsRunningAndForwardingLogs(t *testing.T) {
 				},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &output))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &output))
 		flow := v1beta1.SyslogNGFlow{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-flow",
@@ -151,7 +151,7 @@ func TestSyslogNGIsRunningAndForwardingLogs(t *testing.T) {
 				LocalOutputRefs: []string{output.Name},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &flow))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &flow))
 
 		meta := logging.SyslogNGObjectMeta(syslogng.StatefulSetName, syslogng.ComponentSyslogNG)
 		aggergatorPodName := meta.Name + "-0"
@@ -186,11 +186,11 @@ func TestSyslogNGIsRunningAndForwardingLogs(t *testing.T) {
 		if o.Scheme == nil {
 			o.Scheme = runtime.NewScheme()
 		}
-		require.NoError(t, v1beta1.AddToScheme(o.Scheme))
-		require.NoError(t, apiextensionsv1.AddToScheme(o.Scheme))
-		require.NoError(t, appsv1.AddToScheme(o.Scheme))
-		require.NoError(t, batchv1.AddToScheme(o.Scheme))
-		require.NoError(t, corev1.AddToScheme(o.Scheme))
-		require.NoError(t, rbacv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, v1beta1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, apiextensionsv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, appsv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, batchv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, corev1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, rbacv1.AddToScheme(o.Scheme))
 	})
 }

e2e/volumedrain/volumedrain_test.go

@@ -109,7 +109,7 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 				},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &logging))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &logging))
 		tags := "time"
 		output := v1beta1.Output{
 			ObjectMeta: metav1.ObjectMeta{
@@ -128,7 +128,7 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 				},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &output))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &output))
 		flow := v1beta1.Flow{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-flow",
@@ -147,7 +147,7 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 				LocalOutputRefs: []string{output.Name},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &flow))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &flow))
 
 		fluentdReplicaName := logging.Name + "-fluentd-1"
 		require.Eventually(t, cond.PodShouldBeRunning(t, c.GetClient(), client.ObjectKey{Namespace: ns, Name: fluentdReplicaName}), 5*time.Minute, 5*time.Second)
@@ -169,7 +169,7 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 		}, 5*time.Minute, 2*time.Second)
 
 		cmd := common.CmdEnv(exec.Command("kubectl", "-n", consumer.PodKey.Namespace, "exec", consumer.PodKey.Name, "--", "curl", "-sS", "http://localhost:8082/off"), c)
-		require.NoError(t, cmd.Run())
+		common.RequireNoError(t, cmd.Run())
 
 		require.Eventually(t, func() bool {
 			cmd := common.CmdEnv(exec.Command("kubectl", "-n", ns, "exec", fluentdReplicaName, "-c", "fluentd", "--", "ls", "-1", "/buffers"), c)
@@ -183,7 +183,7 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 
 		patch := client.MergeFrom(logging.DeepCopy())
 		logging.Spec.FluentdSpec.Scaling.Replicas = 1
-		require.NoError(t, c.GetClient().Patch(ctx, &logging, patch))
+		common.RequireNoError(t, c.GetClient().Patch(ctx, &logging, patch))
 
 		drainerJobName := fluentdReplicaName + "-drainer"
 		require.Eventually(t, func() bool {
@@ -195,14 +195,14 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 		require.Eventually(t, cond.PodShouldBeRunning(t, c.GetClient(), client.ObjectKey{Namespace: ns, Name: fluentdReplicaName}), 30*time.Second, time.Second/2)
 
 		cmd = common.CmdEnv(exec.Command("kubectl", "-n", consumer.PodKey.Namespace, "exec", consumer.PodKey.Name, "--", "curl", "-sS", "http://localhost:8082/on"), c)
-		require.NoError(t, cmd.Run())
+		common.RequireNoError(t, cmd.Run())
 
 		require.Eventually(t, cond.ResourceShouldBeAbsent(t, c.GetClient(), common.Resource(new(batchv1.Job), ns, drainerJobName)), 5*time.Minute, 30*time.Second)
 
 		require.Eventually(t, cond.ResourceShouldBeAbsent(t, c.GetClient(), common.Resource(new(corev1.Pod), ns, fluentdReplicaName)), 30*time.Second, time.Second/2)
 
 		pvc := common.Resource(new(corev1.PersistentVolumeClaim), ns, logging.Name+"-fluentd-buffer-"+fluentdReplicaName)
-		require.NoError(t, c.GetClient().Get(ctx, client.ObjectKeyFromObject(pvc), pvc))
+		common.RequireNoError(t, c.GetClient().Get(ctx, client.ObjectKeyFromObject(pvc), pvc))
 		assert.Equal(t, "drained", pvc.GetLabels()["logging.banzaicloud.io/drain-status"])
 	}, func(t *testing.T, c common.Cluster) error {
 		path := filepath.Join(TestTempDir, fmt.Sprintf("cluster-%s.log", t.Name()))
@@ -216,12 +216,12 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 		if o.Scheme == nil {
 			o.Scheme = runtime.NewScheme()
 		}
-		require.NoError(t, v1beta1.AddToScheme(o.Scheme))
-		require.NoError(t, apiextensionsv1.AddToScheme(o.Scheme))
-		require.NoError(t, appsv1.AddToScheme(o.Scheme))
-		require.NoError(t, batchv1.AddToScheme(o.Scheme))
-		require.NoError(t, corev1.AddToScheme(o.Scheme))
-		require.NoError(t, rbacv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, v1beta1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, apiextensionsv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, appsv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, batchv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, corev1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, rbacv1.AddToScheme(o.Scheme))
 	})
 }
 
@@ -274,7 +274,7 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 				},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &logging))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &logging))
 		tags := "time"
 		output := v1beta1.Output{
 			ObjectMeta: metav1.ObjectMeta{
@@ -293,7 +293,7 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 				},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &output))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &output))
 		flow := v1beta1.Flow{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-flow",
@@ -312,7 +312,7 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 				LocalOutputRefs: []string{output.Name},
 			},
 		}
-		require.NoError(t, c.GetClient().Create(ctx, &flow))
+		common.RequireNoError(t, c.GetClient().Create(ctx, &flow))
 
 		fluentdReplicaName := logging.Name + "-fluentd-1"
 		require.Eventually(t, cond.PodShouldBeRunning(t, c.GetClient(), client.ObjectKey{Namespace: ns, Name: fluentdReplicaName}), 2*time.Minute, 5*time.Second)
@@ -334,7 +334,7 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 		}, 5*time.Minute, 2*time.Second)
 
 		cmd := common.CmdEnv(exec.Command("kubectl", "-n", consumer.PodKey.Namespace, "exec", consumer.PodKey.Name, "--", "curl", "-sS", "http://localhost:8082/off"), c)
-		require.NoError(t, cmd.Run())
+		common.RequireNoError(t, cmd.Run())
 
 		require.Eventually(t, func() bool {
 			cmd := common.CmdEnv(exec.Command("kubectl", "-n", ns, "exec", fluentdReplicaName, "-c", "fluentd", "--", "ls", "-1", "/buffers"), c)
@@ -348,7 +348,7 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 
 		patch := client.MergeFrom(logging.DeepCopy())
 		logging.Spec.FluentdSpec.Scaling.Replicas = 1
-		require.NoError(t, c.GetClient().Patch(ctx, &logging, patch))
+		common.RequireNoError(t, c.GetClient().Patch(ctx, &logging, patch))
 
 		drainerJobName := fluentdReplicaName + "-drainer"
 		require.Eventually(t, func() bool {
@@ -360,7 +360,7 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 		require.Eventually(t, cond.PodShouldBeRunning(t, c.GetClient(), client.ObjectKey{Namespace: ns, Name: fluentdReplicaName}), 30*time.Second, time.Second/2)
 
 		cmd = common.CmdEnv(exec.Command("kubectl", "-n", consumer.PodKey.Namespace, "exec", consumer.PodKey.Name, "--", "curl", "-sS", "http://localhost:8082/on"), c)
-		require.NoError(t, cmd.Run())
+		common.RequireNoError(t, cmd.Run())
 
 		require.Eventually(t, cond.ResourceShouldBeAbsent(t, c.GetClient(), common.Resource(new(batchv1.Job), ns, drainerJobName)), 5*time.Minute, 30*time.Second)
 
@@ -379,11 +379,11 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 		if o.Scheme == nil {
 			o.Scheme = runtime.NewScheme()
 		}
-		require.NoError(t, v1beta1.AddToScheme(o.Scheme))
-		require.NoError(t, apiextensionsv1.AddToScheme(o.Scheme))
-		require.NoError(t, appsv1.AddToScheme(o.Scheme))
-		require.NoError(t, batchv1.AddToScheme(o.Scheme))
-		require.NoError(t, corev1.AddToScheme(o.Scheme))
-		require.NoError(t, rbacv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, v1beta1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, apiextensionsv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, appsv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, batchv1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, corev1.AddToScheme(o.Scheme))
+		common.RequireNoError(t, rbacv1.AddToScheme(o.Scheme))
 	})
 }