From b6fa40d42e8da68e59d0f5a17c234c78d43c2f9f Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Thu, 7 Feb 2019 20:54:50 -0700
Subject: [PATCH] Don't ever select the flannel bridge or cni bridge

---
 staging/src/k8s.io/apimachinery/pkg/util/net/interface.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/staging/src/k8s.io/apimachinery/pkg/util/net/interface.go b/staging/src/k8s.io/apimachinery/pkg/util/net/interface.go
index 01d028e727d..6c8b2a9decd 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/net/interface.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/net/interface.go
@@ -434,6 +434,9 @@ func chooseHostInterfaceFromRoute(routes []Route, nw networkInterfacer, addressF
 			if route.Family != family {
 				continue
 			}
+			if strings.HasPrefix(route.Interface, "flannel") || strings.HasPrefix(route.Interface, "cni") {
+				continue
+			}
 			klog.V(4).Infof("Default route transits interface %q", route.Interface)
 			finalIP, err := getIPFromInterface(route.Interface, family, nw)
 			if err != nil {