Skip to content

Commit b93ba87

Browse files
committed
Handle bridge vlan deletion during NAD update
1 parent 4ac3d60 commit b93ba87

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

pkg/controller/agent/nad/controller.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,11 @@ func (h Handler) removeLocalArea(clusternetwork string, localArea *vlan.LocalAre
141141
}
142142

143143
func (h Handler) removeOutdatedLocalArea(nad *nadv1.NetworkAttachmentDefinition) (*nadv1.NetworkAttachmentDefinition, error) {
144-
if nad.Labels[utils.KeyLastNetworkType] != string(utils.L2VlanNetwork) ||
145-
nad.Labels[utils.KeyLastClusterNetworkLabel] == "" && nad.Labels[utils.KeyLastVlanLabel] == "" {
144+
//Skip removelocalArea only
145+
//when LastNetworkType=untagged
146+
//when LastNetworkType="" and there is no change in cluster network or vlan id
147+
if nad.Labels[utils.KeyLastNetworkType] == string(utils.UntaggedNetwork) ||
148+
nad.Labels[utils.KeyLastNetworkType] == "" && nad.Labels[utils.KeyLastVlanLabel] == "" {
146149
return nil, nil
147150
}
148151

0 commit comments

Comments
 (0)