Skip to content

Commit 6efe543

Browse files
authored
Merge pull request #462 from zlabjp/return-concrete-type
Return concrete type
2 parents 0f20adf + d141b64 commit 6efe543

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

pkg/controller/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,8 +1680,8 @@ func (lbc *LoadBalancerController) getEndpointsFromEndpointSlice(ctx context.Con
16801680
return backends, nil
16811681
}
16821682

1683-
func newEndpointSliceSelector(svc *corev1.Service) labels.Selector {
1684-
return labels.SelectorFromSet(labels.Set{
1683+
func newEndpointSliceSelector(svc *corev1.Service) labels.ValidatedSetSelector {
1684+
return labels.ValidatedSetSelector(labels.Set{
16851685
discoveryv1.LabelServiceName: svc.Name,
16861686
})
16871687
}

pkg/controller/util.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ func podFindPort(pod *corev1.Pod, svcPort *corev1.ServicePort) (int32, error) {
110110
return 0, fmt.Errorf("no suitable port for manifest: %s", pod.UID)
111111
}
112112

113-
// podLabelSelector returns labels.Selector from labelSet.
114-
func podLabelSelector(labelSet map[string]string) labels.Selector {
113+
// podLabelSelector returns label selector labelSet by removing labels that are used by Deployment or DaemonSet exclusively for its
114+
// management purposes.
115+
func podLabelSelector(labelSet map[string]string) labels.ValidatedSetSelector {
115116
l := make(map[string]string)
116117
// Remove labels which represent pod template hash, revision, or generation.
117118
for k, v := range labelSet {

0 commit comments

Comments
 (0)