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

package: use wolfi prefix #13357

Merged
merged 6 commits into from
Jun 9, 2024
Merged

package: use wolfi prefix #13357

merged 6 commits into from
Jun 9, 2024

Conversation

v1v
Copy link
Member

@v1v v1v commented Jun 6, 2024

Motivation/summary

We have agreed to use apm-server-wolfi - "We want for users/customers to know the os flavor"

Let's wait for #12671 regardless

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Locally running the package make goal

GENERATE_WOLFI_IMAGES=true \
  make package-snapshot

CI

If you create a feature branch in the upstream then the CI will do the rest, for instance I created feature/wolfi-name

image

Related issues

@v1v v1v requested a review from a team as a code owner June 6, 2024 17:42
@v1v v1v requested a review from a team June 6, 2024 17:42
@v1v v1v self-assigned this Jun 6, 2024
Copy link
Contributor

mergify bot commented Jun 6, 2024

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Jun 6, 2024
@v1v v1v added backport-8.14 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Jun 6, 2024
@v1v v1v marked this pull request as draft June 6, 2024 17:44
@v1v v1v marked this pull request as ready for review June 7, 2024 07:15
kruskall
kruskall previously approved these changes Jun 7, 2024
@kruskall
Copy link
Member

kruskall commented Jun 7, 2024

@v1v can you resolve the merge conflicts ?

Copy link
Contributor

mergify bot commented Jun 7, 2024

This pull request is now in conflicts. Could you fix it @v1v? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feature/wolfi-name upstream/feature/wolfi-name
git merge upstream/main
git push upstream feature/wolfi-name

v1v added 2 commits June 9, 2024 18:20
* upstream/main:
  chore: Update .go-version with Golang version 1.22.4 (#13367)
  build(deps): bump github.com/jaegertracing/jaeger from 1.56.0 to 1.57.0 in /systemtest (#13316)
  [updatecli] Bump elastic stack version to 8.15.0-725cdb43 (#13363)
  feat: add wolfi based image (#12671)
  Add Amazon Linux 2023 to the smoke tests (#13358)
  Update apm-data and remap for OTel hostmetrics to elastic metrics (#13196)
  build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.13.1 to 8.14.0 (#13356)
@kruskall kruskall merged commit f63836c into main Jun 9, 2024
12 checks passed
@kruskall kruskall deleted the feature/wolfi-name branch June 9, 2024 17:42
mergify bot pushed a commit that referenced this pull request Jun 9, 2024
* package: use wolfi prefix

* rename for wolfi

* rename

(cherry picked from commit f63836c)
mergify bot added a commit that referenced this pull request Jun 9, 2024
* package: use wolfi prefix

* rename for wolfi

* rename

(cherry picked from commit f63836c)

Co-authored-by: Victor Martinez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.14 Automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants