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.

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

Bug 2079422: Bump PodDisruptionBudget to v1 #1427

Merged
merged 1 commit into from
May 11, 2022

Conversation

oribon
Copy link
Contributor

@oribon oribon commented May 8, 2022

v1beta1 will be removed in 1.25

Signed-off-by: Ori Braunshtein obraunsh@redhat.com

v1beta1 will be removed in 1.25

Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels May 8, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 8, 2022

@oribon: This pull request references Bugzilla bug 2079422, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @zhaozhanqi

In response to this:

Bug 2079422: Bump PodDisruptionBudget to v1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@oribon
Copy link
Contributor Author

oribon commented May 9, 2022

/retest

1 similar comment
@oribon
Copy link
Contributor Author

oribon commented May 9, 2022

/retest

@trozet
Copy link
Contributor

trozet commented May 10, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oribon, trozet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2022
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2022

@oribon: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit fd47873 into openshift:master May 11, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2022

@oribon: All pull requests linked via external trackers have merged:

Bugzilla bug 2079422 has been moved to the MODIFIED state.

In response to this:

Bug 2079422: Bump PodDisruptionBudget to v1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@oribon
Copy link
Contributor Author

oribon commented Jun 1, 2022

/cherry-pick release-4.10

@openshift-cherrypick-robot

@oribon: #1427 failed to apply on top of branch "release-4.10":

Applying: Bump PodDisruptionBudget to v1
Using index info to reconstruct a base tree...
A	bindata/network/ovn-kubernetes/managed/ovnkube-master.yaml
A	bindata/network/ovn-kubernetes/self-hosted/ovnkube-master.yaml
Falling back to patching base and 3-way merge...
Auto-merging bindata/network/ovn-kubernetes/ovnkube-master.yaml
CONFLICT (modify/delete): bindata/network/ovn-kubernetes/managed/ovnkube-master.yaml deleted in HEAD and modified in Bump PodDisruptionBudget to v1. Version Bump PodDisruptionBudget to v1 of bindata/network/ovn-kubernetes/managed/ovnkube-master.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump PodDisruptionBudget to v1
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants