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.

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

operator: bump operator-sdk to 1.37.0 #4462

Merged
merged 4 commits into from
Nov 19, 2024
Merged

operator: bump operator-sdk to 1.37.0 #4462

merged 4 commits into from
Nov 19, 2024

Conversation

eg-ayoub
Copy link
Contributor

No description provided.

@eg-ayoub eg-ayoub requested a review from a team as a code owner October 24, 2024 09:00
@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2024

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
Copy link
Contributor

bert-e commented Oct 24, 2024

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:

@eg-ayoub eg-ayoub force-pushed the improvement/bump-operator-sdk-1.37.0 branch 4 times, most recently from c651eed to e9fe7f9 Compare October 24, 2024 15:17
@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2024

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 Nov 7, 2024

Conflict

There is a conflict between your branch improvement/bump-operator-sdk-1.37.0 and the
destination branch development/129.0.

Please resolve the conflict on the feature branch (improvement/bump-operator-sdk-1.37.0).

git fetch && \
git checkout origin/improvement/bump-operator-sdk-1.37.0 && \
git merge origin/development/129.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/bump-operator-sdk-1.37.0

@eg-ayoub eg-ayoub force-pushed the improvement/bump-operator-sdk-1.37.0 branch 2 times, most recently from ab62648 to afb9d21 Compare November 7, 2024 10:02
@bert-e
Copy link
Contributor

bert-e commented Nov 7, 2024

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 Nov 7, 2024

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:

@eg-ayoub eg-ayoub force-pushed the improvement/bump-operator-sdk-1.37.0 branch from afb9d21 to f1971fb Compare November 18, 2024 17:42
@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

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:

@eg-ayoub
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

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

@bert-e
Copy link
Contributor

bert-e commented Nov 19, 2024

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

  • ✔️ development/129.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 eg-ayoub.

The following options are set: approve

@bert-e bert-e merged commit dd285fb into development/129.0 Nov 19, 2024
27 checks passed
@bert-e bert-e deleted the improvement/bump-operator-sdk-1.37.0 branch November 19, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ezekiel-alexrod ezekiel-alexrod ezekiel-alexrod approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@eg-ayoub @bert-e @ezekiel-alexrod