Skip to content

Commit b09c18b

Browse files
authored
Merge pull request #27134 from jboxman/bz-1871145
BZ#1871145 - An IPAM static address must be specified with CIDR
2 parents 05a6553 + e973202 commit b09c18b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

modules/nw-multus-create-network.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ spec:
8484
type: static
8585
staticIPAMConfig:
8686
addresses:
87-
- address: 10.1.1.7
87+
- address: 10.1.1.7/24
8888
----
8989
endif::yaml[]
9090
ifdef::json[]
@@ -111,7 +111,7 @@ spec:
111111
"type": "static",
112112
"addresses": [
113113
{
114-
"address": "191.168.1.23"
114+
"address": "191.168.1.23/24"
115115
}
116116
]
117117
}
@@ -160,7 +160,7 @@ spec:
160160
"type": "static",
161161
"addresses": [
162162
{
163-
"address": "191.168.1.23"
163+
"address": "191.168.1.23/24"
164164
}
165165
]
166166
}
@@ -188,7 +188,7 @@ spec:
188188
"type": "static",
189189
"addresses": [
190190
{
191-
"address": "191.168.1.23"
191+
"address": "191.168.1.23/24"
192192
}
193193
]
194194
}

modules/nw-multus-ipam-object.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ The following JSON describes the configuration for static IP address assignment:
7979
<1> An array describing IP addresses to assign to the virtual interface. Both
8080
IPv4 and IPv6 IP addresses are supported.
8181

82-
<2> An IP address that you specify.
82+
<2> An IP address and network prefix that you specify. For example, if you specify `10.10.21.10/24`, then the additional network is assigned an IP address of `10.10.21.10` and the netmask is `255.255.255.0`.
8383

8484
<3> The default gateway to route egress network traffic to.
8585

8686
<4> An array describing routes to configure inside the pod.
8787

88-
<5> The IP address range in CIDR format.
88+
<5> The IP address range in CIDR format, such as `192.168.17.0/24`, or `0.0.0.0/0` for the default route.
8989

9090
<6> The gateway where network traffic is routed.
9191

@@ -276,13 +276,13 @@ ipamConfig:
276276
<1> A collection of mappings that define IP addresses to assign to the virtual
277277
interface. Both IPv4 and IPv6 IP addresses are supported.
278278

279-
<2> An IP address that you specify.
279+
<2> An IP address and network prefix that you specify. For example, if you specify `10.10.21.10/24`, then the additional network is assigned an IP address of `10.10.21.10` and the netmask is `255.255.255.0`.
280280

281281
<3> The default gateway to route egress network traffic to.
282282

283283
<4> A collection of mappings describing routes to configure inside the pod.
284284

285-
<5> The IP address range in CIDR format.
285+
<5> The IP address range in CIDR format, such as `192.168.17.0/24`, or `0.0.0.0/0` for the default route.
286286

287287
<6> The gateway where network traffic is routed.
288288

0 commit comments

Comments
 (0)