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

feat:firewalld和ufw同时存在时,不进行操作 #6688

Merged
merged 1 commit into from
Oct 11, 2024

Conversation

zengzhuozhen
Copy link
Contributor

@zengzhuozhen zengzhuozhen commented Oct 11, 2024

What this PR does / why we need it?

firewalled和ufw同时存在时操作报错.
原因: 使用ufw进行防火墙管理,如果系统同时安装了firewalled,会导致规则覆盖,因为代码优先使用firewalled

Summary of your change

Please indicate you've done the following:

  • Made sure tests are passing and test coverage is added if needed.
  • Made sure commit message follow the rule of Conventional Commits specification.
  • Considered the docs impact and opened a new docs issue or PR with docs changes if needed.

Copy link

f2c-ci-robot bot commented Oct 11, 2024

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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.

Copy link

f2c-ci-robot bot commented Oct 11, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign zhengkunwang223 for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@ssongliu ssongliu merged commit 175b7b8 into 1Panel-dev:dev Oct 11, 2024
1 check was pending
@ssongliu
Copy link
Member

感谢贡献!

wanghe-fit2cloud pushed a commit that referenced this pull request Oct 14, 2024
Co-authored-by: zengzz01 <zengzz01@mingyuanyun.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants