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(deps): Move from base-nossl to static #15203

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

paul1r
Copy link
Collaborator

@paul1r paul1r commented Dec 2, 2024

What this PR does / why we need it:
This PR removes the inclusion of glibc into most of the Docker images created by the Loki build system.

It excludes:

  • The loki-canary BoringCrypto image, as it requires glibc as part of the CGO dependency
  • The debug image for Loki, as it installs dlv, which in turn requires glibc

Which issue(s) this PR fixes:
This removes an unneeded dependency, which adds some low severity CVE items into the Docker images that we generate.

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • 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

@paul1r paul1r requested a review from a team as a code owner December 2, 2024 14:22
Copy link
Contributor

github-actions bot commented Dec 2, 2024

Kubernetes Manifest Diff Summary

Scenario: default-single-binary-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: default-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: ingress-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: legacy-monitoring-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: simple-scalable-aws-kube-irsa-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

@paul1r paul1r merged commit 5f670a4 into main Dec 2, 2024
63 checks passed
@paul1r paul1r deleted the paul1r/remove_glibc_for_base_loki_image branch December 2, 2024 16:00
@paul1r paul1r added dependencies Pull requests that update a dependency file type/bug Somehing is not working as expected backport release-3.2.x backport release-3.3.x labels Dec 2, 2024
loki-gh-app bot pushed a commit that referenced this pull request Dec 2, 2024
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Dec 2, 2024

The backport to release-3.2.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-15203-to-release-3.2.x origin/release-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5f670a4b183dbf0066b5b941cac0330402f51e6e

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-15203-to-release-3.2.x
# Create the PR body template
PR_BODY=$(gh pr view 15203 --json body --template 'Backport 5f670a4b183dbf0066b5b941cac0330402f51e6e from #15203{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore(deps): Move from base-nossl to static (backport release-3.2.x)' --body-file - --label 'size/M' --label 'dependencies' --label 'area/helm' --label 'type/bug' --label 'backport' --base release-3.2.x --milestone release-3.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-15203-to-release-3.2.x

# Create a pull request where the `base` branch is `release-3.2.x` and the `compare`/`head` branch is `backport-15203-to-release-3.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-15203-to-release-3.2.x

paul1r added a commit that referenced this pull request Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm backport release-3.2.x backport release-3.3.x backport-failed dependencies Pull requests that update a dependency file size/M type/bug Somehing is not working as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants