Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bugfix] Unable to correctly gc port group #4694

Merged
merged 2 commits into from
Nov 11, 2024
Merged

[bugfix] Unable to correctly gc port group #4694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e32e0d
[bugfix] Unable to correctly gc port group
Nov 4, 2024
4a084fc
Merge branch 'release-1.12' into fix-gc-port_group
cmdy Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 49 additions & 35 deletions pkg/controller/gc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ func (c *Controller) gcPortGroup() error {
klog.Info("start to gc network policy")

npNames := strset.New()
delPgNames := strset.New()

if c.config.EnableNP {
nps, err := c.npsLister.List(labels.Everything())
Expand All @@ -622,53 +623,66 @@ func (c *Controller) gcPortGroup() error {

npNames.Add(fmt.Sprintf("%s/%s", np.Namespace, npName))
}
}

// append node port group to npNames to avoid gc node port group
nodes, err := c.nodesLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list nodes, %v", err)
return err
}
// append node port group to npNames to avoid gc node port group
nodes, err := c.nodesLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list nodes, %v", err)
return err
}

for _, node := range nodes {
npNames.Add(fmt.Sprintf("%s/%s", "node", node.Name))
}
for _, node := range nodes {
npNames.Add(fmt.Sprintf("%s/%s", "node", node.Name))
}

// append overlay subnets port group to npNames to avoid gc distributed subnets port group
subnets, err := c.subnetsLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list subnets %v", err)
return err
// append overlay subnets port group to npNames to avoid gc distributed subnets port group
subnets, err := c.subnetsLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list subnets %v", err)
return err
}
for _, subnet := range subnets {
if subnet.Spec.Vpc != c.config.ClusterRouter || (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWDistributedType {
continue
}
for _, subnet := range subnets {
if subnet.Spec.Vpc != c.config.ClusterRouter || (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Name == c.config.NodeSwitch || subnet.Spec.GatewayType != kubeovnv1.GWDistributedType {
continue
}

for _, node := range nodes {
npNames.Add(fmt.Sprintf("%s/%s", subnet.Name, node.Name))
}
for _, node := range nodes {
npNames.Add(fmt.Sprintf("%s/%s", subnet.Name, node.Name))
}
}

// list all np port groups which externalIDs[np]!=""
pgs, err := c.OVNNbClient.ListPortGroups(map[string]string{networkPolicyKey: ""})
if err != nil {
klog.Errorf("list np port group: %v", err)
return err
}
// list all np port groups which externalIDs[np]!=""
pgs, err := c.OVNNbClient.ListPortGroups(map[string]string{networkPolicyKey: ""})
if err != nil {
klog.Errorf("list np port group: %v", err)
return err
}

for _, pg := range pgs {
np := strings.Split(pg.ExternalIDs[networkPolicyKey], "/")
if len(np) != 2 {
// not np port group
continue
}
if !npNames.Has(pg.ExternalIDs[networkPolicyKey]) {
klog.Infof("gc port group '%s' network policy '%s'", pg.Name, pg.ExternalIDs[networkPolicyKey])
for _, pg := range pgs {
np := strings.Split(pg.ExternalIDs[networkPolicyKey], "/")
if len(np) != 2 {
// not np port group
continue
}
if !npNames.Has(pg.ExternalIDs[networkPolicyKey]) {
klog.Infof("gc port group '%s' network policy '%s'", pg.Name, pg.ExternalIDs[networkPolicyKey])
delPgNames.Add(pg.Name)
if c.config.EnableNP {
c.deleteNpQueue.Add(pg.ExternalIDs[networkPolicyKey])
}
}
}
// gc port group
// the pgName in the network policy is generated differently from the node/subnet pgName
// so processes port group gc separately
// ensure that the port group can be correctly gc
delPgNames.Each(func(item string) bool {
if err := c.OVNNbClient.DeletePortGroup(item); err != nil {
klog.Errorf("failed to gc port group %s: %v", item, err)
}
return true
})

return nil
}
Expand Down
Loading