Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Reconcile Dex client secret when .spec.dex is set #877

Merged
merged 1 commit into from Mar 20, 2023

Conversation

jannfis
Copy link
Collaborator

@jannfis jannfis commented Mar 17, 2023

What type of PR is this?

/kind bug

What does this PR do / why we need it:

#872 moved the actual Dex client secret to the argocd-secret and references it from the Dex configuration.

However, the change only considers .spec.sso.dex to figure out whether the client secret should be written. There is the (old) way of having Dex configuration in .spec.dex, and while being deprecated, is still used in the wild.

This change considers both, existence of .spec.dex and .spec.sso.dex as the trigger for reconciling the client secret into the argocd-secret.

Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

Which issue(s) this PR fixes:

Fixes https://issues.redhat.com/browse/GITOPS-2761

How to test changes / Special notes to the reviewer:

Signed-off-by: jannfis <jann@mistrust.net>
Copy link
Collaborator

@iam-veeramalla iam-veeramalla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
Thanks @jannfis

@iam-veeramalla iam-veeramalla merged commit a359b7c into argoproj-labs:master Mar 20, 2023
7 checks passed
ciiay pushed a commit to ciiay/argocd-operator that referenced this pull request Mar 20, 2023
…#877)

Signed-off-by: jannfis <jann@mistrust.net>
Signed-off-by: Yi Cai <yicai@redhat.com>
wtam2018 pushed a commit to wtam2018/argocd-operator that referenced this pull request Mar 24, 2023
…#877)

Signed-off-by: jannfis <jann@mistrust.net>
(cherry picked from commit a359b7c)
iam-veeramalla pushed a commit that referenced this pull request Mar 27, 2023
Signed-off-by: jannfis <jann@mistrust.net>
(cherry picked from commit a359b7c)

Co-authored-by: jannfis <jann@mistrust.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants