From d56331cc6d4d7059c38f6b43ad977392183326aa Mon Sep 17 00:00:00 2001
From: Nadia Pinaeva <npinaeva@redhat.com>
Date: Wed, 6 Dec 2023 15:13:22 +0100
Subject: [PATCH] Set enable-multi-external-gateway flag in ovnkube.conf to
 pass to both ovnkube-node and control-plane pods. There is no feature gate,
 so it is set unconditionally. Set the same flag for both master and node
 configMaps in managed env.

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
---
 .../ovn-kubernetes/common/008-script-lib.yaml        |  1 -
 .../network/ovn-kubernetes/managed/004-config.yaml   |  2 ++
 .../ovn-kubernetes/self-hosted/004-config.yaml       |  1 +
 pkg/network/ovn_kubernetes_test.go                   | 12 ++++++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bindata/network/ovn-kubernetes/common/008-script-lib.yaml b/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
index 5965c85f8d..067a4d0076 100644
--- a/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
+++ b/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
@@ -602,7 +602,6 @@ data:
         --enable-interconnect \
         --acl-logging-rate-limit "{{.OVNPolicyAuditRateLimit}}" \
         ${gw_interface_flag} \
-        --enable-multi-external-gateway=true \
         ${ip_forwarding_flag} \
         ${NETWORK_NODE_IDENTITY_ENABLE}
     }
diff --git a/bindata/network/ovn-kubernetes/managed/004-config.yaml b/bindata/network/ovn-kubernetes/managed/004-config.yaml
index bb39aeea2b..4e3ec8cb23 100644
--- a/bindata/network/ovn-kubernetes/managed/004-config.yaml
+++ b/bindata/network/ovn-kubernetes/managed/004-config.yaml
@@ -48,6 +48,7 @@ data:
 {{- if .OVN_ADMIN_NETWORK_POLICY_ENABLE }}
     enable-admin-network-policy=true
 {{- end }}
+    enable-multi-external-gateway=true
 
     [gateway]
     mode={{.OVN_GATEWAY_MODE}}
@@ -132,6 +133,7 @@ data:
 {{- if .OVN_MULTI_NETWORK_POLICY_ENABLE }}
     enable-multi-networkpolicy=true
 {{- end }}
+    enable-multi-external-gateway=true
 
     [gateway]
     mode={{.OVN_GATEWAY_MODE}}
diff --git a/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml b/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
index d2a7087470..94ec6b5db2 100644
--- a/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
@@ -51,6 +51,7 @@ data:
 {{- if .OVN_ADMIN_NETWORK_POLICY_ENABLE }}
     enable-admin-network-policy=true
 {{- end }}
+    enable-multi-external-gateway=true
 
     [gateway]
     mode={{.OVN_GATEWAY_MODE}}
diff --git a/pkg/network/ovn_kubernetes_test.go b/pkg/network/ovn_kubernetes_test.go
index 7238f0b8f8..71a49d3286 100644
--- a/pkg/network/ovn_kubernetes_test.go
+++ b/pkg/network/ovn_kubernetes_test.go
@@ -213,6 +213,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -253,6 +254,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -296,6 +298,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=local
@@ -351,6 +354,7 @@ enable-egress-service=true
 egressip-reachability-total-timeout=3
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=local
@@ -408,6 +412,7 @@ enable-egress-service=true
 egressip-reachability-total-timeout=0
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=local
@@ -464,6 +469,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=local
@@ -520,6 +526,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -565,6 +572,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -613,6 +621,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-multi-network=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -653,6 +662,7 @@ enable-egress-firewall=true
 enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -697,6 +707,7 @@ egressip-node-healthcheck-port=9107
 enable-multi-network=true
 enable-multi-networkpolicy=true
 enable-admin-network-policy=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared
@@ -740,6 +751,7 @@ enable-egress-qos=true
 enable-egress-service=true
 egressip-node-healthcheck-port=9107
 enable-admin-network-policy=true
+enable-multi-external-gateway=true
 
 [gateway]
 mode=shared