From b93ba87cc94eddfde5bb1f3ea5f24f1d11b12ce7 Mon Sep 17 00:00:00 2001 From: Renuka Devi Rajendran Date: Fri, 21 Feb 2025 16:09:05 -0800 Subject: [PATCH] Handle bridge vlan deletion during NAD update --- pkg/controller/agent/nad/controller.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/controller/agent/nad/controller.go b/pkg/controller/agent/nad/controller.go index 940287dc..25028499 100644 --- a/pkg/controller/agent/nad/controller.go +++ b/pkg/controller/agent/nad/controller.go @@ -141,8 +141,11 @@ func (h Handler) removeLocalArea(clusternetwork string, localArea *vlan.LocalAre } func (h Handler) removeOutdatedLocalArea(nad *nadv1.NetworkAttachmentDefinition) (*nadv1.NetworkAttachmentDefinition, error) { - if nad.Labels[utils.KeyLastNetworkType] != string(utils.L2VlanNetwork) || - nad.Labels[utils.KeyLastClusterNetworkLabel] == "" && nad.Labels[utils.KeyLastVlanLabel] == "" { + //Skip removelocalArea only + //when LastNetworkType=untagged + //when LastNetworkType="" and there is no change in cluster network or vlan id + if nad.Labels[utils.KeyLastNetworkType] == string(utils.UntaggedNetwork) || + nad.Labels[utils.KeyLastNetworkType] == "" && nad.Labels[utils.KeyLastVlanLabel] == "" { return nil, nil }