@@ -64,7 +64,7 @@ const (
6464type BindingReconciler struct {
6565 client.Client
6666 Log logr.Logger
67- Scheme * runtime.Scheme
67+ scheme * runtime.Scheme
6868
6969 CreateResourceServiceKey resource.KeyCreator
7070 CreateCFServiceKey cfservice.KeyCreator
@@ -91,6 +91,10 @@ func (r *BindingReconciler) SetupWithManager(mgr ctrl.Manager, options controlle
9191 Complete (r )
9292}
9393
94+ func (r * BindingReconciler ) Scheme () * runtime.Scheme {
95+ return r .scheme
96+ }
97+
9498// +kubebuilder:rbac:groups=ibmcloud.ibm.com,resources=bindings,verbs=get;list;watch;create;update;patch;delete
9599// +kubebuilder:rbac:groups=ibmcloud.ibm.com,resources=bindings/status,verbs=get;update;patch
96100// +kubebuilder:rbac:groups=ibmcloud.ibm.com,resources=bindings/finalizers,verbs=get;list;watch;create;update;patch;delete
@@ -102,8 +106,7 @@ func (r *BindingReconciler) SetupWithManager(mgr ctrl.Manager, options controlle
102106// Reconcile reads the state of the cluster for a Binding object and makes changes based on the state read
103107// and what is in the Binding.Spec.
104108// Automatically generates RBAC rules to allow the Controller to read and write Deployments.
105- func (r * BindingReconciler ) Reconcile (request ctrl.Request ) (ctrl.Result , error ) {
106- ctx := context .Background ()
109+ func (r * BindingReconciler ) Reconcile (ctx context.Context , request ctrl.Request ) (ctrl.Result , error ) {
107110 logt := r .Log .WithValues ("binding" , request .NamespacedName )
108111
109112 // Fetch the Binding instance
@@ -158,7 +161,7 @@ func (r *BindingReconciler) Reconcile(request ctrl.Request) (ctrl.Result, error)
158161
159162 // Set an owner reference if service and binding are in the same namespace
160163 if serviceInstance .Namespace == instance .Namespace {
161- if err := r .SetOwnerReference (serviceInstance , instance , r .Scheme ); err != nil {
164+ if err := r .SetOwnerReference (serviceInstance , instance , r .Scheme () ); err != nil {
162165 logt .Info ("Binding could not update owner reference" , instance .Name , err .Error ())
163166 return ctrl.Result {}, err
164167 }
@@ -500,7 +503,7 @@ func (r *BindingReconciler) createSecret(instance *ibmcloudv1.Binding, keyConten
500503 },
501504 Data : datamap ,
502505 }
503- if err := r .SetControllerReference (instance , secret , r .Scheme ); err != nil {
506+ if err := r .SetControllerReference (instance , secret , r .Scheme () ); err != nil {
504507 return err
505508 }
506509 if err := r .Create (context .Background (), secret ); err != nil {
0 commit comments