CadolesKube/hydra-maester
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: Use scoped client name in Reconcile (#45)

Browse Source 
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`.
This commit is contained in:
Paul Davis 2020-02-05 01:43:04 -07:00 committed by GitHub
parent a88f28583d
commit f8f51ea2f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/oauth2client_controller.go
View File

@ -160,7 +160,7 @@ func (r *OAuth2ClientReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error
} }
if found { 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) 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 { if updateErr := r.updateReconciliationStatusError(ctx, &oauth2client, hydrav1alpha1.StatusInvalidSecret, conflictErr); updateErr != nil {
return ctrl.Result{}, updateErr return ctrl.Result{}, updateErr