Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions test/e2e/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ import (

configv1 "github.com/openshift/api/config/v1"
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
"go.uber.org/zap/zapcore"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

"github.com/rhobs/observability-operator/pkg/operator"
"github.com/rhobs/observability-operator/test/e2e/framework"
Expand All @@ -33,6 +36,13 @@ var (
func TestMain(m *testing.M) {
flag.Parse()

// Setup controller-runtime logger to avoid warning messages
opts := zap.Options{
Development: true,
TimeEncoder: zapcore.RFC3339TimeEncoder,
}
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))

// Deferred calls are not executed on os.Exit from TestMain.
// As a workaround, we call another function in which we can add deferred calls.
// http://blog.englund.nu/golang,/testing/2017/03/12/using-defer-in-testmain.html
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/traces_minio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
value: tempo
- name: MINIO_SECRET_KEY
value: supersecret
image: minio/minio
image: quay.io/minio/minio:RELEASE.2024-10-02T17-50-41Z
name: minio
ports:
- containerPort: 9000
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/traces_tempo_readiness.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
restartPolicy: Never
containers:
- name: readiness-checker
image: curlimages/curl:latest
image: ghcr.io/grafana/tempo-operator/test-utils:main
command:
- /bin/sh
- -c
Expand Down