From 968f449bf06f29abee22650e642389058aa44ad6 Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Fri, 22 Mar 2024 11:45:48 +0100 Subject: [PATCH] Test disabling the monitor to see if watch errors dissappear --- test/pkg/environment/common/environment.go | 4 +++- test/pkg/environment/common/setup.go | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/pkg/environment/common/environment.go b/test/pkg/environment/common/environment.go index 5dd61b00898a..22ee9013eb91 100644 --- a/test/pkg/environment/common/environment.go +++ b/test/pkg/environment/common/environment.go @@ -36,10 +36,10 @@ import ( controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - coreapis "sigs.k8s.io/karpenter/pkg/apis" corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1beta1" "sigs.k8s.io/karpenter/pkg/operator" + operatorlogging "sigs.k8s.io/karpenter/pkg/operator/logging" coretest "sigs.k8s.io/karpenter/pkg/test" "github.com/aws/karpenter-provider-aws/pkg/apis" @@ -70,6 +70,8 @@ func NewEnvironment(t *testing.T) *Environment { config := NewConfig() client := NewClient(ctx, config) + operatorlogging.ConfigureGlobalLoggers(ctx) + lo.Must0(os.Setenv(system.NamespaceEnvKey, "kube-system")) if val, ok := os.LookupEnv("GIT_REF"); ok { ctx = context.WithValue(ctx, GitRefContextKey, val) diff --git a/test/pkg/environment/common/setup.go b/test/pkg/environment/common/setup.go index cc233cc561ce..d5838b0f2b57 100644 --- a/test/pkg/environment/common/setup.go +++ b/test/pkg/environment/common/setup.go @@ -35,11 +35,10 @@ import ( "sigs.k8s.io/karpenter/pkg/test" "sigs.k8s.io/karpenter/pkg/utils/pod" - "github.com/aws/karpenter-provider-aws/pkg/apis/v1beta1" - "github.com/aws/karpenter-provider-aws/test/pkg/debug" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/aws/karpenter-provider-aws/pkg/apis/v1beta1" ) const TestingFinalizer = "testing/finalizer" @@ -63,8 +62,6 @@ var ( // nolint:gocyclo func (env *Environment) BeforeEach() { - debug.BeforeEach(env.Context, env.Config, env.Client) - // Expect this cluster to be clean for test runs to execute successfully env.ExpectCleanCluster() @@ -104,7 +101,6 @@ func (env *Environment) Cleanup() { } func (env *Environment) AfterEach() { - debug.AfterEach(env.Context) env.printControllerLogs(&v1.PodLogOptions{Container: "controller"}) }