Skip to content

Commit f220d06

Browse files
committed
OCPBUGS-49997: Inhanced the info for the k8s.v1.cni.cncf.io/policy-for annotation
1 parent 54cb924 commit f220d06

6 files changed

+11
-9
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@ kind: MultiNetworkPolicy
1818
1919
* You must use the `multi-networkpolicy` resource name when using the CLI to interact with multi-network policies. For example, you can view a multi-network policy object with the `oc get multi-networkpolicy <name>` command where `<name>` is the name of a multi-network policy.
2020
21-
* You must specify an annotation with the name of the network attachment definition that defines the macvlan or SR-IOV additional network:
21+
* You can use the `k8s.v1.cni.cncf.io/policy-for` annotation on a `MultiNetworkPolicy` object to point to a `NetworkAttachmentDefinition` (NAD) custom resource (CR). The NAD CR defines the network to which the policy applies.
2222
+
23+
.Example multi-network policy that includes the `k8s.v1.cni.cncf.io/policy-for` annotation
2324
[source,yaml]
2425
----
2526
apiVersion: k8s.cni.cncf.io/v1beta1
2627
kind: MultiNetworkPolicy
2728
metadata:
2829
annotations:
29-
k8s.v1.cni.cncf.io/policy-for: <network_name>
30+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
3031
----
3132
+
3233
--
3334
where:
3435
36+
`<namespace_name>`:: Specifies the namespace name.
3537
`<network_name>`:: Specifies the name of a network attachment definition.
3638
--

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ metadata:
4848
namespace: default
4949
ifdef::multi[]
5050
annotations:
51-
k8s.v1.cni.cncf.io/policy-for: <network_name>
51+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
5252
endif::multi[]
5353
spec:
5454
podSelector:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ metadata:
5151
namespace: default
5252
ifdef::multi[]
5353
annotations:
54-
k8s.v1.cni.cncf.io/policy-for: <network_name>
54+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
5555
endif::multi[]
5656
spec:
5757
podSelector:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ metadata:
5050
namespace: default
5151
ifdef::multi[]
5252
annotations:
53-
k8s.v1.cni.cncf.io/policy-for: <network_name>
53+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
5454
endif::multi[]
5555
spec:
5656
policyTypes:

modules/nw-networkpolicy-create-cli.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ metadata:
9898
name: allow-same-namespace
9999
ifdef::multi[]
100100
annotations:
101-
k8s.v1.cni.cncf.io/policy-for: <network_name>
101+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
102102
endif::multi[]
103103
spec:
104104
podSelector:
@@ -133,7 +133,7 @@ metadata:
133133
name: allow-traffic-pod
134134
ifdef::multi[]
135135
annotations:
136-
k8s.v1.cni.cncf.io/policy-for: <network_name>
136+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
137137
endif::multi[]
138138
spec:
139139
podSelector:
@@ -180,7 +180,7 @@ metadata:
180180
name: api-allow
181181
ifdef::multi[]
182182
annotations:
183-
k8s.v1.cni.cncf.io/policy-for: <network_name>
183+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name>
184184
endif::multi[]
185185
spec:
186186
podSelector:

modules/nw-networkpolicy-deny-all-allowed.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ metadata:
4242
name: deny-by-default
4343
namespace: default <1>
4444
annotations:
45-
k8s.v1.cni.cncf.io/policy-for: <network_name> <2>
45+
k8s.v1.cni.cncf.io/policy-for:<namespace_name>/<network_name> <2>
4646
spec:
4747
podSelector: {} <3>
4848
ingress: [] <4>

0 commit comments

Comments
 (0)