Adding service.go changes after merge

basantsa1989 · basantsa1989 · commit 09d966c8cc96 · 2020-11-14T01:09:46.000Z
diff --git a/pkg/proxy/service.go b/pkg/proxy/service.go
@@ -184,8 +184,8 @@ func (sct *ServiceChangeTracker) newBaseServiceInfo(port *v1.ServicePort, servic
 	}
 
 	if len(ips) > 0 {
-		isCIDR := false
-		ipFamilyIPMap := utilproxy.MapIPsToIPFamily(ips, isCIDR)
+		isCIDR = false
+		ipFamilyIPMap = utilproxy.MapIPsToIPFamily(ips, isCIDR)
 
 		for ipFam, ipList := range ipFamilyIPMap {
 			if ipFam != sct.ipFamily && len(ipList) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,8 @@ func (sct ServiceChangeTracker) newBaseServiceInfo(port v1.ServicePort, servic`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if len(ips) > 0 {`
`187`		`- isCIDR := false`
`188`		`- ipFamilyIPMap := utilproxy.MapIPsToIPFamily(ips, isCIDR)`
	`187`	`+ isCIDR = false`
	`188`	`+ ipFamilyIPMap = utilproxy.MapIPsToIPFamily(ips, isCIDR)`
`189`	`189`
`190`	`190`	`for ipFam, ipList := range ipFamilyIPMap {`
`191`	`191`	`if ipFam != sct.ipFamily && len(ipList) > 0 {`