make compatible with simplicified enable-eip-snat-cm (#3009)

kubeovn · Jul 5, 2023 · e744d76 · e744d76
1 parent 2a65253
commit e744d76
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -771,8 +771,16 @@ func (c *Controller) reconcileRouteSubnets(cachedPod, pod *v1.Pod, needRoutePodN
 				}
 				nextHop := cm.Data["external-gw-addr"]
 				if nextHop == "" {
-					klog.Errorf("no available gateway nic address")
-					return fmt.Errorf("no available gateway nic address")
+					externalSubnet, err := c.subnetsLister.Get(c.config.ExternalGatewaySwitch)
+					if err != nil {
+						klog.Errorf("failed to get subnet %s, %v", c.config.ExternalGatewaySwitch, err)
+						return err
+					}
+					nextHop = externalSubnet.Spec.Gateway
+					if nextHop == "" {
+						klog.Errorf("no available gateway address")
+						return fmt.Errorf("no available gateway address")
+					}
 				}
 				if strings.Contains(nextHop, "/") {
 					nextHop = strings.Split(nextHop, "/")[0]

diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -323,8 +323,16 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {
 			if err == nil {
 				nextHop := cm.Data["external-gw-addr"]
 				if nextHop == "" {
-					klog.Errorf("no available gateway nic address")
-					return fmt.Errorf("no available gateway nic address")
+					externalSubnet, err := c.subnetsLister.Get(c.config.ExternalGatewaySwitch)
+					if err != nil {
+						klog.Errorf("failed to get subnet %s, %v", c.config.ExternalGatewaySwitch, err)
+						return err
+					}
+					nextHop = externalSubnet.Spec.Gateway
+					if nextHop == "" {
+						klog.Errorf("no available gateway address")
+						return fmt.Errorf("no available gateway address")
+					}
 				}
 				if strings.Contains(nextHop, "/") {
 					nextHop = strings.Split(nextHop, "/")[0]