Document new nets fields.

projectcalico · Jul 10, 2017 · de0fbea · de0fbea
1 parent de0528c
commit de0fbea
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/master/getting-started/bare-metal/bare-metal.md b/master/getting-started/bare-metal/bare-metal.md
@@ -208,7 +208,8 @@ cat << EOF | calicoctl create -f -
     - action: allow
       protocol: tcp
       source:
-        net: "<your management CIDR>"
+        nets:
+        - "<your management CIDR>"
       destination:
         ports: [22]
     - action: allow
@@ -217,7 +218,8 @@ cat << EOF | calicoctl create -f -
     - action: allow
       protocol: tcp
       destination:
-        net: "<your etcd IP>/32"
+        nets:
+        - "<your etcd IP>/32"
         ports: [<your etcd ports>]
     - action: allow
       protocol: udp

diff --git a/master/getting-started/mesos/tutorials/launching-tasks.md b/master/getting-started/mesos/tutorials/launching-tasks.md
@@ -104,7 +104,8 @@ spec:
   - action: allow
     protocol: tcp
     source:
-      net: 172.24.197.101/32
+      nets:
+      - 172.24.197.101/32
     destination:
       ports: [80]
 EOF

diff --git a/master/reference/calicoctl/resources/policy.md b/master/reference/calicoctl/resources/policy.md
@@ -41,7 +41,7 @@ spec:
 
 | Field | Description  | Accepted Values   | Schema |
 |-------|--------------|-------------------|--------|
-| name | The name of the policy. |         | string |
+| name  | The name of the policy. |         | string |
 
 
 #### Spec
@@ -92,8 +92,10 @@ applied action is deny.
 |-------------|-----------------------------|-------------------|--------|------------|
 | tag (deprecated)      | Match on tag. |  | string | |
 | notTag (deprecated)   | Negative match on tag. |  | string | |
-| net    | Match on CIDR. | Valid IPv4 or IPv6 CIDR  | cidr | |
-| notNet | Negative match on CIDR. | Valid IPv4 or IPv6 CIDR | cidr | |
+| net                   | Deprecated (use "nets" instead): Match on CIDR. | Valid IPv4 or IPv6 CIDR  | cidr | |
+| nets                  | Match any one of the listed CIDRs. | List of valid IPv4 or IPv6 CIDRs  | list of cidr |
+| notNet                | Deprecated (use "notNets" instead): Negative match on CIDR. | Valid IPv4 or IPv6 CIDR | cidr | |
+| nets                  | Negative match on CIDRs. | List of valid IPv4 or IPv6 CIDRs  | list of cidr |
 | selector    | Positive match on selected endpoints. | Valid selector | [selector](#selector) | |
 | notSelector | Negative match on selected endpoints. | Valid selector | [selector](#selector) | |
 | ports | Positive match on the specified ports | | list of [ports](#ports) | |

diff --git a/master/reference/calicoctl/resources/profile.md b/master/reference/calicoctl/resources/profile.md
@@ -30,7 +30,8 @@ spec:
   ingress:
   - action: deny
     source:
-      net: 10.0.20.0/24
+      nets:
+      - 10.0.20.0/24
   - action: allow
     source:
       selector: profile == 'profile1'
@@ -80,8 +81,10 @@ spec:
 |-------------|-----------------------------|-------------------|--------|------------|
 | tag (deprecated)      | Positive match on tag. |  | string | |
 | notTag (deprecated)   | Negative match on tag. |  | string | |
-| net    | Match on CIDR. | Valid IPv4 or IPv6 CIDR  | cidr | |
-| notNet | Negative match on CIDR. | Valid IPv4 or IPv6 CIDR | cidr | |
+| net                   | Deprecated (use "nets" instead): Match on CIDR. | Valid IPv4 or IPv6 CIDR  | cidr | |
+| nets                  | Match any one of the listed CIDRs. | List of valid IPv4 or IPv6 CIDRs  | list of cidr |
+| notNet                | Deprecated (use "notNets" instead): Negative match on CIDR. | Valid IPv4 or IPv6 CIDR | cidr | |
+| nets                  | Negative match on CIDRs. | List of valid IPv4 or IPv6 CIDRs  | list of cidr |
 | selector    | Positive match on selected endpoints. | | [selector](#selector) | |
 | notSelector | Negative match on selected endpoints. | | [selector](#selector) | |
 | ports | Positive match on the specified ports | | list of [ports](#ports) | |