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.

Sign up for GitHub

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

Jump to bottom

[release-2.13] Upgrade golang to 1.22.5 #8604

Merged
merged 3 commits into from
Jul 4, 2024
Merged

[release-2.13] Upgrade golang to 1.22.5 #8604

merged 3 commits into from
Jul 4, 2024

Conversation

dimitarvdimitrov
Copy link
Contributor

cherry picked from commit ddea70b #8600

@dimitarvdimitrov
Upgrade golang to 1.22.5 (#8600)
094d54b 
* Upgrade golang to 1.22.5

This addresses [CVE-2024-24791](https://nvd.nist.gov/vuln/detail/CVE-2024-24791)

Signed-off-by: Dimitar Dimitrov <[email protected]>

* Update build image version to pr8600-8a8fd767c7

* Add CHANGELOG.md entry

Signed-off-by: Dimitar Dimitrov <[email protected]>

---------

Signed-off-by: Dimitar Dimitrov <[email protected]>
Co-authored-by: dimitarvdimitrov <[email protected]>
(cherry picked from commit ddea70b)
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 4, 2024

Building new version of mimir-build-image. After image is built and pushed to Docker Hub, a new commit will automatically be added to this PR with new image version grafana/mimir-build-image:pr8604-40bd216be4. This can take up to 1 hour.

ying-jeanne
ying-jeanne approved these changes Jul 4, 2024
View reviewed changes
Copy link
Contributor

@ying-jeanne ying-jeanne left a comment

Choose a reason for hiding this comment

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

LGTM

@ying-jeanne
Copy link
Contributor

Building new version of mimir-build-image. After image is built and pushed to Docker Hub, a new commit will automatically be added to this PR with new image version grafana/mimir-build-image:pr8604-40bd216be4. This can take up to 1 hour.

hmmm

@dimitarvdimitrov
Copy link
Contributor Author

dimitarvdimitrov commented Jul 4, 2024 •
edited
Loading

I interrupted the build image workflow because we're ok using the build image from main. The only additional diff is the version of mixtool from #8534

@dimitarvdimitrov
Copy link
Contributor Author

in order to have a true build image dockerfile and image tag we're going to backport the mixtool changes to 2.13 and then continue to backport the golang version

@dimitarvdimitrov
Copy link
Contributor Author

in order to have a true build image dockerfile and image tag we're going to backport the mixtool changes to 2.13 and then continue to backport the golang version

apparently there are other changes, like #8385

I don't want to keep expanding the scope. So I will only udpate golang version and let CI push another build image with old skopeo, mixtool, and golangcilint

dimitarvdimitrov
dimitarvdimitrov commented Jul 4, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 4, 2024

Building new version of mimir-build-image. After image is built and pushed to Docker Hub, a new commit will automatically be added to this PR with new image version grafana/mimir-build-image:pr8604-40bd216be4. This can take up to 1 hour.

@dimitarvdimitrov dimitarvdimitrov merged commit ed2ab67 into release-2.13 Jul 4, 2024
30 checks passed
@dimitarvdimitrov dimitarvdimitrov deleted the backport-8600-to-release-2.13 branch July 4, 2024 14:30
@dimitarvdimitrov dimitarvdimitrov mentioned this pull request Jul 4, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ying-jeanne ying-jeanne ying-jeanne approved these changes

@wilfriedroset wilfriedroset Awaiting requested review from wilfriedroset wilfriedroset is a code owner

@vaxvms vaxvms Awaiting requested review from vaxvms vaxvms is a code owner

@bubu11e bubu11e Awaiting requested review from bubu11e bubu11e is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dimitarvdimitrov @ying-jeanne