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

Jump to bottom

Cherrypick #1144 [Ensure ingress cleanup when finalizer exists] into release-1.9 #1194

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Cherrypick #1144 [Ensure ingress cleanup when finalizer exists] into release-1.9 #1194

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
16 changes: 9 additions & 7 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,20 +164,22 @@ func NewLoadBalancerController(
UpdateFunc: func(old, cur interface{}) {
curIng := cur.(*v1beta1.Ingress)
if !utils.IsGLBCIngress(curIng) {
oldIng := old.(*v1beta1.Ingress)
// If ingress was GLBC Ingress, we need to track ingress class change
// and run GC to delete LB resources.
if utils.IsGLBCIngress(oldIng) {
klog.V(4).Infof("Ingress %v class was changed, enqueuing", common.NamespacedName(curIng))
// Ingress needs to be enqueued if a ingress finalizer exists.
// An existing finalizer means that
// 1. Ingress update for class change.
// 2. Ingress cleanup failed and re-queued.
// 3. Finalizer remove failed and re-queued.
if common.HasFinalizer(curIng.ObjectMeta) {
klog.V(2).Infof("Ingress %s class was changed but has a glbc finalizer, enqueuing", common.NamespacedName(curIng))
lbc.ingQueue.Enqueue(cur)
return
}
return
}
if reflect.DeepEqual(old, cur) {
klog.V(3).Infof("Periodic enqueueing of %v", common.NamespacedName(curIng))
klog.V(3).Infof("Periodic enqueueing of %s", common.NamespacedName(curIng))
} else {
klog.V(3).Infof("Ingress %v changed, enqueuing", common.NamespacedName(curIng))
klog.V(3).Infof("Ingress %s changed, enqueuing", common.NamespacedName(curIng))
}

lbc.ingQueue.Enqueue(cur)
Expand Down