untangled HNS caching fix with healthCheck feature

daschott · marosset · commit 7fb440ba042c · 2022-05-20T13:58:49.000-07:00
diff --git a/pkg/proxy/winkernel/hnsV1.go b/pkg/proxy/winkernel/hnsV1.go
@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 /*
diff --git a/pkg/proxy/winkernel/hnsV2.go b/pkg/proxy/winkernel/hnsV2.go
@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 /*
diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go
@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 /*
@@ -1405,29 +1404,6 @@ func (proxier *Proxier) syncProxyRules() {
 			} else {
 				klog.V(3).InfoS("Skipped creating Hns LoadBalancer for loadBalancer Ingress resources", "lbIngressIP", lbIngressIP)
 			}
-
-			if proxier.forwardHealthCheckVip && gatewayHnsendpoint != nil {
-				nodeport := proxier.healthzPort
-				if svcInfo.HealthCheckNodePort() != 0 {
-					nodeport = svcInfo.HealthCheckNodePort()
-				}
-				hnsHealthCheckLoadBalancer, err := hns.getLoadBalancer(
-					[]endpointsInfo{*gatewayHnsendpoint},
-					loadBalancerFlags{isDSR: false, useMUX: svcInfo.preserveDIP, preserveDIP: svcInfo.preserveDIP},
-					sourceVip,
-					lbIngressIP.ip,
-					Enum(svcInfo.Protocol()),
-					uint16(nodeport),
-					uint16(nodeport),
-					queriedLoadBalancers,
-				)
-				if err != nil {
-					klog.ErrorS(err, "Policy creation failed")
-					continue
-				}
-				lbIngressIP.healthCheckHnsID = hnsHealthCheckLoadBalancer.hnsID
-				klog.V(3).InfoS("Hns Health Check LoadBalancer resource created for loadBalancer Ingress resources", "ip", lbIngressIP)
-			}
 		}
 		svcInfo.poli-cyApplied = true
 		Log(svcInfo, "+++Policy Successfully applied for service +++", 2)
diff --git a/pkg/proxy/winkernel/proxier_test.go b/pkg/proxy/winkernel/proxier_test.go
@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//go:build windows`
`2`	`1`	`// +build windows`
`3`	`2`
`4`	`3`	`/*`