Skip to content

ARTESCA-14994 - Bump kube prometheus stack #4591

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

Open
wants to merge 8 commits into
base: development/130.0
Choose a base branch
from

Conversation

vdaviot
Copy link
Contributor

@vdaviot vdaviot commented May 5, 2025

This is a duplicate of #4569, which will be closed soon

@vdaviot vdaviot requested a review from a team as a code owner May 5, 2025 09:47
@bert-e
Copy link
Contributor

bert-e commented May 5, 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 May 5, 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 ARTESCA-14994 - Bump thanos kube prometheus stack and Thanos ARTESCA-14994 - Bump thanos kube prometheus stack May 5, 2025
@vdaviot vdaviot force-pushed the improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 branch from c1a03a0 to 0440a6e Compare May 5, 2025 10:26
@bert-e
Copy link
Contributor

bert-e commented May 5, 2025

Conflict

There is a conflict between your branch improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 and the
destination branch development/130.0.

Please resolve the conflict on the feature branch (improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2).

git fetch && \
git checkout origin/improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 && \
git merge origin/development/130.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2

@bert-e
Copy link
Contributor

bert-e commented May 5, 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 ARTESCA-14994 - Bump thanos kube prometheus stack ARTESCA-14994 - Bump kube prometheus stack May 5, 2025
@bert-e
Copy link
Contributor

bert-e commented May 6, 2025

Conflict

There is a conflict between your branch improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 and the
destination branch development/130.0.

Please resolve the conflict on the feature branch (improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2).

git fetch && \
git checkout origin/improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 && \
git merge origin/development/130.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2

@vdaviot vdaviot force-pushed the improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 branch 3 times, most recently from 6ef53a4 to 113a778 Compare May 6, 2025 13:51
…30.0, prometheus-config-reloader to v0.81.0, alertmanager to v0.28.1 (potentially wrong sha) and prometheus to v3.3.0

Signed-off-by: Valentin Daviot <[email protected]>
@vdaviot vdaviot force-pushed the improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 branch 3 times, most recently from b1a10dd to 35866eb Compare May 7, 2025 12:18
…ired by chart, update changelog accordingly

Signed-off-by: Valentin Daviot <[email protected]>
@vdaviot vdaviot force-pushed the improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2 branch from 35866eb to d272304 Compare May 7, 2025 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants