From 108284d3cd8c1052e4ef3357c3a0adfecb520c21 Mon Sep 17 00:00:00 2001 From: live77 <535157110@qq.com> Date: Mon, 6 Dec 2021 21:42:21 +0800 Subject: [PATCH] fix build & unittest for helm repo controller --- .../helmcategory/helm_category_controller_suite_test.go | 2 +- pkg/controller/openpitrix/helmrepo/helm_repo_controller.go | 1 + .../openpitrix/helmrepo/helm_repo_controller_suite_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go index b83ef5c6b..60bcd3c1c 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller_suite_test.go @@ -81,7 +81,7 @@ var _ = BeforeSuite(func(done Done) { }) Expect(err).ToNot(HaveOccurred()) - err = Add(k8sManager) + err = (&ReconcileHelmCategory{}).SetupWithManager(k8sManager) Expect(err).ToNot(HaveOccurred()) err = (&helmapplication.ReconcileHelmApplication{}).SetupWithManager(k8sManager) diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go index 2d5383de1..cb2828195 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go @@ -86,6 +86,7 @@ type ReconcileHelmRepo struct { } func (r *ReconcileHelmRepo) SetupWithManager(mgr ctrl.Manager) error { + r.Client = mgr.GetClient() r.scheme = mgr.GetScheme() r.recorder = mgr.GetEventRecorderFor("workspace-controller") r.config = mgr.GetConfig() diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go index d14a54eb5..202b58bac 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_suite_test.go @@ -80,7 +80,7 @@ var _ = BeforeSuite(func(done Done) { }) Expect(err).ToNot(HaveOccurred()) - err = Add(k8sManager) + err = (&ReconcileHelmRepo{}).SetupWithManager(k8sManager) Expect(err).ToNot(HaveOccurred()) go func() {