Skip to content

Commit 8e0f0c7

Browse files
starbopszbb88888
authored andcommitted
fix(iptables-eip): look up subnet directly by name instead of resolving through NAD (kubeovn#6287)
Signed-off-by: Zespre Chang <zespre.chang@suse.com> (cherry picked from commit 524b6c0) (cherry picked from commit 26dab97)
1 parent 52d9524 commit 8e0f0c7

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

pkg/controller/vpc_nat_gw_eip.go

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,10 @@ func (c *Controller) handleAddIptablesEip(key string) error {
8585
return nil
8686
}
8787

88-
subnets, err := c.subnetsLister.List(labels.Everything())
88+
subnetName := util.GetExternalNetwork(cachedEip.Spec.ExternalSubnet)
89+
subnet, err := c.subnetsLister.Get(subnetName)
8990
if err != nil {
90-
klog.Errorf("failed to list subnets: %v", err)
91-
return err
92-
}
93-
94-
nadName := util.GetExternalNetwork(cachedEip.Spec.ExternalSubnet)
95-
subnet, err := c.findSubnetByNetworkAttachmentDefinition(c.config.PodNamespace, nadName, subnets)
96-
if err != nil {
97-
klog.Error(err)
91+
klog.Errorf("failed to get subnet %s: %v", subnetName, err)
9892
return err
9993
}
10094

@@ -194,16 +188,10 @@ func (c *Controller) handleUpdateIptablesEip(key string) error {
194188
defer func() { _ = c.vpcNatGwKeyMutex.UnlockKey(key) }()
195189
klog.Infof("handle update iptables eip %s", key)
196190

197-
subnets, err := c.subnetsLister.List(labels.Everything())
191+
subnetName := util.GetExternalNetwork(cachedEip.Spec.ExternalSubnet)
192+
subnet, err := c.subnetsLister.Get(subnetName)
198193
if err != nil {
199-
klog.Errorf("failed to list subnets: %v", err)
200-
return err
201-
}
202-
203-
nadName := util.GetExternalNetwork(cachedEip.Spec.ExternalSubnet)
204-
subnet, err := c.findSubnetByNetworkAttachmentDefinition(c.config.PodNamespace, nadName, subnets)
205-
if err != nil {
206-
klog.Error(err)
194+
klog.Errorf("failed to get subnet %s: %v", subnetName, err)
207195
return err
208196
}
209197

0 commit comments

Comments
 (0)