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(deps): upgrade go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc dependency #18285

Merged
merged 2 commits into from
May 20, 2024

Conversation

34fathombelow
Copy link
Member

Fixes CVE-2023-47108

Opened #18258 to ensure we migrate from interceptors to stat handlers in future versions of Argo CD.

Upgraded to the lowest minor version that contained the patch. I had to exclude StreamServerInterceptor & UnaryServerInterceptor from the linter checks to pass the depreciation warnings. Although migrating to the newer functions is preferred, going this route ensures no breaking changes when cherry picking the fix.

Upstream has deprecated StreamServerInterceptor, UnaryServerInterceptor, and StreamClientInterceptor functions but has not been removed as of the latest release (0.51.0).

Built and tested with image: quay.io/34fathombelow/argocd:latest-otel46.1
Screenshot 2024-05-19 at 11 09 13 PM

cherry-pick v2.11, v2.10, and v2.9 ?

Signed-off-by: Justin Marquis <justin@akuity.io>
Copy link
Collaborator

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

thanks!

@crenshaw-dev crenshaw-dev merged commit 95d37dc into argoproj:master May 20, 2024
27 checks passed
@34fathombelow
Copy link
Member Author

@crenshaw-dev Safe to cherry-pick now?

@pasha-codefresh
Copy link
Member

@34fathombelow you can do it , we already released

@34fathombelow
Copy link
Member Author

/cherry-pick release-2.11

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request May 21, 2024
Signed-off-by: Justin Marquis <justin@akuity.io>
Co-authored-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
@34fathombelow
Copy link
Member Author

/cherry-pick release-2.10

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request May 21, 2024
Signed-off-by: Justin Marquis <justin@akuity.io>
Co-authored-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
@34fathombelow
Copy link
Member Author

/cherry-pick release-2.9

Copy link

Cherry-pick failed with Merge error 95d37dc87d48805ff6f7e56206def039790781f1 into temp-cherry-pick-fd1b34-release-2.9

@34fathombelow 34fathombelow deleted the otle_dep_upgrade branch May 21, 2024 15:44
34fathombelow added a commit that referenced this pull request May 21, 2024
Signed-off-by: Justin Marquis <justin@akuity.io>
Co-authored-by: Justin Marquis <76892343+34fathombelow@users.noreply.github.com>
Co-authored-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
34fathombelow added a commit that referenced this pull request May 21, 2024
Signed-off-by: Justin Marquis <justin@akuity.io>
Co-authored-by: Justin Marquis <76892343+34fathombelow@users.noreply.github.com>
Co-authored-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
rumstead pushed a commit to rumstead/argo-cd that referenced this pull request Jun 6, 2024
Signed-off-by: Justin Marquis <justin@akuity.io>
Co-authored-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
mkieweg pushed a commit to mkieweg/argo-cd that referenced this pull request Jun 11, 2024
Signed-off-by: Justin Marquis <justin@akuity.io>
Co-authored-by: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
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

5 participants