Skip to content

OCPBUGS-38402: Updated the Example policy configurations for differen… #80393

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
Merged
merged 1 commit into from
Aug 15, 2024
Merged

OCPBUGS-38402: Updated the Example policy configurations for differen… #80393

merged 1 commit into from
Aug 15, 2024

Conversation

dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Aug 13, 2024 •
edited
Loading

Version(s):
4.12+

Issue:
OCPBUGS-38402

Link to docs preview:
Example policy configurations for different interfaces

  • SME has approved this change.
  • QE has approved this change. (Zhanqi Zhao)

Additional information:

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate 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 Aug 13, 2024
@openshift-ci-robot
Copy link

@dfitzmau: This pull request references Jira Issue OCPBUGS-38402, 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:

…t interfaces section

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 13, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 13, 2024 •
edited
Loading

🤖 Thu Aug 15 13:39:19 - Prow CI generated the docs preview:

https://80393--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.html

@dfitzmau dfitzmau force-pushed the OCPBUGS-38402 branch 6 times, most recently from dbc985b to 1d2b018 Compare August 13, 2024 15:33
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 13, 2024
@dfitzmau dfitzmau force-pushed the OCPBUGS-38402 branch 9 times, most recently from 9d1d60e to 2a238a8 Compare August 14, 2024 12:53
@mkowalski
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2024
@dfitzmau
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 Aug 14, 2024
@qiowang721
Copy link

/lgtm

@jab-rh jab-rh added this to the Continuous Release milestone Aug 15, 2024
@jab-rh jab-rh merged commit 0d5cb67 into openshift:main Aug 15, 2024
2 checks passed
@openshift-ci-robot
Copy link

@dfitzmau: Jira Issue OCPBUGS-38402 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-38402

Link to docs preview:
Example policy configurations for different interfaces

  • SME has approved this change.
  • QE has approved this change. (Zhanqi Zhao)

Additional information:

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.

@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

/cherry-pick enterprise-4.17

@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

/cherry-pick enterprise-4.16

@jab-rh jab-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 15, 2024
@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

/cherry-pick enterprise-4.15

@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #80536

In response to this:

/cherry-pick enterprise-4.17

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.

This was referenced Aug 15, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #80537

In response to this:

/cherry-pick enterprise-4.16

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.

@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

/cherry-pick enterprise-4.14

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 15, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #80538

In response to this:

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

@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

/cherry-pick enterprise-4.13

@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

/cherry-pick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #80539

In response to this:

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

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 15, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #80540

In response to this:

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

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 15, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: #80393 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-38402: Updated the Example policy configurations for different interfaces section
Using index info to reconstruct a base tree...
M	networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc
CONFLICT (content): Merge conflict in networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.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-38402: Updated the Example policy configurations for different interfaces section
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 enterprise-4.12

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.

@jab-rh
Copy link
Contributor

jab-rh commented Aug 15, 2024

@dfitzmau, looks like this needs a manual cherry-pick for 4.12, thanks!

@dfitzmau dfitzmau mentioned this pull request Aug 16, 2024
Merged
@jab-rh jab-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lahinson lahinson lahinson left review comments

Assignees

@mkowalski mkowalski

@qiowang721 qiowang721

Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.
8 participants
@dfitzmau @openshift-ci-robot @ocpdocs-previewbot @mkowalski @qiowang721 @jab-rh @openshift-cherrypick-robot @lahinson