From 1bb509c3bb0e85c986158f9fb8de6313aa2127dc Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Thu, 15 Jan 2026 15:15:08 -0500 Subject: [PATCH] Resolves ADV errors in MNW --- modules/nw-multus-advanced-annotations.adoc | 1 - ...-networkpolicy-allow-external-clients.adoc | 2 +- modules/nw-networkpolicy-delete-cli.adoc | 20 ++++++++-------- modules/nw-networkpolicy-edit.adoc | 24 +++++++++---------- modules/nw-networkpolicy-view-cli.adoc | 22 ++++++++--------- .../working-with-multi-network-policy.adoc | 10 ++++++++ .../configuring-multi-network-policy.adoc | 5 +--- 7 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 modules/working-with-multi-network-policy.adoc diff --git a/modules/nw-multus-advanced-annotations.adoc b/modules/nw-multus-advanced-annotations.adoc index a038b5542d..163d09e70f 100644 --- a/modules/nw-multus-advanced-annotations.adoc +++ b/modules/nw-multus-advanced-annotations.adoc @@ -172,7 +172,6 @@ $ oc edit pod ---- + .macvlan CNI plugin JSON configuration object using static IP and MAC address -+ [source,yaml] ---- apiVersion: v1 diff --git a/modules/nw-networkpolicy-allow-external-clients.adoc b/modules/nw-networkpolicy-allow-external-clients.adoc index d756c8eb1d..4112277caa 100644 --- a/modules/nw-networkpolicy-allow-external-clients.adoc +++ b/modules/nw-networkpolicy-allow-external-clients.adoc @@ -92,7 +92,7 @@ $ oc apply -f web-allow-external.yaml + ifndef::microshift[] This policy allows traffic from all resources, including external traffic as illustrated in the following diagram: - ++ image::292_OpenShift_Configuring_multi-network_policy_1122.png[Allow traffic from external clients] endif::microshift[] diff --git a/modules/nw-networkpolicy-delete-cli.adoc b/modules/nw-networkpolicy-delete-cli.adoc index 78908bedd8..47cf205e0b 100644 --- a/modules/nw-networkpolicy-delete-cli.adoc +++ b/modules/nw-networkpolicy-delete-cli.adoc @@ -19,12 +19,19 @@ endif::[] [role="_abstract"] You can delete a {name} policy in a namespace. -ifndef::multi,microshift[] +ifndef::multi[] [NOTE] ==== -If you log in with a user with the `cluster-admin` role, then you can delete any network policy in the cluster. +If you log in with `cluster-admin` privileges, you can delete network policies in any namespace in the cluster. ==== -endif::multi,microshift[] +endif::multi[] + +ifndef::microshift[] +[NOTE] +==== +If you log in with `cluster-admin` privileges, you can delete network policies in any namespace in the cluster. In the web console, you can delete policies directly in YAML or by using the *Actions* menu. +==== +endif::microshift[] .Prerequisites ifndef::microshift[] @@ -55,10 +62,3 @@ ifdef::multi[] endif::multi[] :!name: :!role: - -ifndef::microshift[] -[NOTE] -==== -If you log in to the web console with `cluster-admin` privileges, you have a choice of deleting a network policy in any namespace in the cluster directly in YAML or from the policy in the web console through the *Actions* menu. -==== -endif::microshift[] \ No newline at end of file diff --git a/modules/nw-networkpolicy-edit.adoc b/modules/nw-networkpolicy-edit.adoc index c17b0c9edc..7054dd6c42 100644 --- a/modules/nw-networkpolicy-edit.adoc +++ b/modules/nw-networkpolicy-edit.adoc @@ -16,14 +16,21 @@ endif::[] = Editing a {name} policy [role="_abstract"] -You can edit a {name} policy in a namespace. +To modify existing policy configurations, you can edit a {name} policy in a namespace. Edit policies by modifying the policy file and applying it with `oc apply`, or by using the `oc edit` command directly. -ifndef::multi,microshift[] +ifndef::multi[] [NOTE] ==== -If you log in with a user with the `cluster-admin` role, then you can edit a network policy in any namespace in the cluster. +If you log in with `cluster-admin` privileges, you can edit network policies in any namespace in the cluster. ==== -endif::multi,microshift[] +endif::multi[] + +ifndef::microshift[] +[NOTE] +==== +If you log in with `cluster-admin` privileges, you can edit network policies in any namespace in the cluster. In the web console, you can edit policies directly in YAML or by using the *Actions* menu. +==== +endif::microshift[] .Prerequisites ifndef::microshift[] @@ -90,11 +97,4 @@ ifdef::multi[] :!multi: endif::multi[] :!name: -:!role: - -ifndef::microshift[] -[NOTE] -==== -If you log in to the web console with `cluster-admin` privileges, you have a choice of editing a network policy in any namespace in the cluster directly in YAML or from the policy in the web console through the *Actions* menu. -==== -endif::microshift[] +:!role: \ No newline at end of file diff --git a/modules/nw-networkpolicy-view-cli.adoc b/modules/nw-networkpolicy-view-cli.adoc index fed0398647..eebb28e282 100644 --- a/modules/nw-networkpolicy-view-cli.adoc +++ b/modules/nw-networkpolicy-view-cli.adoc @@ -19,12 +19,19 @@ endif::[] [role="_abstract"] You can examine the {name} policies in a namespace. -ifndef::multi,microshift[] +ifndef::multi[] [NOTE] ==== -If you log in with a user with the `cluster-admin` role, then you can view any network policy in the cluster. +If you log in with `cluster-admin` privileges, you can edit network policies in any namespace in the cluster. ==== -endif::multi,microshift[] +endif::multi[] + +ifndef::microshift[] +[NOTE] +==== +If you log in with `cluster-admin` privileges, you can edit network policies in any namespace in the cluster. In the web console, you can edit policies directly in YAML or by using the *Actions* menu. +==== +endif::microshift[] .Prerequisites @@ -86,11 +93,4 @@ ifdef::multi[] :!multi: endif::multi[] :!name: -:!role: - -ifndef::microshift[] -[NOTE] -==== -If you log in to the web console with `cluster-admin` privileges, you have a choice of viewing a network policy in any namespace in the cluster directly in YAML or from a form in the web console. -==== -endif::microshift[] \ No newline at end of file +:!role: \ No newline at end of file diff --git a/modules/working-with-multi-network-policy.adoc b/modules/working-with-multi-network-policy.adoc new file mode 100644 index 0000000000..b0a47ebfe3 --- /dev/null +++ b/modules/working-with-multi-network-policy.adoc @@ -0,0 +1,10 @@ +// Module included in the following assemblies: +// +// * networking/multiple_networks/configuring-multi-network-policy.adoc + +:_mod-docs-content-type: CONCEPT +[id="working-with-multi-network-policy_{context}"] += Working with multi-network policy + +[role="_abstract"] +To manage network traffic isolation and security for pods on secondary networks, you can create, edit, view, and delete multi-network policies. Before you work with multi-network policies, you must enable multi-network policy support for your cluster. \ No newline at end of file diff --git a/networking/multiple_networks/secondary_networks/configuring-multi-network-policy.adoc b/networking/multiple_networks/secondary_networks/configuring-multi-network-policy.adoc index 6af88a57b9..9df88d68f3 100644 --- a/networking/multiple_networks/secondary_networks/configuring-multi-network-policy.adoc +++ b/networking/multiple_networks/secondary_networks/configuring-multi-network-policy.adoc @@ -30,10 +30,7 @@ include::modules/nw-multi-network-policy-enable.adoc[leveloffset=+1] include::modules/nw-multi-network-policy-ipv6-suppport.adoc[leveloffset=+1] -[id="{context}_working-with-multi-network-policy"] -== Working with multi-network policy - -As a cluster administrator, you can create, edit, view, and delete multi-network policies. Before you do any of these tasks, you must have enabled multi-network policy support for your cluster. +include::modules/working-with-multi-network-policy.adoc[leveloffset=+1] include::modules/nw-networkpolicy-create-cli.adoc[leveloffset=+2]