Merge pull request #88691 from openshift-cherrypick-robot/cherry-pick-88642-to-enterprise-4.17

stevsmit · web-flow · commit 731d6b29d72d · 2025-02-17T09:09:17.000-05:00
[enterprise-4.17] Minor follow up to OCPBUGS 43762
diff --git a/modules/nw-ovn-k-day-2-masq-subnet.adoc b/modules/nw-ovn-k-day-2-masq-subnet.adoc
@@ -26,7 +26,7 @@ $ oc patch networks.operator.openshift.io cluster --type=merge -p '{"spec":{"def
 +
 where:
 
-`ipv4_masquerade_subnet`:: Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. The default value for IPv4 is `169.254.169.0/29`.
+`ipv4_masquerade_subnet`:: Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. In versions of {product-title} earlier than 4.17, the default value for IPv4 was `169.254.169.0/29`, and clusters that were upgraded to version 4.17 maintain this value. For new clusters starting from version 4.17, the default value is `169.254.0.0/17`. 
 
 `ipv6_masquerade_subnet`:: Specifies an IP address to be used as the IPv6 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. The default value for IPv6 is `fd69::/125`.
 
@@ -39,4 +39,4 @@ $ oc patch networks.operator.openshift.io cluster --type=merge -p '{"spec":{"def
 +
 where:
 
-`ipv4_masquerade_subnet`:: Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. The default value for IPv4 is `169.254.169.0/29`.
+`ipv4_masquerade_subnet`::Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. In versions of {product-title} earlier than 4.17, the default value for IPv4 was `169.254.169.0/29`, and clusters that were upgraded to version 4.17 maintain this value. For new clusters starting from version 4.17, the default value is `169.254.0.0/17`.

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ $ oc patch networks.operator.openshift.io cluster --type=merge -p '{"spec":{"def`
`26`	`26`	`+`
`27`	`27`	`where:`
`28`	`28`
`29`		-`ipv4_masquerade_subnet`:: Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. The default value for IPv4 is `169.254.169.0/29`.
	`29`	+`ipv4_masquerade_subnet`:: Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. In versions of {product-title} earlier than 4.17, the default value for IPv4 was `169.254.169.0/29`, and clusters that were upgraded to version 4.17 maintain this value. For new clusters starting from version 4.17, the default value is `169.254.0.0/17`.
`30`	`30`
`31`	`31`	`ipv6_masquerade_subnet`:: Specifies an IP address to be used as the IPv6 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. The default value for IPv6 is `fd69::/125`.
`32`	`32`
`@@ -39,4 +39,4 @@ $ oc patch networks.operator.openshift.io cluster --type=merge -p '{"spec":{"def`
`39`	`39`	`+`
`40`	`40`	`where:`
`41`	`41`
`42`		-`ipv4_masquerade_subnet`:: Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. The default value for IPv4 is `169.254.169.0/29`.
	`42`	+`ipv4_masquerade_subnet`::Specifies an IP address to be used as the IPv4 masquerade subnet. This range cannot overlap with any other subnets used by {product-title} or on the host itself. In versions of {product-title} earlier than 4.17, the default value for IPv4 was `169.254.169.0/29`, and clusters that were upgraded to version 4.17 maintain this value. For new clusters starting from version 4.17, the default value is `169.254.0.0/17`.