Skip to content

Commit

Permalink
replace util.DefaultVpc with c.config.ClusterRouter (#2782)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangzujian
zhangzujian committed May 11, 2023
1 parent e1154ac commit 08e2e66
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 45 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/endpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {

if vpcName == "" {
if vpcName = svc.Annotations[util.VpcAnnotation]; vpcName == "" {
vpcName = util.DefaultVpc
vpcName = c.config.ClusterRouter
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/external-gw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (c *Controller) createDefaultVpcLrpEip(config map[string]string) (string, s
return "", "", err
}
needCreateEip := false
lrpEipName := fmt.Sprintf("%s-%s", util.DefaultVpc, c.config.ExternalGatewaySwitch)
lrpEipName := fmt.Sprintf("%s-%s", c.config.ClusterRouter, c.config.ExternalGatewaySwitch)
cachedEip, err := c.ovnEipsLister.Get(lrpEipName)
if err != nil {
if !k8serrors.IsNotFound(err) {
Expand Down Expand Up @@ -294,7 +294,7 @@ func (c *Controller) updateDefaultVpcExternal(enableExternal bool) error {
klog.Errorf("failed to patch vpc %s, %v", c.config.ClusterRouter, err)
return err
}
lrpEipName := fmt.Sprintf("%s-%s", util.DefaultVpc, c.config.ExternalGatewaySwitch)
lrpEipName := fmt.Sprintf("%s-%s", c.config.ClusterRouter, c.config.ExternalGatewaySwitch)
if err := c.patchLrpOvnEipEnableBfdLabel(lrpEipName, vpc.Spec.EnableBfd); err != nil {
klog.Errorf("failed to patch label for lrp %s, %v", lrpEipName, err)
return err
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/gc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (c *Controller) gcCustomLogicalRouter() error {
klog.Infof("vpc in kubernetes %v", vpcNames)

for _, lr := range lrs {
if lr.Name == util.DefaultVpc {
if lr.Name == c.config.ClusterRouter {
continue
}
if !util.IsStringIn(lr.Name, vpcNames) {
Expand Down Expand Up @@ -579,7 +579,7 @@ func (c *Controller) gcPortGroup() error {
return err
}
for _, subnet := range subnets {
if subnet.Spec.Vpc != util.DefaultVpc || (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWDistributedType {
if subnet.Spec.Vpc != c.config.ClusterRouter || (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWDistributedType {
continue
}

Expand Down Expand Up @@ -615,12 +615,12 @@ func (c *Controller) gcPortGroup() error {

func (c *Controller) gcStaticRoute() error {
klog.Infof("start to gc static routes")
routes, err := c.ovnLegacyClient.GetStaticRouteList(util.DefaultVpc)
routes, err := c.ovnLegacyClient.GetStaticRouteList(c.config.ClusterRouter)
if err != nil {
klog.Errorf("failed to list static route %v", err)
return err
}
defaultVpc, err := c.vpcsLister.Get(util.DefaultVpc)
defaultVpc, err := c.vpcsLister.Get(c.config.ClusterRouter)
if err != nil {
klog.Errorf("failed to get default vpc, %v", err)
return err
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ func (c *Controller) InitOVN() error {
}

func (c *Controller) InitDefaultVpc() error {
cachedVpc, err := c.vpcsLister.Get(util.DefaultVpc)
cachedVpc, err := c.vpcsLister.Get(c.config.ClusterRouter)
if err != nil {
cachedVpc = &kubeovnv1.Vpc{}
cachedVpc.Name = util.DefaultVpc
cachedVpc.Name = c.config.ClusterRouter
cachedVpc, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Create(context.Background(), cachedVpc, metav1.CreateOptions{})
if err != nil {
klog.Errorf("init default vpc failed: %v", err)
Expand Down Expand Up @@ -121,7 +121,7 @@ func (c *Controller) initDefaultLogicalSwitch() error {
defaultSubnet := kubeovnv1.Subnet{
ObjectMeta: metav1.ObjectMeta{Name: c.config.DefaultLogicalSwitch},
Spec: kubeovnv1.SubnetSpec{
Vpc: util.DefaultVpc,
Vpc: c.config.ClusterRouter,
Default: true,
Provider: util.OvnProvider,
CIDRBlock: c.config.DefaultCIDR,
Expand Down Expand Up @@ -176,7 +176,7 @@ func (c *Controller) initNodeSwitch() error {
nodeSubnet := kubeovnv1.Subnet{
ObjectMeta: metav1.ObjectMeta{Name: c.config.NodeSwitch},
Spec: kubeovnv1.SubnetSpec{
Vpc: util.DefaultVpc,
Vpc: c.config.ClusterRouter,
Default: false,
Provider: util.OvnProvider,
CIDRBlock: c.config.NodeSwitchCIDR,
Expand Down
12 changes: 6 additions & 6 deletions pkg/controller/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func (c *Controller) handleAddNode(key string) error {

nodeIPv4, nodeIPv6 := util.GetNodeInternalIP(*node)
for _, subnet := range subnets {
if subnet.Spec.Vpc != util.DefaultVpc {
if subnet.Spec.Vpc != c.config.ClusterRouter {
continue
}

Expand Down Expand Up @@ -329,7 +329,7 @@ func (c *Controller) handleAddNode(key string) error {
}

for _, subnet := range subnets {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != util.DefaultVpc || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWDistributedType {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != c.config.ClusterRouter || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWDistributedType {
continue
}
if err = c.createPortGroupForDistributedSubnet(node, subnet); err != nil {
Expand Down Expand Up @@ -914,7 +914,7 @@ func (c *Controller) retryDelDupChassis(attempts int, sleep int, f func(node *v1
func (c *Controller) fetchPodsOnNode(nodeName string, pods []*v1.Pod) ([]string, error) {
ports := make([]string, 0, len(pods))
for _, pod := range pods {
if !isPodAlive(pod) || pod.Spec.HostNetwork || pod.Spec.NodeName != nodeName || pod.Annotations[util.LogicalRouterAnnotation] != util.DefaultVpc {
if !isPodAlive(pod) || pod.Spec.HostNetwork || pod.Spec.NodeName != nodeName || pod.Annotations[util.LogicalRouterAnnotation] != c.config.ClusterRouter {
continue
}
podName := c.getNameByPod(pod)
Expand Down Expand Up @@ -1036,7 +1036,7 @@ func (c *Controller) validateChassis(node *v1.Node) error {

func (c *Controller) addNodeGwStaticRoute() error {
// If user not manage static route for default vpc, just add route about ovn-default to join
if vpc, err := c.vpcsLister.Get(util.DefaultVpc); err != nil || vpc.Spec.StaticRoutes != nil {
if vpc, err := c.vpcsLister.Get(c.config.ClusterRouter); err != nil || vpc.Spec.StaticRoutes != nil {
existRoute, err := c.ovnLegacyClient.GetStaticRouteList(c.config.ClusterRouter)
if err != nil {
klog.Errorf("failed to get vpc %s static route list, %v", c.config.ClusterRouter, err)
Expand Down Expand Up @@ -1107,7 +1107,7 @@ func (c *Controller) deletePolicyRouteForNode(nodeName string) error {
}

for _, subnet := range subnets {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != util.DefaultVpc || subnet.Name == c.config.NodeSwitch {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != c.config.ClusterRouter || subnet.Name == c.config.NodeSwitch {
continue
}

Expand Down Expand Up @@ -1178,7 +1178,7 @@ func (c *Controller) addPolicyRouteForCentralizedSubnetOnNode(nodeName, nodeIP s
}

for _, subnet := range subnets {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != util.DefaultVpc || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWCentralizedType {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != c.config.ClusterRouter || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWCentralizedType {
continue
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/ovn-ic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ func stripPrefix(policyMatch string) (string, error) {
}

func (c *Controller) syncOneRouteToPolicy(key, value string) {
lr, err := c.ovnClient.GetLogicalRouter(util.DefaultVpc, false)
lr, err := c.ovnClient.GetLogicalRouter(c.config.ClusterRouter, false)
if err != nil {
klog.Errorf("logical router does not exist %v at %v", err, time.Now())
return
Expand Down Expand Up @@ -493,7 +493,7 @@ func (c *Controller) syncOneRouteToPolicy(key, value string) {
delete(policyMap, lrRoute.IPPrefix)
} else {
matchFiled := util.MatchV4Dst + " == " + lrRoute.IPPrefix
if err := c.ovnClient.AddLogicalRouterPolicy(util.DefaultVpc, util.OvnICPolicyPriority, matchFiled, ovnnb.LogicalRouterPolicyActionAllow, nil, map[string]string{key: value, "vendor": util.CniTypeName}); err != nil {
if err := c.ovnClient.AddLogicalRouterPolicy(lr.Name, util.OvnICPolicyPriority, matchFiled, ovnnb.LogicalRouterPolicyActionAllow, nil, map[string]string{key: value, "vendor": util.CniTypeName}); err != nil {
klog.Errorf("adding router policy failed %v", err)
}
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/pod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ func (c *Controller) reconcileRouteSubnets(cachedPod, pod *v1.Pod, needRoutePodN
podIP = pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)]
subnet = podNet.Subnet

if podIP != "" && (subnet.Spec.Vlan == "" || subnet.Spec.LogicalGateway) && subnet.Spec.Vpc == util.DefaultVpc {
if podIP != "" && (subnet.Spec.Vlan == "" || subnet.Spec.LogicalGateway) && subnet.Spec.Vpc == c.config.ClusterRouter {
node, err := c.nodesLister.Get(pod.Spec.NodeName)
if err != nil {
klog.Errorf("failed to get node %s: %v", pod.Spec.NodeName, err)
Expand Down Expand Up @@ -876,7 +876,7 @@ func (c *Controller) handleDeletePod(pod *v1.Pod) error {
return err
}
// If pod has snat or eip, also need delete staticRoute when delete pod
if vpc.Name == util.DefaultVpc {
if vpc.Name == c.config.ClusterRouter {
if err := c.ovnLegacyClient.DeleteStaticRoute(
address.Ip, vpc.Name, subnet.Spec.RouteTable); err != nil {
return err
Expand Down Expand Up @@ -1352,7 +1352,7 @@ func (c *Controller) validatePodIP(podName, subnetName, ipv4, ipv6 string) (bool
return false, false, err
}

if subnet.Spec.Vlan == "" && subnet.Spec.Vpc == util.DefaultVpc {
if subnet.Spec.Vlan == "" && subnet.Spec.Vpc == c.config.ClusterRouter {
nodes, err := c.nodesLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list nodes: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ func (c *Controller) handleUpdateService(key string) error {

vpcName := svc.Annotations[util.VpcAnnotation]
if vpcName == "" {
vpcName = util.DefaultVpc
vpcName = c.config.ClusterRouter
}
vpc, err := c.vpcsLister.Get(vpcName)
if err != nil {
Expand Down
16 changes: 8 additions & 8 deletions pkg/controller/subnet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
klog.Infof("subnet %s is not ovn subnet, no vpc", subnet.Name)
} else {
changed = true
subnet.Spec.Vpc = util.DefaultVpc
subnet.Spec.Vpc = c.config.ClusterRouter
}
// Some features only work in the default VPC
if subnet.Spec.Default && subnet.Name != c.config.DefaultLogicalSwitch {
Expand Down Expand Up @@ -619,7 +619,7 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
}
}

if subnet.Spec.Vlan == "" && subnet.Spec.Vpc == util.DefaultVpc {
if subnet.Spec.Vlan == "" && subnet.Spec.Vpc == c.config.ClusterRouter {
nodes, err := c.nodesLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list nodes: %v", err)
Expand Down Expand Up @@ -850,7 +850,7 @@ func (c *Controller) handleDeleteSubnet(subnet *kubeovnv1.Subnet) error {
klog.Errorf("get vpc %s: %v", vpc.Name, err)
return err
}
router = util.DefaultVpc
router = c.config.ClusterRouter
} else {
router = vpc.Status.Router
}
Expand Down Expand Up @@ -904,14 +904,14 @@ func (c *Controller) reconcileSubnet(subnet *kubeovnv1.Subnet) error {
return err
}

if subnet.Spec.Vpc == util.DefaultVpc {
if subnet.Spec.Vpc == c.config.ClusterRouter {
if err := c.reconcileOvnDefaultVpcRoute(subnet); err != nil {
klog.Errorf("reconcile default vpc ovn route for subnet %s failed: %v", subnet.Name, err)
return err
}
}

if subnet.Spec.Vpc != util.DefaultVpc {
if subnet.Spec.Vpc != c.config.ClusterRouter {
if err := c.reconcileOvnCustomVpcRoute(subnet); err != nil {
klog.Errorf("reconcile custom vpc ovn route for subnet %s failed: %v", subnet.Name, err)
return err
Expand Down Expand Up @@ -2125,7 +2125,7 @@ func (c *Controller) createPortGroupForDistributedSubnet(node *v1.Node, subnet *
if subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway {
return nil
}
if subnet.Spec.Vpc != util.DefaultVpc || subnet.Name == c.config.NodeSwitch {
if subnet.Spec.Vpc != c.config.ClusterRouter || subnet.Name == c.config.NodeSwitch {
return nil
}

Expand Down Expand Up @@ -2211,7 +2211,7 @@ func (c *Controller) addPolicyRouteForDistributedSubnet(subnet *kubeovnv1.Subnet
if subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway {
return nil
}
if subnet.Spec.Vpc != util.DefaultVpc || subnet.Name == c.config.NodeSwitch {
if subnet.Spec.Vpc != c.config.ClusterRouter || subnet.Name == c.config.NodeSwitch {
return nil
}

Expand Down Expand Up @@ -2268,7 +2268,7 @@ func (c *Controller) deletePolicyRouteForDistributedSubnet(subnet *kubeovnv1.Sub
}

func (c *Controller) deletePolicyRouteByGatewayType(subnet *kubeovnv1.Subnet, gatewayType string, isDelete bool) error {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != util.DefaultVpc {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != c.config.ClusterRouter {
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/vpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ type VpcLoadBalancer struct {
}

func (c *Controller) GenVpcLoadBalancer(vpcKey string) *VpcLoadBalancer {
if vpcKey == util.DefaultVpc || vpcKey == "" {
if vpcKey == c.config.ClusterRouter || vpcKey == "" {
return &VpcLoadBalancer{
TcpLoadBalancer: c.config.ClusterTcpLoadBalancer,
TcpSessLoadBalancer: c.config.ClusterTcpSessionLoadBalancer,
Expand Down Expand Up @@ -369,7 +369,7 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {
}
}

if vpc.Name != util.DefaultVpc && vpc.Spec.PolicyRoutes == nil {
if vpc.Name != c.config.ClusterRouter && vpc.Spec.PolicyRoutes == nil {
// do not clean default vpc policy routes
if err = c.ovnLegacyClient.CleanPolicyRoute(vpc.Name); err != nil {
klog.Errorf("clean all vpc %s policy route failed, %v", vpc.Name, err)
Expand Down
3 changes: 3 additions & 0 deletions pkg/daemon/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type Configuration struct {
KubeOvnClient clientset.Interface
NodeName string
ServiceClusterIPRange string
ClusterRouter string
NodeSwitch string
EncapChecksum bool
EnablePprof bool
Expand Down Expand Up @@ -74,6 +75,7 @@ func ParseFlags() *Configuration {
argOvsSocket = pflag.String("ovs-socket", "", "The socket to local ovs-server")
argKubeConfigFile = pflag.String("kubeconfig", "", "Path to kubeconfig file with authorization and master location information. If not set use the inCluster token.")
argServiceClusterIPRange = pflag.String("service-cluster-ip-range", "10.96.0.0/12", "The kubernetes service cluster ip range")
argClusterRouter = pflag.String("cluster-router", util.DefaultVpc, "The router name for cluster router")
argNodeSwitch = pflag.String("node-switch", "join", "The name of node gateway switch which help node to access pod network")
argEncapChecksum = pflag.Bool("encap-checksum", true, "Enable checksum")
argEnablePprof = pflag.Bool("enable-pprof", false, "Enable pprof")
Expand Down Expand Up @@ -127,6 +129,7 @@ func ParseFlags() *Configuration {
MacLearningFallback: *argMacLearningFallback,
NodeName: strings.ToLower(*argNodeName),
ServiceClusterIPRange: *argServiceClusterIPRange,
ClusterRouter: *argClusterRouter,
NodeSwitch: *argNodeSwitch,
EncapChecksum: *argEncapChecksum,
NetworkType: *argsNetworkType,
Expand Down
4 changes: 2 additions & 2 deletions pkg/daemon/controller_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (c *Controller) reconcileRouters(event subnetEvent) error {
joinCIDR := make([]string, 0, 2)
cidrs := make([]string, 0, len(subnets)*2)
for _, subnet := range subnets {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != util.DefaultVpc || !subnet.Status.IsReady() {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != c.config.ClusterRouter || !subnet.Status.IsReady() {
continue
}

Expand Down Expand Up @@ -384,7 +384,7 @@ func (c *Controller) diffPolicyRouting(oldSubnet, newSubnet *kubeovnv1.Subnet) (
}

func (c *Controller) getPolicyRouting(subnet *kubeovnv1.Subnet) ([]netlink.Rule, []netlink.Route, error) {
if subnet == nil || subnet.Spec.ExternalEgressGateway == "" || subnet.Spec.Vpc != util.DefaultVpc {
if subnet == nil || subnet.Spec.ExternalEgressGateway == "" || subnet.Spec.Vpc != c.config.ClusterRouter {
return nil, nil, nil
}
if subnet.Spec.GatewayType == kubeovnv1.GWCentralizedType && !util.GatewayContains(subnet.Spec.GatewayNode, c.config.NodeName) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/controller_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (c *Controller) reconcileRouters(_ subnetEvent) error {
v4Cidrs, v6Cidrs := make([]string, 0, len(subnets)), make([]string, 0, len(subnets))
for _, subnet := range subnets {
if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) ||
subnet.Spec.Vpc != util.DefaultVpc ||
subnet.Spec.Vpc != c.config.ClusterRouter ||
!subnet.Status.IsReady() {
continue
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/daemon/gateway.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (c *Controller) getSubnetsNeedNAT(protocol string) ([]string, error) {
if subnet.DeletionTimestamp == nil &&
subnet.Spec.NatOutgoing &&
(subnet.Spec.Vlan == "" || subnet.Spec.LogicalGateway) &&
subnet.Spec.Vpc == util.DefaultVpc &&
subnet.Spec.Vpc == c.config.ClusterRouter &&
subnet.Spec.CIDRBlock != "" &&
(subnet.Spec.Protocol == kubeovnv1.ProtocolDual || subnet.Spec.Protocol == protocol) {
cidrBlock := getCidrByProtocol(subnet.Spec.CIDRBlock, protocol)
Expand All @@ -116,7 +116,7 @@ func (c *Controller) getSubnetsDistributedGateway(protocol string) ([]string, er
for _, subnet := range subnets {
if subnet.DeletionTimestamp == nil &&
(subnet.Spec.Vlan == "" || subnet.Spec.LogicalGateway) &&
subnet.Spec.Vpc == util.DefaultVpc &&
subnet.Spec.Vpc == c.config.ClusterRouter &&
subnet.Spec.CIDRBlock != "" &&
subnet.Spec.GatewayType == kubeovnv1.GWDistributedType &&
(subnet.Spec.Protocol == kubeovnv1.ProtocolDual || subnet.Spec.Protocol == protocol) {
Expand Down Expand Up @@ -148,7 +148,7 @@ func (c *Controller) getDefaultVpcSubnetsCIDR(protocol string) ([]string, map[st
subnetMap := make(map[string]string, len(subnets)+1)

for _, subnet := range subnets {
if subnet.Spec.Vpc == util.DefaultVpc && (subnet.Spec.Vlan == "" || subnet.Spec.LogicalGateway) && subnet.Spec.CIDRBlock != "" {
if subnet.Spec.Vpc == c.config.ClusterRouter && (subnet.Spec.Vlan == "" || subnet.Spec.LogicalGateway) && subnet.Spec.CIDRBlock != "" {
cidrBlock := getCidrByProtocol(subnet.Spec.CIDRBlock, protocol)
ret = append(ret, cidrBlock)
subnetMap[subnet.Name] = cidrBlock
Expand Down Expand Up @@ -207,7 +207,7 @@ func (c *Controller) getEgressNatIpByNode(nodeName string) (map[string]string, e
(subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) ||
subnet.Spec.GatewayType != kubeovnv1.GWCentralizedType ||
!util.GatewayContains(subnet.Spec.GatewayNode, nodeName) ||
subnet.Spec.Vpc != util.DefaultVpc {
subnet.Spec.Vpc != c.config.ClusterRouter {
continue
}

Expand Down

0 comments on commit 08e2e66

Please sign in to comment.