OSDOCS-15470-security: Removed unneccessary code blocks for net secur… #96737

dfitzmau · 2025-07-28T09:49:40Z

This PR removes low-level code blocks from the Networking Security documentation. Tried to remove passive from some files but this might distract from the core task.

Version(s):
4.16+

Issue:
OSDOCS-15470

Link to docs preview:

Network security

QE has approved this change

ocpdocs-previewbot · 2025-07-28T10:26:50Z

🤖 Wed Aug 13 14:37:54 - Prow CI generated the docs preview:
https://96737--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

asood-rh · 2025-08-13T14:05:34Z

modules/cnf-performing-end-to-end-tests-junit-test-output.adoc

 +
 --
-`junit` :: Is the folder where the junit report is stored.
+`junit` :: The folder that stores the `junit` report.


Should it be elaboration of file_name here instead junit folder?

Thanks. Updated to state:

file_name :: The name of the XML report file.

…ity docs

openshift-ci · 2025-08-13T14:39:07Z

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

asood-rh · 2025-08-13T18:14:35Z

@dfitzmau Looked all sections except the ipsec ones, look good to me.

@anuragthehatter @huiran0826 for last two files, changes related to ipsec

huiran0826 · 2025-08-14T02:30:04Z

/lgtm

xenolinux

LGTM

xenolinux · 2025-08-14T09:58:42Z

/cherrypick enterprise-4.19

xenolinux · 2025-08-14T09:58:46Z

/cherrypick enterprise-4.18

xenolinux · 2025-08-14T09:58:49Z

/cherrypick enterprise-4.17

xenolinux · 2025-08-14T09:58:52Z

/cherrypick enterprise-4.16

xenolinux · 2025-08-14T09:58:56Z

/cherrypick enterprise-4.20

openshift-cherrypick-robot · 2025-08-14T09:59:30Z

@xenolinux: new pull request created: #97579

In response to this:

/cherrypick enterprise-4.19

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 · 2025-08-14T09:59:32Z

@xenolinux: #96737 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-15470-security: Removed unneccessary code blocks for net security docs
.git/rebase-apply/patch:573: trailing whitespace.
If you enabled IPsec in `Full` mode, as a cluster administrator you can configure options for the mode by adding the `full` schema to `networks.operator.openshift.io`. The `full` schema supports the 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	modules/hcp-deploy-openstack-create.adoc
A	modules/hosted-clusters-openstack-upload-rhcos.adoc
M	modules/nw-ovn-ipsec-enable.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-ipsec-enable.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-ipsec-enable.adoc
CONFLICT (modify/delete): modules/hosted-clusters-openstack-upload-rhcos.adoc deleted in HEAD and modified in OSDOCS-15470-security: Removed unneccessary code blocks for net security docs. Version OSDOCS-15470-security: Removed unneccessary code blocks for net security docs of modules/hosted-clusters-openstack-upload-rhcos.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-deploy-openstack-create.adoc deleted in HEAD and modified in OSDOCS-15470-security: Removed unneccessary code blocks for net security docs. Version OSDOCS-15470-security: Removed unneccessary code blocks for net security docs of modules/hcp-deploy-openstack-create.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15470-security: Removed unneccessary code blocks for net security docs

In response to this:

/cherrypick enterprise-4.18

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 · 2025-08-14T09:59:35Z

@xenolinux: #96737 failed to apply on top of branch "enterprise-4.17":

Patch is empty.
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

In response to this:

/cherrypick 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.

openshift-cherrypick-robot · 2025-08-14T09:59:41Z

@xenolinux: #96737 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-15470-security: Removed unneccessary code blocks for net security docs
.git/rebase-apply/patch:573: trailing whitespace.
If you enabled IPsec in `Full` mode, as a cluster administrator you can configure options for the mode by adding the `full` schema to `networks.operator.openshift.io`. The `full` schema supports the 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	installing/installing_aws/ipi/installing-aws-localzone.adoc
A	modules/hcp-deploy-openstack-create.adoc
A	modules/hosted-clusters-openstack-upload-rhcos.adoc
M	modules/nw-egressnetworkpolicy-create.adoc
M	modules/nw-networkpolicy-allow-application-all-namespaces.adoc
M	modules/nw-networkpolicy-allow-application-particular-namespace.adoc
M	modules/nw-networkpolicy-allow-external-clients.adoc
M	modules/nw-networkpolicy-create-cli.adoc
M	modules/nw-networkpolicy-delete-cli.adoc
M	modules/nw-networkpolicy-deny-all-allowed.adoc
M	modules/nw-networkpolicy-project-defaults.adoc
M	modules/nw-ovn-ipsec-enable.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-ipsec-enable.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-ipsec-enable.adoc
Auto-merging modules/nw-networkpolicy-project-defaults.adoc
CONFLICT (content): Merge conflict in modules/nw-networkpolicy-project-defaults.adoc
Auto-merging modules/nw-networkpolicy-deny-all-allowed.adoc
Auto-merging modules/nw-networkpolicy-delete-cli.adoc
Auto-merging modules/nw-networkpolicy-create-cli.adoc
Auto-merging modules/nw-networkpolicy-allow-external-clients.adoc
Auto-merging modules/nw-networkpolicy-allow-application-particular-namespace.adoc
Auto-merging modules/nw-networkpolicy-allow-application-all-namespaces.adoc
Auto-merging modules/nw-egressnetworkpolicy-create.adoc
CONFLICT (modify/delete): modules/hosted-clusters-openstack-upload-rhcos.adoc deleted in HEAD and modified in OSDOCS-15470-security: Removed unneccessary code blocks for net security docs. Version OSDOCS-15470-security: Removed unneccessary code blocks for net security docs of modules/hosted-clusters-openstack-upload-rhcos.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-deploy-openstack-create.adoc deleted in HEAD and modified in OSDOCS-15470-security: Removed unneccessary code blocks for net security docs. Version OSDOCS-15470-security: Removed unneccessary code blocks for net security docs of modules/hcp-deploy-openstack-create.adoc left in tree.
Auto-merging installing/installing_aws/ipi/installing-aws-localzone.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15470-security: Removed unneccessary code blocks for net security docs

In response to this:

/cherrypick 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.

openshift-cherrypick-robot · 2025-08-14T09:59:47Z

@xenolinux: new pull request created: #97580

In response to this:

/cherrypick enterprise-4.20

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.

xenolinux · 2025-08-14T10:13:28Z

/cherrypick enterprise-4.17

openshift-cherrypick-robot · 2025-08-14T10:14:14Z

@xenolinux: #96737 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-15470-security: Removed unneccessary code blocks for net security docs
.git/rebase-apply/patch:573: trailing whitespace.
If you enabled IPsec in `Full` mode, as a cluster administrator you can configure options for the mode by adding the `full` schema to `networks.operator.openshift.io`. The `full` schema supports the 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	modules/hcp-deploy-openstack-create.adoc
A	modules/hosted-clusters-openstack-upload-rhcos.adoc
M	modules/nw-ovn-ipsec-enable.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-ipsec-enable.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-ipsec-enable.adoc
CONFLICT (modify/delete): modules/hosted-clusters-openstack-upload-rhcos.adoc deleted in HEAD and modified in OSDOCS-15470-security: Removed unneccessary code blocks for net security docs. Version OSDOCS-15470-security: Removed unneccessary code blocks for net security docs of modules/hosted-clusters-openstack-upload-rhcos.adoc left in tree.
CONFLICT (modify/delete): modules/hcp-deploy-openstack-create.adoc deleted in HEAD and modified in OSDOCS-15470-security: Removed unneccessary code blocks for net security docs. Version OSDOCS-15470-security: Removed unneccessary code blocks for net security docs of modules/hcp-deploy-openstack-create.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15470-security: Removed unneccessary code blocks for net security docs

In response to this:

/cherrypick 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.

xenolinux · 2025-08-14T10:15:29Z

@dfitzmau 4.16 - 4.18 need manual Cps. Only 4.19 and 4.20 passed :(

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 28, 2025

dfitzmau added branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 28, 2025

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 28, 2025

dfitzmau force-pushed the OSDOCS-15470-security branch 2 times, most recently from 81253fd to 5465d2d Compare July 28, 2025 10:17

dfitzmau force-pushed the OSDOCS-15470-security branch 2 times, most recently from 7801ce5 to f56c9ba Compare July 28, 2025 10:53

asood-rh reviewed Aug 13, 2025

View reviewed changes

OSDOCS-15470-security: Removed unneccessary code blocks for net secur…

c90c8dc

…ity docs

dfitzmau force-pushed the OSDOCS-15470-security branch from f56c9ba to c90c8dc Compare August 13, 2025 14:26

openshift-ci bot assigned huiran0826 Aug 14, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2025

dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 14, 2025

xenolinux 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 14, 2025

xenolinux added this to the Continuous Release milestone Aug 14, 2025

xenolinux reviewed Aug 14, 2025

View reviewed changes

xenolinux merged commit a32aa0d into openshift:main Aug 14, 2025
2 checks passed

xenolinux removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 14, 2025

openshift-cherrypick-robot mentioned this pull request Aug 14, 2025

[enterprise-4.19] OSDOCS-15470-security: Removed unneccessary code blocks for net secur… #97579

Merged

openshift-cherrypick-robot mentioned this pull request Aug 14, 2025

[enterprise-4.20] OSDOCS-15470-security: Removed unneccessary code blocks for net secur… #97580

Merged

OSDOCS-15470-security: Removed unneccessary code blocks for net secur… #96737

OSDOCS-15470-security: Removed unneccessary code blocks for net secur… #96737

Uh oh!

Conversation

dfitzmau commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asood-rh Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

dfitzmau Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Aug 13, 2025

Uh oh!

asood-rh commented Aug 13, 2025

Uh oh!

huiran0826 commented Aug 14, 2025

Uh oh!

xenolinux left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2025

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2025

Uh oh!

xenolinux commented Aug 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dfitzmau commented Jul 28, 2025 •

edited

Loading

ocpdocs-previewbot commented Jul 28, 2025 •

edited

Loading