From f8f51ea2f894bf563c6567669f7b5e6f7a795424 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 5 Feb 2020 01:43:04 -0700 Subject: [PATCH] fix: Use scoped client name in Reconcile (#45) When the maester creates a client, it adds the namespace to the owner. This fix takes that into account when checking for updates. Without this patch, the maester fails to update the client with hydra when the k8s admin makes changes to the oauth2client resource in a namespace. Testing image is available at `dangersalad/hydra-maester:v0.0.12-alpha2`. --- controllers/oauth2client_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/oauth2client_controller.go b/controllers/oauth2client_controller.go index 818e96e..1e80dfa 100644 --- a/controllers/oauth2client_controller.go +++ b/controllers/oauth2client_controller.go @@ -160,7 +160,7 @@ func (r *OAuth2ClientReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error } if found { - if fetched.Owner != oauth2client.Name { + if fetched.Owner != fmt.Sprintf("%s/%s", oauth2client.Name, oauth2client.Namespace) { conflictErr := errors.Errorf("ID provided in secret %s/%s is assigned to another resource", secret.Name, secret.Namespace) if updateErr := r.updateReconciliationStatusError(ctx, &oauth2client, hydrav1alpha1.StatusInvalidSecret, conflictErr); updateErr != nil { return ctrl.Result{}, updateErr