This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Fix vulnerabilities in jaeger and opentelemetry-collector images#54000
Merged
Conversation
bobheadxi
reviewed
Jun 23, 2023
bobheadxi
approved these changes
Jun 23, 2023
bobheadxi
left a comment
Member
There was a problem hiding this comment.
nice, one step closer to latest 😆 Thanks for doing this!
Member
|
Should add to changelog as well |
The latest version is 1.46, but this introduces a breaking change which we're avoiding this close to a release.
This is the minimum possible update that fixes all vulns in the otelcol image * go mod edit -require go.opentelemetry.io/collector@v0.73.0 * go mod tidy * bazel run //:gazelle-update-repos
OTEL stuff moved packages around, which messed our ability to build old code. This is happening because we're building the old code with our new `deps.bzl` (there isn't really an easy way around that for now). ## Test plan <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> CI, backcompat test passed.
6350508 to
9bcbe51
Compare
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.1 5.1
# Navigate to the new working tree
cd .worktrees/backport-5.1
# Create a new branch
git switch --create backport-54000-to-5.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d05fbc97877a30adb80eb66498c282d86bf00e43
# Push it to GitHub
git push --set-upstream origin backport-54000-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1Then, create a pull request where the |
willdollman
added a commit
that referenced
this pull request
Jun 23, 2023
) Update the jaeger and opentelemetry-collector images, and associated opentelemetry-collector go modules to remove CVE-2022-41723. <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> - [x] Green `wolfi/` CI https://buildkite.com/sourcegraph/sourcegraph/builds/230378 - [x] Green main-dry-run https://buildkite.com/sourcegraph/sourcegraph/builds/230388 - [x] Manually inspecting base images from wolfi CI - [x] Test tracing by following https://docs.sourcegraph.com/dev/how-to/opentelemetry_local_dev Successful trace locally using update otelcol container + jaeger 1.45.0:  --------- Co-authored-by: Jean-Hadrien Chabran <jean-hadrien.chabran@sourcegraph.com> (cherry picked from commit d05fbc9)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update the jaeger and opentelemetry-collector images, and associated opentelemetry-collector go modules to remove CVE-2022-41723.
Test plan
wolfi/CI https://buildkite.com/sourcegraph/sourcegraph/builds/230378Successful trace locally using update otelcol container + jaeger 1.45.0: