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

Use 0.28.1 build image and update go and alpine versions #8583

Merged
merged 19 commits into from
Feb 23, 2023

Conversation

MichelHollands
Copy link
Contributor

@MichelHollands MichelHollands commented Feb 22, 2023

What this PR does / why we need it:

  • Use the 0.28.1 build image
  • Update Go version to 1.20.1
  • Use Alpine 3.16.4
  • Fix linter issues due to updated govet in 1.20.1
  • Modify images to not create /etc/nsswitch.conf file anymore (available by default on Alpine 3.16.4)
  • Remove impossible test cases for TestMemChunk_IteratorBounds(see Loki: Fix memchunk headblock filter #8591 (comment) for context)

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@MichelHollands MichelHollands requested a review from a team as a code owner February 22, 2023 10:12
@pull-request-size pull-request-size bot added size/M and removed size/S labels Feb 22, 2023
@MichelHollands MichelHollands changed the title Use 0 28 build image Use 0 28 build image and update go and alpine Feb 22, 2023
@pull-request-size pull-request-size bot added size/L and removed size/M labels Feb 22, 2023
@MichelHollands MichelHollands changed the title Use 0 28 build image and update go and alpine Use 0.28 build image and update go and alpine versions Feb 22, 2023
MichelHollands and others added 6 commits February 22, 2023 15:27
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 22, 2023
chaudum and others added 2 commits February 22, 2023 15:36
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
@github-actions github-actions bot removed the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 22, 2023
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
@MichelHollands MichelHollands changed the title Use 0.28 build image and update go and alpine versions Use 0.28.1 build image and update go and alpine versions Feb 22, 2023
chaudum and others added 2 commits February 22, 2023 16:41
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Copy link
Contributor

@DylanGuedes DylanGuedes left a comment

Choose a reason for hiding this comment

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

nit but lgtm

pkg/chunkenc/memchunk_test.go Show resolved Hide resolved
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

[Docs squad] Docs LGTM

@MichelHollands MichelHollands merged commit 4f8d324 into main Feb 23, 2023
@MichelHollands MichelHollands deleted the use_0_28_build_image branch February 23, 2023 13:02
@DylanGuedes DylanGuedes added the backport release-2.7.x add to a PR to backport it into release 2.7.x label Feb 23, 2023
@grafanabot
Copy link
Collaborator

Hello @DylanGuedes!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@DylanGuedes DylanGuedes added backport release-2.7.x add to a PR to backport it into release 2.7.x and removed backport release-2.7.x add to a PR to backport it into release 2.7.x labels Feb 23, 2023
@grafanabot
Copy link
Collaborator

The backport to release-2.7.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8583-to-release-2.7.x origin/release-2.7.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4f8d3240f6ba1d203f4713fe4a7afe109bdb8ee1
# Push it to GitHub
git push --set-upstream origin backport-8583-to-release-2.7.x
git switch main
# Remove the local backport branch
git branch -D backport-8583-to-release-2.7.x

Then, create a pull request where the base branch is release-2.7.x and the compare/head branch is backport-8583-to-release-2.7.x.

@DylanGuedes DylanGuedes added backport release-2.7.x add to a PR to backport it into release 2.7.x and removed backport release-2.7.x add to a PR to backport it into release 2.7.x backport-failed labels Feb 24, 2023
@grafanabot
Copy link
Collaborator

The backport to release-2.7.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8583-to-release-2.7.x origin/release-2.7.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4f8d3240f6ba1d203f4713fe4a7afe109bdb8ee1
# Push it to GitHub
git push --set-upstream origin backport-8583-to-release-2.7.x
git switch main
# Remove the local backport branch
git branch -D backport-8583-to-release-2.7.x

Then, create a pull request where the base branch is release-2.7.x and the compare/head branch is backport-8583-to-release-2.7.x.

DylanGuedes pushed a commit that referenced this pull request Feb 24, 2023
**What this PR does / why we need it**:

- Use the 0.28.1 build image
- Update Go version to 1.20.1
- Use Alpine 3.16.4
- Fix linter issues due to updated govet in 1.20.1
- Modify images to not create `/etc/nsswitch.conf` file anymore
(available by default on Alpine 3.16.4)
- Remove impossible test cases for `TestMemChunk_IteratorBounds`(see
#8591 (comment) for
context)

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Co-authored-by: Christian Haudum <christian.haudum@gmail.com>
Co-authored-by: DylanGuedes <djmgguedes@gmail.com>
(cherry picked from commit 4f8d324)
DylanGuedes added a commit that referenced this pull request Feb 24, 2023
…ons (#8583) (#8623)

(cherry picked from commit 4f8d324)

---------

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
**What this PR does / why we need it**:

- Use the 0.28.1 build image
- Update Go version to 1.20.1
- Use Alpine 3.16.4
- Fix linter issues due to updated govet in 1.20.1 
- Modify images to not create `/etc/nsswitch.conf` file anymore
(available by default on Alpine 3.16.4)
- Remove impossible test cases for `TestMemChunk_IteratorBounds`(see
grafana#8591 (comment) for
context)

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Co-authored-by: Christian Haudum <christian.haudum@gmail.com>
Co-authored-by: DylanGuedes <djmgguedes@gmail.com>
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.

5 participants