Skip to content

Commit dfc19bf

Browse files
jab-rhjab-rh
authored
Merge pull request #66581 from jab-rh/fix-ifeval-multi-network-ovn-k8s
Add OVN-Kubernetes explicitly and avoid ifeval
2 parents f18c627 + 72fed98 commit dfc19bf

18 files changed

+223
-263
lines changed

‎modules/nw-multi-network-policy-differences.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * networking/multiple_networks/configuring-multi-network-policy.adoc
4+
5+
:_content-type: CONCEPT
16
[id="nw-multi-network-policy-differences_{context}"]
27
= Differences between multi-network policy and network policy
38

‎modules/nw-networkpolicy-allow-application-all-namespaces.adoc

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Module included in the following assemblies:
22
//
33
// * networking/multiple_networks/configuring-multi-network-policy.adoc
4+
// * networking/network_policy/creating-network-policy.adoc
5+
46
:name: network
57
:role: admin
6-
ifeval::[{product-version} >= 4.6]
7-
:ovn:
8-
endif::[]
98
ifeval::["{context}" == "configuring-multi-network-policy"]
109
:multi:
1110
:name: multi-network
@@ -16,7 +15,6 @@ endif::[]
1615
[id="nw-networkpolicy-allow-traffic-from-all-applications_{context}"]
1716
= Creating a {name} policy allowing traffic to an application from all namespaces
1817

19-
2018
[NOTE]
2119
====
2220
If you log in with a user with the `cluster-admin` role, then you can create a network policy in any namespace in the cluster.
@@ -26,14 +24,7 @@ Follow this procedure to configure a policy that allows traffic from all pods in
2624

2725
.Prerequisites
2826

29-
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as
30-
ifndef::ovn[]
31-
the OpenShift SDN network provider with `mode: NetworkPolicy` set.
32-
endif::ovn[]
33-
ifdef::ovn[]
34-
the OVN-Kubernetes network provider or the OpenShift SDN network provider with `mode: NetworkPolicy` set.
35-
endif::ovn[]
36-
This mode is the default for OpenShift SDN.
27+
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
3728
* You installed the OpenShift CLI (`oc`).
3829
* You are logged in to the cluster with a user with `{role}` privileges.
3930
* You are working in the namespace that the {name} policy applies to.
@@ -145,4 +136,10 @@ Commercial support is available at
145136
<p><em>Thank you for using nginx.</em></p>
146137
</body>
147138
</html>
148-
----
139+
----
140+
141+
ifdef::multi[]
142+
:!multi:
143+
endif::multi[]
144+
:!name:
145+
:!role:

‎modules/nw-networkpolicy-allow-application-particular-namespace.adoc

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Module included in the following assemblies:
22
//
33
// * networking/multiple_networks/configuring-multi-network-policy.adoc
4+
// * networking/network_policy/creating-network-policy.adoc
5+
46
:name: network
57
:role: admin
6-
ifeval::[{product-version} >= 4.6]
7-
:ovn:
8-
endif::[]
98
ifeval::["{context}" == "configuring-multi-network-policy"]
109
:multi:
1110
:name: multi-network
@@ -28,14 +27,7 @@ Follow this procedure to configure a policy that allows traffic to a pod with th
2827
2928
.Prerequisites
3029

31-
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as
32-
ifndef::ovn[]
33-
the OpenShift SDN network provider with `mode: NetworkPolicy` set.
34-
endif::ovn[]
35-
ifdef::ovn[]
36-
the OVN-Kubernetes network provider or the OpenShift SDN network provider with `mode: NetworkPolicy` set.
37-
endif::ovn[]
38-
This mode is the default for OpenShift SDN.
30+
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
3931
* You installed the OpenShift CLI (`oc`).
4032
* You are logged in to the cluster with a user with `{role}` privileges.
4133
* You are working in the namespace that the {name} policy applies to.
@@ -195,4 +187,8 @@ Commercial support is available at
195187
</html>
196188
----
197189

198-
190+
ifdef::multi[]
191+
:!multi:
192+
endif::multi[]
193+
:!name:
194+
:!role:

‎modules/nw-networkpolicy-allow-external-clients.adoc

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Module included in the following assemblies:
22
//
33
// * networking/multiple_networks/configuring-multi-network-policy.adoc
4+
// * networking/network_policy/creating-network-policy.adoc
5+
46
:name: network
57
:role: admin
6-
ifeval::[{product-version} >= 4.6]
7-
:ovn:
8-
endif::[]
98
ifeval::["{context}" == "configuring-multi-network-policy"]
109
:multi:
1110
:name: multi-network
@@ -27,14 +26,7 @@ Follow this procedure to configure a policy that allows external service from th
2726

2827
.Prerequisites
2928

30-
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as
31-
ifndef::ovn[]
32-
the OpenShift SDN network provider with `mode: NetworkPolicy` set.
33-
endif::ovn[]
34-
ifdef::ovn[]
35-
the OVN-Kubernetes network provider or the OpenShift SDN network provider with `mode: NetworkPolicy` set.
36-
endif::ovn[]
37-
This mode is the default for OpenShift SDN.
29+
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
3830
* You installed the OpenShift CLI (`oc`).
3931
* You are logged in to the cluster with a user with `{role}` privileges.
4032
* You are working in the namespace that the {name} policy applies to.
@@ -91,4 +83,10 @@ endif::multi[]
9183

9284
This policy allows traffic from all resources, including external traffic as illustrated in the following diagram:
9385

94-
image::292_OpenShift_Configuring_multi-network_policy_1122.png[Allow traffic from external clients]
86+
image::292_OpenShift_Configuring_multi-network_policy_1122.png[Allow traffic from external clients]
87+
88+
ifdef::multi[]
89+
:!multi:
90+
endif::multi[]
91+
:!name:
92+
:!role:

‎modules/nw-networkpolicy-audit-concept.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * networking/ovn_kubernetes_network_provider/logging-network-policy.adoc
4+
5+
:_content-type: CONCEPT
16
[id="nw-networkpolicy-audit-concept_{context}"]
27
= Audit logging
38

‎modules/nw-networkpolicy-audit-configure.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * networking/ovn_kubernetes_network_provider/logging-network-policy.adoc
4+
15
:_content-type: PROCEDURE
26
[id="nw-networkpolicy-audit-configure_{context}"]
37
= Configuring egress firewall and network policy auditing for a cluster

‎modules/nw-networkpolicy-audit-disable.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * networking/ovn_kubernetes_network_provider/logging-network-policy.adoc
4+
15
:_content-type: PROCEDURE
26
[id="nw-networkpolicy-audit-disable_{context}"]
37
= Disabling egress firewall and network policy audit logging for a namespace

‎modules/nw-networkpolicy-audit-enable.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * networking/ovn_kubernetes_network_provider/logging-network-policy.adoc
4+
15
:_content-type: PROCEDURE
26
[id="nw-networkpolicy-audit-enable_{context}"]
37
= Enabling egress firewall and network policy audit logging for a namespace

‎modules/nw-networkpolicy-create-cli.adoc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
:name: network
88
:role: admin
9-
ifeval::[{product-version} >= 4.6]
10-
:ovn:
11-
endif::[]
129
ifeval::["{context}" == "configuring-multi-network-policy"]
1310
:multi:
1411
:name: multi-network
@@ -30,14 +27,7 @@ endif::multi[]
3027

3128
.Prerequisites
3229

33-
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as
34-
ifndef::ovn[]
35-
the OpenShift SDN network provider with `mode: NetworkPolicy` set.
36-
endif::ovn[]
37-
ifdef::ovn[]
38-
the OVN-Kubernetes network provider or the OpenShift SDN network provider with `mode: NetworkPolicy` set.
39-
endif::ovn[]
40-
This mode is the default for OpenShift SDN.
30+
* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
4131
* You installed the OpenShift CLI (`oc`).
4232
* You are logged in to the cluster with a user with `{role}` privileges.
4333
* You are working in the namespace that the {name} policy applies to.
@@ -239,9 +229,6 @@ multinetworkpolicy.k8s.cni.cncf.io/deny-by-default created
239229
endif::multi[]
240230
----
241231

242-
ifdef::ovn[]
243-
:!ovn:
244-
endif::ovn[]
245232
ifdef::multi[]
246233
:!multi:
247234
endif::multi[]

‎modules/nw-networkpolicy-create-ocm.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Module included in the following assemblies:
22
//
33
// * networking/network_policy/creating-network-policy.adoc
4+
// * networking/multiple_networks/configuring-multi-network-policy.adoc
45
// * post_installation_configuration/network-configuration.adoc
56

67
:_content-type: PROCEDURE

0 commit comments

Comments
 (0)