Improvement/bump ingress nginx 4.12.1 by m4nch0t · Pull Request #4544 · scality/metalk8s

m4nch0t · 2025-03-25T09:35:23Z

bump ingress nginx 4.12.1
reorder bumping documentation
update skopeo in devcontainer

bert-e · 2025-03-25T09:35:28Z

Hello m4nch0t,

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 · 2025-03-25T09:35:34Z

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 · 2025-03-25T09:35:51Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

m4nch0t · 2025-04-17T11:56:16Z

/create_integration_branches

bert-e · 2025-04-17T11:56:25Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/bump-ingress-nginx-4.12.1 into
development/129.0
w/130.0/improvement/bump-ingress-nginx-4.12.1 will be merged into development/130.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/127.0
development/128.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

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

bert-e · 2025-04-17T11:56:28Z

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:

The following options are set: create_integration_branches

CHANGELOG.md

bert-e · 2025-04-17T14:16:30Z

History mismatch

Merge commit #71a5d4ecfc7ba3eb6fad212c648f2443eae367eb on the integration branch
w/130.0/improvement/bump-ingress-nginx-4.12.1 is merging a branch which is neither the current
branch improvement/bump-ingress-nginx-4.12.1 nor the development branch
development/130.0.

It is likely due to a rebase of the branch improvement/bump-ingress-nginx-4.12.1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

m4nch0t · 2025-04-17T14:16:41Z

/reset

bert-e · 2025-04-17T14:16:50Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

bert-e · 2025-04-17T14:16:59Z

Conflict

A conflict has been raised during the creation of
integration branch w/130.0/improvement/bump-ingress-nginx-4.12.1 with contents from improvement/bump-ingress-nginx-4.12.1
and development/130.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/130.0/improvement/bump-ingress-nginx-4.12.1 origin/development/130.0
 $ git merge origin/improvement/bump-ingress-nginx-4.12.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/130.0/improvement/bump-ingress-nginx-4.12.1

The following options are set: create_integration_branches

bert-e · 2025-04-17T15:10:41Z

History mismatch

Merge commit #4d8191014bb7110d75dbb054d3524db8a804ca5b on the integration branch
w/130.0/improvement/bump-ingress-nginx-4.12.1 is merging a branch which is neither the current
branch improvement/bump-ingress-nginx-4.12.1 nor the development branch
development/130.0.

It is likely due to a rebase of the branch improvement/bump-ingress-nginx-4.12.1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

m4nch0t · 2025-04-17T15:11:38Z

/reset

bert-e · 2025-04-17T15:11:46Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

bert-e · 2025-04-17T15:11:54Z

Conflict

A conflict has been raised during the creation of
integration branch w/130.0/improvement/bump-ingress-nginx-4.12.1 with contents from improvement/bump-ingress-nginx-4.12.1
and development/130.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/130.0/improvement/bump-ingress-nginx-4.12.1 origin/development/130.0
 $ git merge origin/improvement/bump-ingress-nginx-4.12.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/130.0/improvement/bump-ingress-nginx-4.12.1

The following options are set: create_integration_branches

m4nch0t · 2025-04-17T15:19:18Z

/reset

bert-e · 2025-04-17T15:19:25Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

bert-e · 2025-04-17T15:19:33Z

Conflict

A conflict has been raised during the creation of
integration branch w/130.0/improvement/bump-ingress-nginx-4.12.1 with contents from improvement/bump-ingress-nginx-4.12.1
and development/130.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/130.0/improvement/bump-ingress-nginx-4.12.1 origin/development/130.0
 $ git merge origin/improvement/bump-ingress-nginx-4.12.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/130.0/improvement/bump-ingress-nginx-4.12.1

The following options are set: create_integration_branches

bert-e · 2025-04-17T17:21:50Z

Conflict

A conflict has been raised during the update of
integration branch w/130.0/improvement/bump-ingress-nginx-4.12.1 with contents from improvement/bump-ingress-nginx-4.12.1
and development/130.0.

Please resolve the conflict on the integration branch (w/130.0/improvement/bump-ingress-nginx-4.12.1).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/130.0/improvement/bump-ingress-nginx-4.12.1
 $ git pull  # or "git reset --hard origin/w/130.0/improvement/bump-ingress-nginx-4.12.1"
 $ git merge origin/development/130.0
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/improvement/bump-ingress-nginx-4.12.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/130.0/improvement/bump-ingress-nginx-4.12.1

The following options are set: create_integration_branches

m4nch0t · 2025-04-18T07:12:10Z

/approve

bert-e · 2025-04-18T10:05:37Z

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

✔️ development/129.0
✔️ 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/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 None.

Goodbye m4nch0t.

The following options are set: approve, create_integration_branches

m4nch0t changed the base branch from development/130.0 to development/129.0 March 25, 2025 09:35

m4nch0t self-assigned this Mar 25, 2025

m4nch0t force-pushed the improvement/bump-ingress-nginx-4.12.1 branch 6 times, most recently from ede3f85 to 1b7125a Compare March 26, 2025 13:03

m4nch0t marked this pull request as ready for review March 26, 2025 18:13

m4nch0t requested a review from a team as a code owner March 26, 2025 18:13

m4nch0t force-pushed the improvement/bump-ingress-nginx-4.12.1 branch from 1b7125a to 086475d Compare March 27, 2025 07:51

m4nch0t force-pushed the improvement/bump-ingress-nginx-4.12.1 branch 6 times, most recently from 0ccabfa to 87c70eb Compare April 17, 2025 11:18

TeddyAndrieux reviewed Apr 17, 2025

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

m4nch0t force-pushed the improvement/bump-ingress-nginx-4.12.1 branch from 87c70eb to af9203e Compare April 17, 2025 14:16

m4nch0t force-pushed the improvement/bump-ingress-nginx-4.12.1 branch from af9203e to 5b664f8 Compare April 17, 2025 15:10

Yoan Moscatelli added 2 commits April 17, 2025 17:18

⬆️ bump ingress-nginx chart to 4.12.1

56f8f4d

📝 update bumping documentation

ab45902

m4nch0t force-pushed the improvement/bump-ingress-nginx-4.12.1 branch from 5b664f8 to ab45902 Compare April 17, 2025 15:18

TeddyAndrieux approved these changes Apr 17, 2025

View reviewed changes

bert-e merged commit ab45902 into development/129.0 Apr 18, 2025
30 checks passed

bert-e deleted the improvement/bump-ingress-nginx-4.12.1 branch April 18, 2025 10:05

Conversation

m4nch0t commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bert-e commented Mar 25, 2025

Hello m4nch0t,

Uh oh!

bert-e commented Mar 25, 2025

Waiting for approval

Uh oh!

bert-e commented Mar 25, 2025

Request integration branches

Uh oh!

m4nch0t commented Apr 17, 2025

Uh oh!

bert-e commented Apr 17, 2025

Integration data created

Uh oh!

bert-e commented Apr 17, 2025

Waiting for approval

Uh oh!

Uh oh!

bert-e commented Apr 17, 2025

History mismatch

Uh oh!

m4nch0t commented Apr 17, 2025

Uh oh!

bert-e commented Apr 17, 2025

Reset complete

Uh oh!

bert-e commented Apr 17, 2025

Conflict

Uh oh!

bert-e commented Apr 17, 2025

History mismatch

Uh oh!

m4nch0t commented Apr 17, 2025

Uh oh!

bert-e commented Apr 17, 2025

Reset complete

Uh oh!

bert-e commented Apr 17, 2025

Conflict

Uh oh!

m4nch0t commented Apr 17, 2025

Uh oh!

bert-e commented Apr 17, 2025

Reset complete

Uh oh!

bert-e commented Apr 17, 2025

Conflict

Uh oh!

bert-e commented Apr 17, 2025

Conflict

Uh oh!

m4nch0t commented Apr 18, 2025

Uh oh!

bert-e commented Apr 18, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

m4nch0t commented Mar 25, 2025 •

edited

Loading