Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
added restConfig to Reconciler for dependency injection when testing
Signed-off-by: Henry H Li <[email protected]>
  • Loading branch information
bitscuit committed Nov 2, 2023
commit 5c0c7043ee2827c22275f59ceb8d16a05532049c
15 changes: 10 additions & 5 deletions controllers/operandbindinfo/operandbindinfo_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"k8s.io/apimachinery/pkg/types"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/discovery"
"k8s.io/client-go/rest"
"k8s.io/klog"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand All @@ -58,6 +59,7 @@ import (
// Reconciler reconciles a OperandBindInfo object
type Reconciler struct {
*deploy.ODLMOperator
Config *rest.Config
}

var (
Expand Down Expand Up @@ -938,12 +940,15 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
MaxConcurrentReconciles: r.MaxConcurrentReconciles, // Set the desired value for max concurrent reconciles.
}

cfg, err := config.GetConfig()
if err != nil {
klog.Errorf("Failed to get config: %v", err)
return err
var err error
if r.Config == nil {
r.Config, err = config.GetConfig()
if err != nil {
klog.Errorf("Failed to get config: %v", err)
return err
}
}
dc := discovery.NewDiscoveryClientForConfigOrDie(cfg)
dc := discovery.NewDiscoveryClientForConfigOrDie(r.Config)
_, apiLists, err := dc.ServerGroupsAndResources()
if err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions controllers/operandbindinfo/operandbindinfo_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ var _ = BeforeSuite(func(done Done) {

// Setup Manager with OperandBindInfo Controller
err = (&Reconciler{
Config: cfg,
ODLMOperator: deploy.NewODLMOperator(k8sManager, "OperandBindInfo"),
}).SetupWithManager(k8sManager)
Expect(err).ToNot(HaveOccurred())
Expand Down