Merge pull request #3635 from Shopify/alternative-backend-merge

Fix duplicate alternative backend merging
kubernetes · Jan 8, 2019 · 47addbb · 47addbb
2 parents c31939a + 7142791
commit 47addbb
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go
@@ -1165,6 +1165,13 @@ func mergeAlternativeBackend(priUps *ingress.Backend, altUps *ingress.Backend) b
 		return false
 	}
 
+	for _, ab := range priUps.AlternativeBackends {
+		if ab == altUps.Name {
+			klog.V(2).Infof("skip merge alternative backend %v into %v, it's already present", altUps.Name, priUps.Name)
+			return true
+		}
+	}
+
 	priUps.AlternativeBackends =
 		append(priUps.AlternativeBackends, altUps.Name)