Skip to content

NP-641: Avoid firewalld flush of iptables#1300

Merged
openshift-merge-robot merged 1 commit intomainfrom
USHIFT-789
Jan 31, 2023
Merged

NP-641: Avoid firewalld flush of iptables#1300
openshift-merge-robot merged 1 commit intomainfrom
USHIFT-789

Conversation

@mangelajo
Copy link
Contributor

Disables firewalld access to iptables related nftables translator,
this avoids firewalld flush of iptables under any circumstance,
firewalld will work at nftables level, while MicroShift/OVN can
continue to work at iptables level (translated to nft) under the hood.

@openshift-ci openshift-ci bot requested review from pacevedom and stlaz January 27, 2023 17:11
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2023
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to rephrase this explanation. I would not include a reference to the issue, which is currently private. Also, we should only explain what we're trying to solve without future statements.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We have talked about this in the past, but IMHO, as a project maintainer, it always helped me to figure out why certain things were done in projects, it is true that you can always look at the code/commit and find the original reference. But for example it gets harder when the file has moved around and the git reference becomes harder to track.

Copy link
Contributor

Choose a reason for hiding this comment

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

This file will end up on user systems, so we need to review the text in the comments, like documentation. Let's discuss it further and reach a conclusion backed up by our content experts.

Copy link
Contributor

Choose a reason for hiding this comment

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

I would not include NP-641 issue reference in the comment.

Copy link
Contributor Author

@mangelajo mangelajo Jan 30, 2023

Choose a reason for hiding this comment

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

It was standard practice in rpm packaging at RedHat to include references to bugs, in fact at some point in history I remember you could not push a packaging change without the reference to a bz# has this changed?

Copy link
Contributor

Choose a reason for hiding this comment

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

The current history in the file does not include any issue references. If we decide to reference any issues, we should probably trace the history back and add it all along. For now, I would stick out.

@ggiguash
Copy link
Contributor

ggiguash commented Jan 29, 2023

/retitle NP-641: Avoid firewalld flush of iptables

@openshift-ci openshift-ci bot changed the title Avoid firewalld flush of iptables NP-641: Avoid firewalld flush of iptables Jan 29, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 29, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 29, 2023

@mangelajo: This pull request references NP-641 which is a valid jira issue.

Details

In response to this:

Disables firewalld access to iptables related nftables translator,
this avoids firewalld flush of iptables under any circumstance,
firewalld will work at nftables level, while MicroShift/OVN can
continue to work at iptables level (translated to nft) under the hood.

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.

@mangelajo mangelajo requested review from fzdarsky and oglok January 30, 2023 08:24
@mangelajo
Copy link
Contributor Author

/hold I am doing more testing this morning to verify

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 30, 2023
@mangelajo
Copy link
Contributor Author

/unhold

It seems to work well on my tests.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 30, 2023
Disables firewalld access to iptables related nftables translator,
this avoids firewalld flush of iptables under any circumstance,
firewalld will work at nftables level, while MicroShift/OVN can
continue to work at iptables level (translated to nft) under the hood.
@mangelajo
Copy link
Contributor Author

/retest

1 similar comment
@pacevedom
Copy link
Contributor

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 31, 2023

@mangelajo: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@zshi-redhat
Copy link
Contributor

/approve

@ggiguash
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 31, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 31, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, mangelajo, zshi-redhat

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [ggiguash,mangelajo,zshi-redhat]

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

@openshift-merge-robot openshift-merge-robot merged commit 3255867 into main Jan 31, 2023
@openshift-merge-robot openshift-merge-robot deleted the USHIFT-789 branch January 31, 2023 09:32
@mangelajo
Copy link
Contributor Author

/cherrypick release-4.12

@openshift-cherrypick-robot

@mangelajo: #1300 failed to apply on top of branch "release-4.12":

Applying: Avoid firewalld flush of iptables
Using index info to reconstruct a base tree...
M	packaging/rpm/microshift.spec
Falling back to patching base and 3-way merge...
Auto-merging packaging/rpm/microshift.spec
CONFLICT (content): Merge conflict in packaging/rpm/microshift.spec
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Avoid firewalld flush of iptables
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".

Details

In response to this:

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

zshi-redhat added a commit to zshi-redhat/microshift that referenced this pull request Feb 14, 2023
`firewall --reload` won't flush iptable rules after the fix:
openshift#1300

Signed-off-by: Zenghui Shi <zshi@redhat.com>
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. 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

Development

Successfully merging this pull request may close these issues.

7 participants