Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

fix(build): update wolfi image lock for otel#63755

Merged
Chickensoupwithrice merged 2 commits into
mainfrom
al/otel-wolfi-lock-update
Jul 10, 2024
Merged

fix(build): update wolfi image lock for otel#63755
Chickensoupwithrice merged 2 commits into
mainfrom
al/otel-wolfi-lock-update

Conversation

@Chickensoupwithrice

@Chickensoupwithrice Chickensoupwithrice commented Jul 10, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

We need to update the wolfi lock image for https://github.com/sourcegraph/sourcegraph/pull/63171 in order for sg run to work

We've made all the changes to the deployment repos for this to be pushed out in the release today.

Test plan

Manually tested

Changelog

  • fix(build): update wolfi lock for otel-collector

@cla-bot cla-bot Bot added the cla-signed label Jul 10, 2024
@Chickensoupwithrice

Chickensoupwithrice commented Jul 10, 2024

Copy link
Copy Markdown
Contributor Author

Not sure why there's so many merge commits? The file changed is the correct one.

bobheadxi
bobheadxi approved these changes Jul 10, 2024
View reviewed changes

@bobheadxi bobheadxi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🔥

@willdollman

willdollman commented Jul 10, 2024

Copy link
Copy Markdown
Contributor

Is this PR intended to update the otel package to the 0.103.0-9 version that was introduced in this pr? This doesn't do that - you can inspect the lockfile to see that it's still including the old 0.92.0-r7 version https://github.com/sourcegraph/sourcegraph/blob/03ac595af93455f101b59211ca8bdfc03101a886/wolfi-images/opentelemetry-collector.lock.json#L748-L754

@willdollman

willdollman commented Jul 10, 2024

Copy link
Copy Markdown
Contributor

I suspect sg wolfi lock opentelemetry-collector was run before the buildkite pipeline for the original PR had completed, so it pulled in a list of packages before the updated otel package had been published.

I've rerun the command locally and it pulls in the updated package - see https://github.com/sourcegraph/sourcegraph/pull/63758

@Chickensoupwithrice

Chickensoupwithrice commented Jul 10, 2024

Copy link
Copy Markdown
Contributor Author

Thank you @willdollman 🙏🏽 saving my ass

@willdollman

willdollman commented Jul 10, 2024

Copy link
Copy Markdown
Contributor

very happy to see this change land at last! 😍

@Chickensoupwithrice Chickensoupwithrice force-pushed the al/otel-wolfi-lock-update branch from bd99707 to bbcab75 Compare July 10, 2024 17:07
@Chickensoupwithrice

Chickensoupwithrice commented Jul 10, 2024

Copy link
Copy Markdown
Contributor Author

Okay, fixed up the git history, and made sure the updated version of otel is part of the lock file

@Chickensoupwithrice Chickensoupwithrice merged commit d47b4cc into main Jul 10, 2024
@Chickensoupwithrice Chickensoupwithrice deleted the al/otel-wolfi-lock-update branch July 10, 2024 17:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@DaedalusG DaedalusG Awaiting requested review from DaedalusG

2 more reviewers

@willdollman willdollman willdollman approved these changes

@bobheadxi bobheadxi bobheadxi approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla-signed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Chickensoupwithrice @willdollman @bobheadxi