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: [release-2.9.x] Bump go to 1.21.9 and build image to 0.33.1 #12488

Merged
merged 9 commits into from
Apr 6, 2024

Conversation

MichelHollands
Copy link
Contributor

@MichelHollands MichelHollands commented Apr 5, 2024

What this PR does / why we need it:

Use the new build image to address https://pkg.go.dev/vuln/GO-2024-2687.
Some changes had to be made to satisfy the linter.

Fixes https://github.com/grafana/loki-private/issues/940

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
@pull-request-size pull-request-size bot added size/L and removed size/M labels Apr 5, 2024
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
@MichelHollands MichelHollands changed the title Try 0.33 again chore: [release-2.9.x] Bump build-image 0.33.1 and golang 1.21.9 Apr 5, 2024
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
@MichelHollands MichelHollands changed the title chore: [release-2.9.x] Bump build-image 0.33.1 and golang 1.21.9 chore: [release-2.9.x] Bump golang to 1.21.9 and build image to 0.33.1 Apr 5, 2024
@MichelHollands MichelHollands changed the title chore: [release-2.9.x] Bump golang to 1.21.9 and build image to 0.33.1 chore: [release-2.9.x] Bump go to 1.21.9 and build image to 0.33.1 Apr 5, 2024
@MichelHollands MichelHollands marked this pull request as ready for review April 5, 2024 16:28
@MichelHollands MichelHollands requested review from periklis, xperimental and a team as code owners April 5, 2024 16:28
Copy link
Contributor

@JordanRushing JordanRushing left a comment

Choose a reason for hiding this comment

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

LGTM

build_image: "grafana/loki-build-image:0.30.1"
golang_ci_lint_version: "v1.51.2"
build_image: "grafana/loki-build-image:0.33.1"
golang_ci_lint_version: "v1.55.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess this downgrade is to be able to work with the linter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's an upgrade. It matches the linter used in the build image now.

Copy link
Contributor

@poyzannur poyzannur left a comment

Choose a reason for hiding this comment

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

minor questions just to double check changes.
lgtm, thanks @MichelHollands

Copy link
Collaborator

@periklis periklis left a comment

Choose a reason for hiding this comment

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

LGTM

@MichelHollands MichelHollands merged commit ff1b861 into release-2.9.x Apr 6, 2024
16 checks passed
@MichelHollands MichelHollands deleted the update_build_image branch April 6, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants