Merge pull request #2641 from arghosh93/OCPBUGS-49662

OCPBUGS-49662: Prevent resetting masquerade subnet

Author: openshift-merge-bot[bot]

bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml

@@ -173,6 +173,15 @@ spec:
             ovn_v6_transit_switch_subnet_opt="--cluster-manager-v6-transit-subnet {{.V6TransitSwitchSubnet}}"
           fi
 
+          ovn_v4_masquerade_subnet_opt=
+          if [[ "{{.V4MasqueradeSubnet}}" != "" ]]; then
+            ovn_v4_masquerade_subnet_opt="--gateway-v4-masquerade-subnet {{.V4MasqueradeSubnet}}"
+          fi
+          ovn_v6_masquerade_subnet_opt=
+          if [[ "{{.V6MasqueradeSubnet}}" != "" ]]; then
+            ovn_v6_masquerade_subnet_opt="--gateway-v6-masquerade-subnet {{.V6MasqueradeSubnet}}"
+          fi
+
           dns_name_resolver_enabled_flag=
           if [[ "{{.DNS_NAME_RESOLVER_ENABLE}}" == "true" ]]; then
             dns_name_resolver_enabled_flag="--enable-dns-name-resolver"
@@ -232,6 +241,8 @@ spec:
             ${ovn_v6_join_subnet_opt} \
             ${ovn_v4_transit_switch_subnet_opt} \
             ${ovn_v6_transit_switch_subnet_opt} \
+            ${ovn_v4_masquerade_subnet_opt} \
+            ${ovn_v6_masquerade_subnet_opt} \
             ${dns_name_resolver_enabled_flag} \
             ${persistent_ips_enabled_flag} \
             ${multi_network_enabled_flag} \

bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml

@@ -124,6 +124,15 @@ spec:
             ovn_v6_transit_switch_subnet_opt="--cluster-manager-v6-transit-subnet {{.V6TransitSwitchSubnet}}"
           fi
 
+          ovn_v4_masquerade_subnet_opt=
+          if [[ "{{.V4MasqueradeSubnet}}" != "" ]]; then
+            ovn_v4_masquerade_subnet_opt="--gateway-v4-masquerade-subnet {{.V4MasqueradeSubnet}}"
+          fi
+          ovn_v6_masquerade_subnet_opt=
+          if [[ "{{.V6MasqueradeSubnet}}" != "" ]]; then
+            ovn_v6_masquerade_subnet_opt="--gateway-v6-masquerade-subnet {{.V6MasqueradeSubnet}}"
+          fi
+
           dns_name_resolver_enabled_flag=
           if [[ "{{.DNS_NAME_RESOLVER_ENABLE}}" == "true" ]]; then
             dns_name_resolver_enabled_flag="--enable-dns-name-resolver"
@@ -189,6 +198,8 @@ spec:
             ${ovn_v6_join_subnet_opt} \
             ${ovn_v4_transit_switch_subnet_opt} \
             ${ovn_v6_transit_switch_subnet_opt} \
+            ${ovn_v4_masquerade_subnet_opt} \
+            ${ovn_v6_masquerade_subnet_opt} \
             ${dns_name_resolver_enabled_flag} \
             ${persistent_ips_enabled_flag} \
             ${multi_network_enabled_flag} \

pkg/network/ovn_kubernetes.go

@@ -1391,7 +1391,7 @@ func bootstrapOVN(conf *operv1.Network, kubeClient cnoclient.Client, infraStatus
 	}
 
 	// set the default masquerade CIDR for new clusters while ignoring upgrades
-	if res.ControlPlaneUpdateStatus == nil && res.NodeUpdateStatus == nil {
+	if res.ControlPlaneUpdateStatus == nil || res.NodeUpdateStatus == nil {
 		klog.Infof("Configuring the default masquerade subnets to %q and %q", defaultV4MasqueradeSubnet, defaultV6MasqueradeSubnet)
 		res.DefaultV4MasqueradeSubnet = defaultV4MasqueradeSubnet
 		res.DefaultV6MasqueradeSubnet = defaultV6MasqueradeSubnet