Skip to content

OCPBUGS-27961 Procedure for configuring Whereabouts IP reconciler schedule #71081

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

Merged
merged 1 commit into from
Feb 8, 2024

Conversation

kquinn1204
Copy link
Contributor

@kquinn1204 kquinn1204 commented Feb 1, 2024

[OCPBUGS-27961]: Procedure for configuring Whereabouts IP reconciler

Version(s): 4.15, 4.14 and main

Issue: https://issues.redhat.com/browse/OCPBUGS-27961 (OCPBUGS](https://issues.redhat.com/browse/OCPBUGS-26986)

Link to docs preview: https://71081--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/multiple_networks/configuring-additional-network#nw-multus-configuring-whereabouts-ip-reconciler-schedule_configuring-additional-network

QE review:

  • QE has approved this change.

Additional information:
See PR #70818.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 1, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Feb 1, 2024

🤖 Thu Feb 08 17:36:26 - Prow CI generated the docs preview: https://71081--ocpdocs-pr.netlify.app

@kquinn1204
Copy link
Contributor Author

/retest

@kquinn1204
Copy link
Contributor Author

@cgoncalves @liornoy please add LGTM if happy with changes

@kquinn1204
Copy link
Contributor Author

/label telco

@openshift-ci openshift-ci bot added the telco Label for all Telco PRs label Feb 2, 2024
@kquinn1204
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Feb 2, 2024
@cgoncalves
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2024
@cbippley
Copy link
Contributor

cbippley commented Feb 2, 2024

/label peer-review-in-progress
/remove-label peer-review-needed

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 2, 2024
Copy link
Contributor

@cbippley cbippley left a comment

Choose a reason for hiding this comment

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

A couple of suggestions. Don't forget to get an ACK from QE before asking for a merge review. Great job!

@cbippley
Copy link
Contributor

cbippley commented Feb 2, 2024

/label peer-review-done
/remove-label peer-review-in-progress

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR lgtm Indicates that a PR is ready to be merged. labels Feb 2, 2024
Copy link

openshift-ci bot commented Feb 5, 2024

New changes are detected. LGTM label has been removed.

@kquinn1204
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Feb 5, 2024
@kquinn1204
Copy link
Contributor Author

/label remove-merge-review-needed

Copy link

openshift-ci bot commented Feb 5, 2024

@kquinn1204: The label(s) /label remove-merge-review-needed cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, cloud-experts, cnv, dev-tools, distributed-tracing, ims, jira/valid-bug, merge-review-in-progress, merge-review-needed, mtc, multi-arch, oadp, peer-review-done, peer-review-in-progress, peer-review-needed, rhacs, rhv, sd-docs, serverless, service-mesh, sme-review-done, sme-review-needed, staff-eng-approved, telco. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label remove-merge-review-needed

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.

@kquinn1204
Copy link
Contributor Author

/remove-label merge-review-needed

@adellape adellape self-assigned this Feb 7, 2024
@adellape adellape added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Feb 7, 2024
@adellape adellape added branch/enterprise-4.15 and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Feb 7, 2024
@kquinn1204
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Feb 8, 2024
@kquinn1204
Copy link
Contributor Author

@adellape should be ready now for a merge. Thanks for your help.

@adellape adellape added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Feb 8, 2024
…edule

making edits to reflect my cluster test
Copy link

openshift-ci bot commented Feb 8, 2024

@kquinn1204: 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.

@adellape adellape merged commit 5baed55 into openshift:main Feb 8, 2024
@adellape
Copy link
Contributor

adellape commented Feb 8, 2024

/cherrypick enterprise-4.15

@adellape
Copy link
Contributor

adellape commented Feb 8, 2024

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@adellape: new pull request created: #71388

In response to this:

/cherrypick enterprise-4.15

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.

@openshift-cherrypick-robot

@adellape: new pull request created: #71389

In response to this:

/cherrypick enterprise-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/test-infra repository.

@adellape adellape added branch/enterprise-4.14 and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Feb 8, 2024
@adellape
Copy link
Contributor

adellape commented Feb 9, 2024

Chatted further with @kquinn1204 and determined this can be backported/cherrypicked also to 4.13 (per https://access.redhat.com/errata/RHSA-2024:0660 shipping). Attempting now.

@adellape
Copy link
Contributor

adellape commented Feb 9, 2024

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@adellape: #71081 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-27961 Procedure for configuring Whereabouts IP reconciler schedule
.git/rebase-apply/patch:27: trailing whitespace.
Use this procedure to change the frequency at which the IP reconciler runs. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/nw-multus-ipam-object.adoc
M	networking/multiple_networks/configuring-additional-network.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/multiple_networks/configuring-additional-network.adoc
CONFLICT (content): Merge conflict in networking/multiple_networks/configuring-additional-network.adoc
Auto-merging modules/nw-multus-ipam-object.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-27961 Procedure for configuring Whereabouts IP reconciler schedule
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:

/cherrypick enterprise-4.13

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
branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files. telco Label for all Telco PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants