Sitelet https://github.com/cloudnativelabs/kube-router/commit/c283d8d9b6a9a42163bbfffacc8e941d7f399a8a
Skip to content

Commit c283d8d

Browse files
committed
Recognize headless label on EndpointSlices
1 parent 67f25dc commit c283d8d

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

‎pkg/controllers/proxy/network_services_controller.go‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const (
8484

8585
// kubernetes standard labels / annotations
8686
svcProxyNameLabel = "service.kubernetes.io/service-proxy-name"
87-
svcHeadlessLabel = "service.kubernetes.io/headless"
87+
headlessLabel = "service.kubernetes.io/headless"
8888

8989
// All IPSET names need to be less than 31 characters in order for the Kernel to accept them. Keep in mind that the
9090
// actual formulation for this may be inet6:<setNameBase> depending on ip family, plus when we change ipsets we use
@@ -861,7 +861,7 @@ func (nsc *NetworkServicesController) buildServicesInfo() serviceInfoMap {
861861

862862
// We handle headless service labels differently from a "None" or blank ClusterIP because ClusterIP is
863863
// guaranteed to be immuteable whereas labels can be added / removed
864-
_, err = getLabelFromMap(svcHeadlessLabel, svc.Labels)
864+
_, err = getLabelFromMap(headlessLabel, svc.Labels)
865865
if err == nil {
866866
klog.V(2).Infof("Skipping service name:%s namespace:%s due to headless label being set", svc.Name,
867867
svc.Namespace)
@@ -1002,6 +1002,13 @@ func (nsc *NetworkServicesController) buildEndpointSliceInfo() endpointSliceInfo
10021002
var isIPv4, isIPv6 bool
10031003
es := obj.(*discoveryv1.EndpointSlice)
10041004
klog.V(2).Infof("Building endpoint info for EndpointSlice: %s/%s", es.Namespace, es.Name)
1005+
1006+
if _, hasHeadless := es.Labels[headlessLabel]; hasHeadless {
1007+
klog.V(2).Infof("Skipping EndpointSlice %s/%s due to headless label being set",
1008+
es.Namespace, es.Name)
1009+
continue
1010+
}
1011+
10051012
switch es.AddressType {
10061013
case discoveryv1.AddressTypeIPv4:
10071014
isIPv4 = true

0 commit comments

Comments
 (0)