Reconcile has a new signature

Signed-off-by: Richard Wall <richard.wall@jetstack.io>
cert-manager · Mar 25, 2021 · c9ac06a · c9ac06a
1 parent fc6bc03
commit c9ac06a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/internal/controllers/certificaterequest_controller.go b/internal/controllers/certificaterequest_controller.go
@@ -58,8 +58,7 @@ type CertificateRequestReconciler struct {
 // +kubebuilder:rbac:groups=cert-manager.io,resources=certificaterequests/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
 
-func (r *CertificateRequestReconciler) Reconcile(req ctrl.Request) (result ctrl.Result, err error) {
-	ctx := context.Background()
+func (r *CertificateRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	log := r.Log.WithValues("certificaterequest", req.NamespacedName)
 
 	// Get the CertificateRequest

diff --git a/internal/controllers/certificaterequest_controller_test.go b/internal/controllers/certificaterequest_controller_test.go
@@ -437,7 +437,7 @@ func TestCertificateRequestReconcile(t *testing.T) {
 				ClusterResourceNamespace: tc.clusterResourceNamespace,
 				SignerBuilder:            tc.signerBuilder,
 			}
-			result, err := controller.Reconcile(reconcile.Request{NamespacedName: tc.name})
+			result, err := controller.Reconcile(context.TODO(), reconcile.Request{NamespacedName: tc.name})
 			if tc.expectedError != nil {
 				assertErrorIs(t, tc.expectedError, err)
 			} else {

diff --git a/internal/controllers/issuer_controller.go b/internal/controllers/issuer_controller.go
@@ -65,8 +65,7 @@ func (r *IssuerReconciler) newIssuer() (runtime.Object, error) {
 	return r.Scheme.New(issuerGVK)
 }
 
-func (r *IssuerReconciler) Reconcile(req ctrl.Request) (result ctrl.Result, err error) {
-	ctx := context.Background()
+func (r *IssuerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	log := r.Log.WithValues("issuer", req.NamespacedName)
 
 	issuer, err := r.newIssuer()

diff --git a/internal/controllers/issuer_controller_test.go b/internal/controllers/issuer_controller_test.go
@@ -239,7 +239,7 @@ func TestIssuerReconcile(t *testing.T) {
 				HealthCheckerBuilder:     tc.healthCheckerBuilder,
 				ClusterResourceNamespace: tc.clusterResourceNamespace,
 			}
-			result, err := controller.Reconcile(reconcile.Request{NamespacedName: tc.name})
+			result, err := controller.Reconcile(context.TODO(), reconcile.Request{NamespacedName: tc.name})
 			if tc.expectedError != nil {
 				assertErrorIs(t, tc.expectedError, err)
 			} else {