Skip to content

Commit

Permalink
pkg/k8s: trim spaces from loadBalancerSourceRanges
Browse files Browse the repository at this point in the history
Similarly to what is being done in upstream kube-proxy [1], but
unfortunately without explaining why, loadBalancerSourceRanges might
contain spaces which prevents the CIDR from being parsed correctly.

[1] kubernetes/kubernetes#94107

Fixes: 3195681 ("k8s: Add and parse LoadBalancerSourceRanges field")
Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Nov 13, 2020
1 parent 87b56a4 commit b7e036e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pkg/k8s/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,14 @@ func ParseService(svc *slim_corev1.Service, nodeAddressing datapath.NodeAddressi
loadBalancerIPs = append(loadBalancerIPs, ip.IP)
}
}
lbSrcRanges := make([]string, 0, len(svc.Spec.LoadBalancerSourceRanges))
for _, cidrString := range svc.Spec.LoadBalancerSourceRanges {
cidrStringTrimmed := strings.TrimSpace(cidrString)
lbSrcRanges = append(lbSrcRanges, cidrStringTrimmed)
}

svcInfo := NewService(clusterIP, svc.Spec.ExternalIPs, loadBalancerIPs,
svc.Spec.LoadBalancerSourceRanges, headless, trafficPolicy,
lbSrcRanges, headless, trafficPolicy,
uint16(svc.Spec.HealthCheckNodePort), svc.Labels, svc.Spec.Selector,
svc.GetNamespace(), svcType)
svcInfo.IncludeExternal = getAnnotationIncludeExternal(svc)
Expand Down

0 comments on commit b7e036e

Please sign in to comment.