Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/nw-multus-advanced-annotations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ $ oc edit pod <name>
----
+
.macvlan CNI plugin JSON configuration object using static IP and MAC address
+
[source,yaml]
----
apiVersion: v1
Expand Down
2 changes: 1 addition & 1 deletion modules/nw-networkpolicy-allow-external-clients.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
20 changes: 10 additions & 10 deletions modules/nw-networkpolicy-delete-cli.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down Expand Up @@ -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[]
24 changes: 12 additions & 12 deletions modules/nw-networkpolicy-edit.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down Expand Up @@ -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:
22 changes: 11 additions & 11 deletions modules/nw-networkpolicy-view-cli.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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[]
:!role:
10 changes: 10 additions & 0 deletions modules/working-with-multi-network-policy.adoc
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down