Merge pull request #80055 from sbangari/automated-cherry-pick-of-#78874-upstream-release-1.15

Automated cherry pick of #78874: Fix the creation of load balancer policy for the NodeIp when

Merge pull request #80055 from sbangari/automated-cherry-pick-of-#78874-upstream-release-1.15
db5764d6 · Kubernetes Prow Robot · GitHub · 37cd490a · a3c8e378 · db5764d6
Unverified Commit db5764d6 authored Aug 06, 2019 by Kubernetes Prow Robot Committed by GitHub Aug 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

hnsV1.go pkg/proxy/winkernel/hnsV1.go +2 -0

hnsV2.go pkg/proxy/winkernel/hnsV2.go +2 -0

No files found.
--- a/pkg/proxy/winkernel/hnsV1.go
+++ b/pkg/proxy/winkernel/hnsV1.go
@@ -172,6 +172,8 @@ func (hns hnsV1) getLoadBalancer(endpoints []endpointsInfo, flags loadBalancerFl
 				if len(elbPolicy.VIPs) == 0 || elbPolicy.VIPs[0] != vip {
 					continue
 				}
+			} else if len(elbPolicy.VIPs) != 0 {
+				continue
 			}
 			LogJson(plist, "Found existing Hns loadbalancer policy resource", 1)
 			return &loadBalancerInfo{

--- a/pkg/proxy/winkernel/hnsV2.go
+++ b/pkg/proxy/winkernel/hnsV2.go
@@ -186,6 +186,8 @@ func (hns hnsV2) getLoadBalancer(endpoints []endpointsInfo, flags loadBalancerFl
 				if len(plist.FrontendVIPs) == 0 || plist.FrontendVIPs[0] != vip {
 					continue
 				}
+			} else if len(plist.FrontendVIPs) != 0 {
+				continue
 			}
 			LogJson(plist, "Found existing Hns loadbalancer policy resource", 1)
 			return &loadBalancerInfo{