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

chore: upgrade Dex to 2.35.0 #10775

Merged
merged 2 commits into from Oct 3, 2022
Merged

Conversation

crenshaw-dev
Copy link
Collaborator

@crenshaw-dev crenshaw-dev commented Oct 3, 2022

Supersedes #10617

Closes #10615

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev added cherry-pick/2.2 Candidate for cherry picking into the 2.2 release branch cherry-pick/2.3 Candidate for cherry picking into the 2.3 release branch cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch labels Oct 3, 2022
Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov
Copy link

codecov bot commented Oct 3, 2022

Codecov Report

Base: 45.65% // Head: 45.67% // Increases project coverage by +0.01% 🎉

Coverage data is based on head (c9abe8a) compared to base (202efb2).
Patch coverage: 66.66% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10775      +/-   ##
==========================================
+ Coverage   45.65%   45.67%   +0.01%     
==========================================
  Files         236      236              
  Lines       28702    28699       -3     
==========================================
+ Hits        13104    13108       +4     
+ Misses      13804    13799       -5     
+ Partials     1794     1792       -2     
Impacted Files Coverage Δ
util/git/client.go 48.64% <66.66%> (-0.53%) ⬇️
cmd/argocd/commands/app.go 18.50% <0.00%> (-0.20%) ⬇️
util/settings/settings.go 51.36% <0.00%> (ø)
server/application/application.go 28.98% <0.00%> (+1.05%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@34fathombelow 34fathombelow 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 for your prompt response

@jannfis jannfis merged commit 76fe1d5 into argoproj:master Oct 3, 2022
@crenshaw-dev crenshaw-dev deleted the upgrade-dex-2.35 branch October 3, 2022 19:40
@crenshaw-dev
Copy link
Collaborator Author

Just for a paper trail: this addresses GHSA-vh7g-p26c-j2cw for us. Argo CD configures the bundled Dex instance with a public client to be used by the argocd CLI. So our users should upgrade Dex to protect themselves from that vulnerability.

crenshaw-dev added a commit that referenced this pull request Oct 3, 2022
* chore: upgrade dex to v2.35.0

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* upgrade github workflow too

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev added a commit that referenced this pull request Oct 3, 2022
* chore: upgrade dex to v2.35.0

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* upgrade github workflow too

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev added a commit that referenced this pull request Oct 3, 2022
* chore: upgrade dex to v2.35.0

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* upgrade github workflow too

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev
Copy link
Collaborator Author

Cherry-picked onto release-2.2 for 2.2.13, release-2.3 for 2.3.8, and release-2.4 for 2.4.13.

@mayurwaghmode
Copy link

Here when we can expect argocd dex server image will get updated to 2.35.0 from 2.32.0? - https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml#:~:text=image%3A%20ghcr.io/dexidp/dex%3Av2.32.0.
So that ppc64le users don't have to modify any manifest file :)
cc @crenshaw-dev @jannfis @34fathombelow

@crenshaw-dev
Copy link
Collaborator Author

@mayurwaghmode I failed to update the stable tag to point to v2.4.14 after the release (I'll create an issue about automating this).

The manifest looks correct now: https://github.com/argoproj/argo-cd/blob/stable/manifests/install.yaml#L9767

I think the raw response must be cached, because it still hasn't updated. Hopefully that'll change in a few minutes.

@mayurwaghmode
Copy link

Thanks @crenshaw-dev :)

ashutosh16 pushed a commit to ashutosh16/argo-cd that referenced this pull request Oct 7, 2022
* chore: upgrade dex to v2.35.0

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* upgrade github workflow too

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.2 Candidate for cherry picking into the 2.2 release branch cherry-pick/2.3 Candidate for cherry picking into the 2.3 release branch cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade dex to v2.34.0, for adding ppc64le support
4 participants