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

BZ-3461406: 1.Fixed vrf related issues with vsvip post 2.Retry Ingress for change of tenant or infrasetting in NS annotation #1612

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BZ-3461406: 1.Fixed vrf related issues with vsvip post 2.Retry Ingress for change of tenant or infrasetting in NS annotation #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions internal/k8s/advl4_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,17 +185,17 @@ func (c *AviController) SetupNamespaceEventHandler(numWorkers uint32) {
UpdateFunc: func(old, cur interface{}) {
nsOld := old.(*corev1.Namespace)
nsCur := cur.(*corev1.Namespace)
if isNamespaceUpdated(nsOld, nsCur) {
akshayhavile marked this conversation as resolved.
Show resolved Hide resolved
oldTenant := nsOld.Annotations[lib.TenantAnnotation]
newTenant := nsCur.Annotations[lib.TenantAnnotation]
if oldTenant != newTenant {
if utils.GetInformers().IngressInformer != nil {
utils.AviLog.Debugf("Adding ingresses for namespaces: %s", nsCur.GetName())
AddIngressFromNSToIngestionQueue(numWorkers, c, nsCur.GetName(), lib.NsFilterAdd)
}
utils.AviLog.Debugf("Adding Gateways for namespaces: %s", nsCur.GetName())
AddGatewaysFromNSToIngestionQueueWCP(numWorkers, c, nsCur.GetName(), lib.NsFilterAdd)
oldTenant := nsOld.Annotations[lib.TenantAnnotation]
newTenant := nsCur.Annotations[lib.TenantAnnotation]
oldInfraSetting := nsOld.Annotations[lib.InfraSettingNameAnnotation]
newInfraSetting := nsCur.Annotations[lib.InfraSettingNameAnnotation]
if oldTenant != newTenant || oldInfraSetting != newInfraSetting {
if utils.GetInformers().IngressInformer != nil {
utils.AviLog.Debugf("Adding ingresses for namespaces: %s", nsCur.GetName())
AddIngressFromNSToIngestionQueue(numWorkers, c, nsCur.GetName(), lib.NsFilterAdd)
}
utils.AviLog.Debugf("Adding Gateways for namespaces: %s", nsCur.GetName())
AddGatewaysFromNSToIngestionQueueWCP(numWorkers, c, nsCur.GetName(), lib.NsFilterAdd)
}
objKey := utils.ObjKey(nsCur)
if objKey == "" {
Expand Down
2 changes: 2 additions & 0 deletions internal/nodes/avi_model_evh_nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,6 +2288,8 @@ func buildWithInfraSettingForEvh(key, namespace string, vs *AviEvhVsNode, vsvip
}
if infraSetting.Spec.NSXSettings.T1LR != nil {
vsvip.T1Lr = *infraSetting.Spec.NSXSettings.T1LR
vsvip.VrfContext = ""
akshayhavile marked this conversation as resolved.
Show resolved Hide resolved
vs.VrfContext = ""
}
utils.AviLog.Debugf("key: %s, msg: Applied AviInfraSetting configuration over VSNode %s", key, vs.Name)
}
Expand Down
Loading