Merge pull request #2149 from npinaeva/apbroute-status-again

SDN-4308,OCPBUGS-24650: Set enable-multi-external-gateway flag in ovnkube.conf
openshift · Dec 11, 2023 · fbb89ed · fbb89ed
2 parents 3715837 + d56331c
commit fbb89ed
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/bindata/network/ovn-kubernetes/common/008-script-lib.yaml b/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
@@ -610,7 +610,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
@@ -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
@@ -54,6 +54,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
@@ -220,6 +220,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
@@ -260,6 +261,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
@@ -303,6 +305,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
@@ -358,6 +361,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
@@ -415,6 +419,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
@@ -471,6 +476,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
@@ -527,6 +533,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
@@ -572,6 +579,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
@@ -620,6 +628,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
@@ -660,6 +669,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
@@ -704,6 +714,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
@@ -747,6 +758,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