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

OCPBUGS-42120: UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch #2095

Merged
merged 1 commit into from
Sep 25, 2024
Merged

OCPBUGS-42120: UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch #2095

merged 1 commit into from
Sep 25, 2024

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Sep 24, 2024

@openshift-ci-robot openshift-ci-robot added backports/validated-commits Indicates that all commits come to merged upstream PRs. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 24, 2024
@openshift-ci-robot
Copy link

@gnufied: This pull request references Jira Issue OCPBUGS-42120, which is invalid:

  • expected the bug to target the "4.18.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Fixes https://issues.redhat.com/browse/OCPBUGS-42120

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

@gnufied: the contents of this pull request could be automatically validated.

The following commits are valid:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@gnufied
Copy link
Member Author

gnufied commented Sep 24, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 24, 2024
@openshift-ci-robot
Copy link

@gnufied: This pull request references Jira Issue OCPBUGS-42120, which is valid. The bug has been moved to the POST state.

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

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from deads2k and tkashem September 24, 2024 15:29
@gnufied
Copy link
Member Author

gnufied commented Sep 24, 2024

/cherry-pick release-4.17
/cherry-pick release-4.16
/cherry-pick release-4.15
/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@gnufied: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.17
/cherry-pick release-4.16
/cherry-pick release-4.15
/cherry-pick release-4.14

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-sigs/prow repository.

@gnufied
Copy link
Member Author

gnufied commented Sep 24, 2024

/retest

@dobsonj
Copy link
Member

dobsonj commented Sep 24, 2024

/lgtm
/assign @bertinatto
for approval

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2024
@jsafrane
Copy link

/retest-required

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2024

@gnufied: 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-sigs/prow repository. I understand the commands that are listed here.

bertinatto
bertinatto reviewed Sep 25, 2024
View reviewed changes
Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, dobsonj, gnufied

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 Sep 25, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 947ea2f into openshift:master Sep 25, 2024
19 of 20 checks passed
@openshift-ci-robot
Copy link

@gnufied: Jira Issue OCPBUGS-42120: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-42120 has been moved to the MODIFIED state.

In response to this:

Fixes https://issues.redhat.com/browse/OCPBUGS-42120

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link

@gnufied: new pull request created: #2097

In response to this:

/cherry-pick release-4.17
/cherry-pick release-4.16
/cherry-pick release-4.15
/cherry-pick release-4.14

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-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 25, 2024
Merged
@openshift-cherrypick-robot
Copy link

@gnufied: #2095 failed to apply on top of branch "release-4.16":

Applying: UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
Using index info to reconstruct a base tree...
M	pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
M	pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
M	pkg/scheduler/schedule_one_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/scheduler/schedule_one_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/schedule_one_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
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.17
/cherry-pick release-4.16
/cherry-pick release-4.15
/cherry-pick release-4.14

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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@gnufied: #2095 failed to apply on top of branch "release-4.15":

Applying: UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
Using index info to reconstruct a base tree...
M	pkg/scheduler/framework/plugins/volumebinding/binder.go
M	pkg/scheduler/framework/plugins/volumebinding/binder_test.go
M	pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
M	pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
M	pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
M	pkg/scheduler/schedule_one_test.go
M	pkg/volume/util/util_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/volume/util/util_test.go
Auto-merging pkg/scheduler/schedule_one_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/schedule_one_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/binder_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/binder_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/binder.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/binder.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
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.17
/cherry-pick release-4.16
/cherry-pick release-4.15
/cherry-pick release-4.14

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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@gnufied: #2095 failed to apply on top of branch "release-4.14":

Applying: UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
Using index info to reconstruct a base tree...
M	pkg/scheduler/framework/plugins/volumebinding/binder.go
M	pkg/scheduler/framework/plugins/volumebinding/binder_test.go
M	pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
M	pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
M	pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
M	pkg/scheduler/schedule_one_test.go
M	pkg/volume/util/util.go
M	pkg/volume/util/util_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/volume/util/util_test.go
Auto-merging pkg/volume/util/util.go
Auto-merging pkg/scheduler/schedule_one_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/schedule_one_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/binder_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/binder_test.go
Auto-merging pkg/scheduler/framework/plugins/volumebinding/binder.go
CONFLICT (content): Merge conflict in pkg/scheduler/framework/plugins/volumebinding/binder.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
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.17
/cherry-pick release-4.16
/cherry-pick release-4.15
/cherry-pick release-4.14

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-sigs/prow repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-pod
This PR has been included in build openshift-enterprise-pod-container-v4.18.0-202409251410.p0.g947ea2f.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-hyperkube
This PR has been included in build openshift-enterprise-hyperkube-container-v4.18.0-202409251410.p0.g947ea2f.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-kube-apiserver-artifacts
This PR has been included in build ose-installer-kube-apiserver-artifacts-container-v4.18.0-202409251410.p0.g947ea2f.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bertinatto bertinatto bertinatto left review comments

@deads2k deads2k Awaiting requested review from deads2k

@tkashem tkashem Awaiting requested review from tkashem

Assignees

@bertinatto bertinatto

@dobsonj dobsonj

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backports/validated-commits Indicates that all commits come to merged upstream PRs. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@gnufied @openshift-ci-robot @openshift-cherrypick-robot @dobsonj @jsafrane @openshift-bot @bertinatto @AxeZhan