Skip to content

ARTESCA-14990 - Bump prometheus-adapter chart to v0.12.0 and image to 4.14.1 #4563

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
Merged
merged 8 commits into from
Apr 24, 2025
Merged

ARTESCA-14990 - Bump prometheus-adapter chart to v0.12.0 and image to 4.14.1 #4563

merged 8 commits into from
Apr 24, 2025

Conversation

vdaviot
Copy link
Contributor

@vdaviot vdaviot commented Apr 11, 2025

No description provided.

vdaviot added 2 commits April 11, 2025 16:24
@vdaviot
chart, build: bump prometheus-adapter to v0.12.0
d8c25ad 
Signed-off-by: Valentin Daviot <valentin.daviot@scality.com>
@vdaviot
salt: generate chart.sls for prometheus-adapter 4.14.1
1fa5ff2 
Signed-off-by: Valentin Daviot <valentin.daviot@scality.com>
@vdaviot vdaviot requested a review from a team as a code owner April 11, 2025 16:54
@bert-e
Copy link
Contributor

bert-e commented Apr 11, 2025

Hello vdaviot,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 11, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

vdaviot added 2 commits April 11, 2025 16:57
@vdaviot
changelog: add entry for prometheus-adapter bump
a8bf227 
Signed-off-by: Valentin Daviot <valentin.daviot@scality.com>
@vdaviot
Merge branch 'development/130.0' into improvement/ARTESCA-14990-bump-…
350b0fc 
…prometheus-adapter
@bert-e
Copy link
Contributor

bert-e commented Apr 14, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@vdaviot vdaviot changed the title Improvement/artesca 14990 bump prometheus adapter ARTESCA-14990 - Bump prometheus-adapter chart to v0.12.0 and image to 4.14.1 Apr 14, 2025
eg-ayoub
eg-ayoub reviewed Apr 14, 2025
View reviewed changes
CHANGELOG.md Outdated
@@ -17,6 +17,11 @@
[v2.42.0](https://github.com/dexidp/dex/releases/tag/v2.42.0)
(PR[#4558](https://github.com/scality/metalk8s/pull/4558))

- Bump prometheus-adapter chart version to
[4.14.1](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-4.14.1)
The prometheus-adapter image has been bumped accordingly to
Copy link
Contributor

@eg-ayoub eg-ayoub Apr 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

missing image link, I think in this case the image remains the same ?
In this case you can remove ther line.

eg-ayoub
eg-ayoub reviewed Apr 14, 2025
View reviewed changes
@vdaviot
[PATCH] Review comments.
ea7f6c8 
Signed-off-by: Valentin Daviot <valentin.daviot@scality.com>
eg-ayoub
eg-ayoub previously approved these changes Apr 14, 2025
View reviewed changes
Copy link
Contributor

@eg-ayoub eg-ayoub left a comment

Choose a reason for hiding this comment

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

LGTM

@bert-e
Copy link
Contributor

bert-e commented Apr 22, 2025

Conflict

There is a conflict between your branch improvement/ARTESCA-14990-bump-prometheus-adapter and the
destination branch development/130.0.

Please resolve the conflict on the feature branch (improvement/ARTESCA-14990-bump-prometheus-adapter).

git fetch && \
git checkout origin/improvement/ARTESCA-14990-bump-prometheus-adapter && \
git merge origin/development/130.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-14990-bump-prometheus-adapter

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2025

Conflict

There is a conflict between your branch improvement/ARTESCA-14990-bump-prometheus-adapter and the
destination branch development/130.0.

Please resolve the conflict on the feature branch (improvement/ARTESCA-14990-bump-prometheus-adapter).

git fetch && \
git checkout origin/improvement/ARTESCA-14990-bump-prometheus-adapter && \
git merge origin/development/130.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-14990-bump-prometheus-adapter

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@vdaviot
Copy link
Contributor Author

vdaviot commented Apr 24, 2025

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/130.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ARTESCA-14990.

Goodbye vdaviot.

The following options are set: approve

@bert-e bert-e merged commit c4df491 into development/130.0 Apr 24, 2025
30 checks passed
@bert-e bert-e deleted the improvement/ARTESCA-14990-bump-prometheus-adapter branch April 24, 2025 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

@eg-ayoub eg-ayoub eg-ayoub left review comments

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

Successfully merging this pull request may close these issues.
4 participants
@vdaviot @bert-e @eg-ayoub @TeddyAndrieux