diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 98aa366..8a8b0ad 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -26,6 +26,7 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/dynamic/fake" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" @@ -79,6 +80,8 @@ var _ = BeforeSuite(func() { Expect(err).NotTo(HaveOccurred()) Expect(k8sClient).NotTo(BeNil()) singleton.KubeClient.Set(k8sClient) + fakeDynamicClient := fake.NewSimpleDynamicClient(testScheme) + singleton.DynamicClient.Set(fakeDynamicClient) reconciler = &WorkflowRunReconciler{ Client: k8sClient, diff --git a/pkg/generator/suit_test.go b/pkg/generator/suit_test.go index 67dfce0..5bcf6fa 100644 --- a/pkg/generator/suit_test.go +++ b/pkg/generator/suit_test.go @@ -26,6 +26,7 @@ import ( crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/dynamic/fake" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/utils/pointer" @@ -66,6 +67,8 @@ var _ = BeforeSuite(func(done Done) { Expect(err).ToNot(HaveOccurred()) Expect(k8sClient).ToNot(BeNil()) singleton.KubeClient.Set(k8sClient) + fakeDynamicClient := fake.NewSimpleDynamicClient(scheme) + singleton.DynamicClient.Set(fakeDynamicClient) close(done) }, 60) diff --git a/pkg/providers/compiler.go b/pkg/providers/compiler.go index 676fdac..42a5219 100644 --- a/pkg/providers/compiler.go +++ b/pkg/providers/compiler.go @@ -24,6 +24,7 @@ import ( "github.com/kubevela/pkg/util/runtime" "github.com/kubevela/pkg/util/singleton" kerrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/klog/v2" "github.com/kubevela/workflow/pkg/providers/email" "github.com/kubevela/workflow/pkg/providers/http" @@ -66,7 +67,7 @@ var DefaultCompiler = singleton.NewSingleton[*cuex.Compiler](func() *cuex.Compil c := compiler.Get() if EnableExternalPackageForDefaultCompiler { if err := c.LoadExternalPackages(context.Background()); err != nil && !kerrors.IsNotFound(err) { - // klog.Errorf("failed to load external packages for cuex default compiler: %s", err.Error()) + klog.Errorf("failed to load external packages for cuex default compiler: %s", err.Error()) } } if EnableExternalPackageWatchForDefaultCompiler { diff --git a/pkg/tasks/builtin/step_group_test.go b/pkg/tasks/builtin/step_group_test.go index 0e88375..7c6399f 100644 --- a/pkg/tasks/builtin/step_group_test.go +++ b/pkg/tasks/builtin/step_group_test.go @@ -10,10 +10,13 @@ import ( "sigs.k8s.io/yaml" monitorContext "github.com/kubevela/pkg/monitor/context" + "github.com/kubevela/pkg/util/singleton" "github.com/kubevela/workflow/api/v1alpha1" wfContext "github.com/kubevela/workflow/pkg/context" "github.com/kubevela/workflow/pkg/types" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/dynamic/fake" ) type testEngine struct { @@ -207,6 +210,9 @@ func newWorkflowContextForTest(t *testing.T) wfContext.Context { err = json.Unmarshal(testCaseJson, &cm) r.NoError(err) + fakeDynamicClient := fake.NewSimpleDynamicClient(runtime.NewScheme()) + singleton.DynamicClient.Set(fakeDynamicClient) + wfCtx := new(wfContext.WorkflowContext) err = wfCtx.LoadFromConfigMap(context.Background(), cm) r.NoError(err) diff --git a/pkg/tasks/custom/task_test.go b/pkg/tasks/custom/task_test.go index 55b0d4a..11c0ef0 100644 --- a/pkg/tasks/custom/task_test.go +++ b/pkg/tasks/custom/task_test.go @@ -29,6 +29,7 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/dynamic/fake" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" @@ -652,6 +653,8 @@ func newWorkflowContextForTest(t *testing.T) wfContext.Context { }, } singleton.KubeClient.Set(cli) + fakeDynamicClient := fake.NewSimpleDynamicClient(runtime.NewScheme()) + singleton.DynamicClient.Set(fakeDynamicClient) wfCtx, err := wfContext.NewContext(context.Background(), "default", "app-v1", nil) r.NoError(err) cuectx := cuecontext.New()