- refactor dataclient

Author: greeshma1196

dataclients/kubernetes/ingressv1.go

@@ -77,7 +77,7 @@ func convertPathRuleV1(
 	ns := metadata.Namespace
 	name := metadata.Name
 
-	isZoneTargets := false
+	zoneTarget := false
 
 	if prule.Backend == nil {
 		return nil, fmt.Errorf("invalid path rule, missing backend in: %s/%s/%s", ns, name, host)
@@ -123,7 +123,7 @@ func convertPathRuleV1(
 			protocol = p
 		}
 
-		eps, isZoneTargets = state.GetEndpointsByService(ic.zone, ns, svcName, protocol, servicePort)
+		eps, zoneTarget = state.GetEndpointsByService(ic.zone, ns, svcName, protocol, servicePort)
 	}
 	if len(eps) == 0 {
 		ic.logger.Tracef("Target endpoints not found, shuntroute for %s:%s", svcName, svcPort)
@@ -155,26 +155,21 @@ func convertPathRuleV1(
 	}
 	var r *eskip.Route
 
-	if isZoneTargets {
+	r = &eskip.Route{
+		Id:          routeID(ns, name, host, prule.Path, svcName),
+		BackendType: eskip.LBBackend,
+		LBAlgorithm: getLoadBalancerAlgorithm(metadata, defaultLoadBalancerAlgorithm),
+		HostRegexps: hostRegexp,
+	}
+
+	if zoneTarget {
 		var lbeps []*eskip.LBEndpoint
 		for _, ep := range eps {
 			lbeps = append(lbeps, &eskip.LBEndpoint{Address: ep, Zone: ic.zone})
 		}
-		r = &eskip.Route{
-			Id:          routeID(ns, name, host, prule.Path, svcName),
-			BackendType: eskip.LBBackend,
-			LBEndpoints: lbeps,
-			LBAlgorithm: getLoadBalancerAlgorithm(metadata, defaultLoadBalancerAlgorithm),
-			HostRegexps: hostRegexp,
-		}
+		r.LBEndpoints = lbeps
 	} else {
-		r = &eskip.Route{
-			Id:          routeID(ns, name, host, prule.Path, svcName),
-			BackendType: eskip.LBBackend,
-			LBEndpoints: eskip.NewLBEndpoints(eps),
-			LBAlgorithm: getLoadBalancerAlgorithm(metadata, defaultLoadBalancerAlgorithm),
-			HostRegexps: hostRegexp,
-		}
+		r.LBEndpoints = eskip.NewLBEndpoints(eps)
 	}
 
 	setPathV1(pathMode, r, prule.PathType, prule.Path)
@@ -216,12 +211,6 @@ func (ing *ingress) addEndpointsRuleV1(ic *ingressContext, host string, prule *d
 		return fmt.Errorf("error while getting service: %w", err)
 	}
 
-	// // check for minEndpointsByZone and set zone for endpoints if needed
-
-	// for _, lbep := range endpointsRoute.LBEndpoints {
-	// 	lbep.Zone = ic.zone
-	// }
-
 	if endpointsRoute.BackendType != eskip.ShuntBackend {
 		// safe prepend, see: https://play.golang.org/p/zg5aGKJpRyK
 		filters := make([]*eskip.Filter, len(endpointsRoute.Filters)+len(ic.annotationFilters))
@@ -380,7 +369,7 @@ func (ing *ingress) convertDefaultBackendV1(
 		svcName = i.Spec.DefaultBackend.Service.Name
 		svcPort = i.Spec.DefaultBackend.Service.Port
 	)
-	isZoneTargets := false
+	zoneTarget := false
 
 	svc, err := state.getService(ns, svcName)
 	if err != nil {
@@ -408,7 +397,7 @@ func (ing *ingress) convertDefaultBackendV1(
 			protocol = p
 		}
 
-		eps, isZoneTargets = state.GetEndpointsByService(
+		eps, zoneTarget = state.GetEndpointsByService(
 			ing.zone,
 			ns,
 			svcName,
@@ -434,25 +423,25 @@ func (ing *ingress) convertDefaultBackendV1(
 		}, true, nil
 	}
 
-	if isZoneTargets {
+	var r *eskip.Route
+
+	r = &eskip.Route{
+		Id:          routeID(ns, name, "", "", ""),
+		BackendType: eskip.LBBackend,
+		LBAlgorithm: getLoadBalancerAlgorithm(i.Metadata, ing.defaultLoadBalancerAlgorithm),
+	}
+
+	if zoneTarget {
 		var lbeps []*eskip.LBEndpoint
 		for _, ep := range eps {
 			lbeps = append(lbeps, &eskip.LBEndpoint{Address: ep, Zone: ing.zone})
 		}
-		return &eskip.Route{
-			Id:          routeID(ns, name, "", "", ""),
-			BackendType: eskip.LBBackend,
-			LBEndpoints: lbeps,
-			LBAlgorithm: getLoadBalancerAlgorithm(i.Metadata, ing.defaultLoadBalancerAlgorithm),
-		}, true, nil
+		r.LBEndpoints = lbeps
+	} else {
+		r.LBEndpoints = eskip.NewLBEndpoints(eps)
 	}
 
-	return &eskip.Route{
-		Id:          routeID(ns, name, "", "", ""),
-		BackendType: eskip.LBBackend,
-		LBEndpoints: eskip.NewLBEndpoints(eps),
-		LBAlgorithm: getLoadBalancerAlgorithm(i.Metadata, ing.defaultLoadBalancerAlgorithm),
-	}, true, nil
+	return r, true, nil
 }
 
 func serviceNameBackend(svcName, svcNamespace string, servicePort *servicePort) string {

dataclients/kubernetes/routegroup.go

@@ -188,7 +188,7 @@ func applyServiceBackend(ctx *routeGroupContext, backend *definitions.SkipperBac
 		return targetPortNotFound(backend.ServiceName, backend.ServicePort)
 	}
 
-	eps, isZoneTargets := ctx.state.GetEndpointsByTarget(
+	eps, zoneTarget := ctx.state.GetEndpointsByTarget(
 		ctx.zone,
 		namespaceString(ctx.routeGroup.Metadata.Namespace),
 		s.Meta.Name,
@@ -211,7 +211,7 @@ func applyServiceBackend(ctx *routeGroupContext, backend *definitions.SkipperBac
 	}
 
 	r.BackendType = eskip.LBBackend
-	if isZoneTargets {
+	if zoneTarget {
 		for _, ep := range eps {
 			r.LBEndpoints = append(r.LBEndpoints, &eskip.LBEndpoint{Address: ep, Zone: ctx.zone})
 		}