Merge pull request #2502 from arghosh93/cherry-pick-2495-to-release-4.16

[release-4.16] OCPBUGS-41840: Add configurable subnets while running hybrid-overlay-node binary

bindata/network/ovn-kubernetes/self-hosted/ovnkube-node.yaml

@@ -477,9 +477,32 @@ spec:
                 --cert-duration={{.NodeIdentityCertDuration}}
               "
             fi
+
+            ovn_v4_join_subnet_opt=
+            if [[ "{{.V4JoinSubnet}}" != "" ]]; then
+              ovn_v4_join_subnet_opt="--gateway-v4-join-subnet {{.V4JoinSubnet}}"
+            fi
+            ovn_v6_join_subnet_opt=
+            if [[ "{{.V6JoinSubnet}}" != "" ]]; then
+              ovn_v6_join_subnet_opt="--gateway-v6-join-subnet {{.V6JoinSubnet}}"
+            fi
+
+            ovn_v4_transit_switch_subnet_opt=
+            if [[ "{{.V4TransitSwitchSubnet}}" != "" ]]; then
+              ovn_v4_transit_switch_subnet_opt="--cluster-manager-v4-transit-switch-subnet {{.V4TransitSwitchSubnet}}"
+            fi
+            ovn_v6_transit_switch_subnet_opt=
+            if [[ "{{.V6TransitSwitchSubnet}}" != "" ]]; then
+              ovn_v6_transit_switch_subnet_opt="--cluster-manager-v6-transit-switch-subnet {{.V6TransitSwitchSubnet}}"
+            fi
+
             exec /usr/bin/hybrid-overlay-node --node "${K8S_NODE}" \
               --config-file=/run/ovnkube-config/ovnkube.conf \
-              ${NETWORK_NODE_IDENTITY_ENABLE}
+              ${NETWORK_NODE_IDENTITY_ENABLE} \
+              ${ovn_v4_join_subnet_opt} \
+              ${ovn_v6_join_subnet_opt} \
+              ${ovn_v4_transit_switch_subnet_opt} \
+              ${ovn_v6_transit_switch_subnet_opt}
           fi
 {{- end }}
           . /ovnkube-lib/ovnkube-lib.sh || exit 1