Respect GatewayConfig values

openshift · Dec 6, 2021 · b6315f9 · b6315f9
1 parent e7112f8
commit b6315f9
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/network/ovn_kubernetes.go b/pkg/network/ovn_kubernetes.go
@@ -78,7 +78,7 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
 	data.Data["GenevePort"] = c.GenevePort
 	data.Data["CNIConfDir"] = pluginCNIConfDir(conf)
 	data.Data["CNIBinDir"] = CNIBinDir
-	data.Data["OVN_GATEWAY_MODE"] = bootstrapResult.OVN.OVNKubernetesConfig.GatewayMode
+	//data.Data["OVN_GATEWAY_MODE"] = bootstrapResult.OVN.OVNKubernetesConfig.GatewayMode
 	data.Data["OVN_NB_PORT"] = OVN_NB_PORT
 	data.Data["OVN_SB_PORT"] = OVN_SB_PORT
 	data.Data["OVN_NB_RAFT_PORT"] = OVN_NB_RAFT_PORT
@@ -154,6 +154,14 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
 		data.Data["EnableIPsec"] = false
 	}
 
+	if c.GatewayConfig != nil {
+		if c.GatewayConfig.RoutingViaHost {
+			data.Data["OVN_GATEWAY_MODE"] = OVN_LOCAL_GW_MODE
+		} else {
+			data.Data["OVN_GATEWAY_MODE"] = OVN_SHARED_GW_MODE
+		}
+	}
+
 	exportNetworkFlows := conf.ExportNetworkFlows
 	if exportNetworkFlows != nil {
 		if exportNetworkFlows.NetFlow != nil {