Use correct k8 client (flyteorg#563)

* Use correct k8 client Signed-off-by: Sonja Ericsson <[email protected]> * Use correct k8 client Signed-off-by: Sonja Ericsson <[email protected]> --------- Signed-off-by: Sonja Ericsson <[email protected]>
eapolinario · May 18, 2023 · a1aefb0 · a1aefb0
1 parent b461ba5
commit a1aefb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager.go
@@ -543,7 +543,7 @@ func NewPluginManager(ctx context.Context, iCtx pluginsCore.SetupContext, entry
 		return false
 	}
 
-	if err := src.InjectCache(iCtx.KubeClient().GetCache()); err != nil {
+	if err := src.InjectCache(kubeClient.GetCache()); err != nil {
 		logger.Errorf(ctx, "failed to set informers for ObjectType %s", src.String())
 		return nil, err
 	}
@@ -624,7 +624,7 @@ func NewPluginManager(ctx context.Context, iCtx pluginsCore.SetupContext, entry
 	if err != nil {
 		return nil, err
 	}
-	sharedInformer, err := getPluginSharedInformer(ctx, iCtx, entry.ResourceToWatch)
+	sharedInformer, err := getPluginSharedInformer(ctx, kubeClient, entry.ResourceToWatch)
 	if err != nil {
 		return nil, err
 	}
@@ -650,8 +650,8 @@ func getPluginGvk(resourceToWatch runtime.Object) (schema.GroupVersionKind, erro
 	return kinds[0], nil
 }
 
-func getPluginSharedInformer(ctx context.Context, iCtx pluginsCore.SetupContext, resourceToWatch client.Object) (cache.SharedIndexInformer, error) {
-	i, err := iCtx.KubeClient().GetCache().GetInformer(ctx, resourceToWatch)
+func getPluginSharedInformer(ctx context.Context, kubeClient pluginsCore.KubeClient, resourceToWatch client.Object) (cache.SharedIndexInformer, error) {
+	i, err := kubeClient.GetCache().GetInformer(ctx, resourceToWatch)
 	if err != nil {
 		return nil, errors.Wrapf(errors.PluginInitializationFailed, err, "Error getting informer for %s", reflect.TypeOf(i))
 	}

diff --git a/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager_test.go b/flytepropeller/pkg/controller/nodes/task/k8s/plugin_manager_test.go
@@ -876,6 +876,7 @@ func TestPluginManager_CustomKubeClient(t *testing.T) {
 	mockResourceHandler.On("BuildResource", mock.Anything, tctx).Return(&v1.Pod{}, nil)
 	fakeClient := fake.NewClientBuilder().Build()
 	newFakeClient := &pluginsCoreMock.KubeClient{}
+	newFakeClient.On("GetCache").Return(&mocks.FakeInformers{})
 	pluginManager, err := NewPluginManager(ctx, dummySetupContext(fakeClient), k8s.PluginEntry{
 		ID:              "x",
 		ResourceToWatch: &v1.Pod{},
@@ -978,16 +979,14 @@ func TestPluginManager_AddObjectMetadata(t *testing.T) {
 
 func TestResourceManagerConstruction(t *testing.T) {
 	ctx := context.Background()
-	sCtx := &pluginsCoreMock.SetupContext{}
 	fakeKubeClient := mocks.NewFakeKubeClient()
-	sCtx.On("KubeClient").Return(fakeKubeClient)
 
 	scope := promutils.NewScope("test:plugin_manager")
 	index := NewResourceMonitorIndex()
 	gvk, err := getPluginGvk(&v1.Pod{})
 	assert.NoError(t, err)
 	assert.Equal(t, gvk.Kind, "Pod")
-	si, err := getPluginSharedInformer(ctx, sCtx, &v1.Pod{})
+	si, err := getPluginSharedInformer(ctx, fakeKubeClient, &v1.Pod{})
 	assert.NotNil(t, si)
 	assert.NoError(t, err)
 	rm := index.GetOrCreateResourceLevelMonitor(ctx, scope, si, gvk)