build: bump kubernetes to 1.27.15 #4361

eg-ayoub · 2024-07-10T09:06:50Z

No description provided.

bert-e · 2024-07-10T09:06:53Z

Hello eg-ayoub,

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 · 2024-07-10T09:06:57Z

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.

bert-e · 2024-07-12T12:33:46Z

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-k8s-12715 with contents from improvement/bump-k8s-12715
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-k8s-12715 origin/development/128.0
 $ git merge origin/improvement/bump-k8s-12715
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-k8s-12715

The following options are set: approve

eg-ayoub · 2024-07-15T16:03:11Z

/create_pull_requests

bert-e · 2024-07-15T16:03:22Z

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-k8s-12715 with contents from improvement/bump-k8s-12715
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-k8s-12715 origin/development/128.0
 $ git merge origin/improvement/bump-k8s-12715
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-k8s-12715

The following options are set: approve, create_pull_requests

bert-e · 2024-07-15T16:08:09Z

Integration data created

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

this pull request will merge improvement/bump-k8s-12715 into
development/127.0
w/128.0/improvement/bump-k8s-12715 will be merged into development/128.0 (pull request INTEGRATION [PR#4361 > development/128.0] build: bump kubernetes to 1.27.15 #4368)

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.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

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests

bert-e · 2024-07-15T16:08:10Z

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_pull_requests

eg-ayoub · 2024-07-15T16:08:10Z

/create_pull_requests

eg-ayoub · 2024-07-16T07:54:58Z

also bump 128 in /create_pull_requests

bert-e · 2024-07-16T07:55:05Z

Conflict

There is a conflict between your branch improvement/bump-k8s-12715 and the
destination branch development/127.0.

Please resolve the conflict on the feature branch (improvement/bump-k8s-12715).

git fetch && \
git checkout origin/improvement/bump-k8s-12715 && \
git merge origin/development/127.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/bump-k8s-12715

The following options are set: create_pull_requests

bert-e · 2024-07-16T08:07:43Z

History mismatch

Merge commit #d30f5a399051f24fee3bb522c87ebf6278ada311 on the integration branch
w/128.0/improvement/bump-k8s-12715 is merging a branch which is neither the current
branch improvement/bump-k8s-12715 nor the development branch
development/128.0.

It is likely due to a rebase of the branch improvement/bump-k8s-12715 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_pull_requests

eg-ayoub · 2024-07-16T08:07:59Z

/reset

bert-e · 2024-07-16T08:08:08Z

Reset complete

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

The following options are set: create_pull_requests

bert-e · 2024-07-16T08:08:17Z

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-k8s-12715 with contents from improvement/bump-k8s-12715
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-k8s-12715 origin/development/128.0
 $ git merge origin/improvement/bump-k8s-12715
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-k8s-12715

The following options are set: create_pull_requests

eg-ayoub · 2024-07-16T08:27:45Z

ping

bert-e · 2024-07-16T08:27:57Z

Integration data created

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

this pull request will merge improvement/bump-k8s-12715 into
development/127.0
w/128.0/improvement/bump-k8s-12715 will be merged into development/128.0 (pull request INTEGRATION [PR#4361 > development/128.0] build: bump kubernetes to 1.27.15 #4369)

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.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

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests

bert-e · 2024-07-16T08:27:58Z

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_pull_requests

eg-ayoub · 2024-07-17T09:11:37Z

/approve

bert-e · 2024-07-17T09:11:47Z

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: approve, create_pull_requests

bert-e · 2024-07-17T12:12:46Z

Conflict

A conflict has been raised during the update of
integration branch w/128.0/improvement/bump-k8s-12715 with contents from improvement/bump-k8s-12715
and development/128.0.

Please resolve the conflict on the integration branch (w/128.0/improvement/bump-k8s-12715).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/128.0/improvement/bump-k8s-12715
 $ git pull  # or "git reset --hard origin/w/128.0/improvement/bump-k8s-12715"
 $ git merge origin/development/128.0
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/improvement/bump-k8s-12715
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-k8s-12715

The following options are set: approve, create_pull_requests

bert-e · 2024-07-17T12:19:03Z

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: approve, create_pull_requests

bert-e · 2024-07-17T16:40:14Z

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

✔️ development/127.0
✔️ development/128.0

The following branches have NOT changed:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.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 eg-ayoub.

The following options are set: approve, create_pull_requests

eg-ayoub requested a review from a team as a code owner July 10, 2024 09:06

eg-ayoub force-pushed the improvement/bump-k8s-12715 branch from bb40556 to d30f5a3 Compare July 10, 2024 09:08

m4nch0t previously approved these changes Jul 10, 2024

View reviewed changes

bert-e mentioned this pull request Jul 15, 2024

INTEGRATION [PR#4361 > development/128.0] build: bump kubernetes to 1.27.15 #4368

Closed

eg-ayoub added 3 commits July 16, 2024 10:07

build: bump kubernetes to 1.27.15

2d4bc9a

build: bump etcd to 3.5.14

01985a5

build: bump coredns to 1.11.1

c015c5d

eg-ayoub dismissed m4nch0t’s stale review via c015c5d July 16, 2024 08:07

eg-ayoub force-pushed the improvement/bump-k8s-12715 branch from 3a30c64 to c015c5d Compare July 16, 2024 08:07

bert-e mentioned this pull request Jul 16, 2024

INTEGRATION [PR#4361 > development/128.0] build: bump kubernetes to 1.27.15 #4369

Merged

eg-ayoub requested a review from m4nch0t July 17, 2024 09:19

Merge branch 'development/127.0' into improvement/bump-k8s-12715

a379d7a

TeddyAndrieux approved these changes Jul 17, 2024

View reviewed changes

bert-e merged commit a379d7a into development/127.0 Jul 17, 2024
26 checks passed

bert-e deleted the improvement/bump-k8s-12715 branch July 17, 2024 16:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: bump kubernetes to 1.27.15 #4361

build: bump kubernetes to 1.27.15 #4361

eg-ayoub commented Jul 10, 2024

bert-e commented Jul 10, 2024

bert-e commented Jul 10, 2024

bert-e commented Jul 12, 2024

eg-ayoub commented Jul 15, 2024

bert-e commented Jul 15, 2024

bert-e commented Jul 15, 2024

bert-e commented Jul 15, 2024

eg-ayoub commented Jul 15, 2024

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 16, 2024

bert-e commented Jul 16, 2024

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 16, 2024

bert-e commented Jul 16, 2024

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 16, 2024

bert-e commented Jul 16, 2024

eg-ayoub commented Jul 17, 2024

bert-e commented Jul 17, 2024

bert-e commented Jul 17, 2024

bert-e commented Jul 17, 2024

bert-e commented Jul 17, 2024

build: bump kubernetes to 1.27.15 #4361

build: bump kubernetes to 1.27.15 #4361

Conversation

eg-ayoub commented Jul 10, 2024

bert-e commented Jul 10, 2024

Hello eg-ayoub,

bert-e commented Jul 10, 2024

Request integration branches

bert-e commented Jul 12, 2024

Conflict

eg-ayoub commented Jul 15, 2024

bert-e commented Jul 15, 2024

Conflict

bert-e commented Jul 15, 2024

Integration data created

bert-e commented Jul 15, 2024

Waiting for approval

eg-ayoub commented Jul 15, 2024

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 16, 2024

Conflict

bert-e commented Jul 16, 2024

History mismatch

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 16, 2024

Reset complete

bert-e commented Jul 16, 2024

Conflict

eg-ayoub commented Jul 16, 2024

bert-e commented Jul 16, 2024

Integration data created

bert-e commented Jul 16, 2024

Waiting for approval

eg-ayoub commented Jul 17, 2024

bert-e commented Jul 17, 2024

Waiting for approval

bert-e commented Jul 17, 2024

Conflict

bert-e commented Jul 17, 2024

Waiting for approval

bert-e commented Jul 17, 2024