Commit a34a99bd authored by Geoff Simmons's avatar Geoff Simmons

Compare labels for equality more idiomatically.

parent 7ca83849
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
package controller package controller
import ( import (
"reflect"
api_v1 "k8s.io/api/core/v1" api_v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
...@@ -119,7 +117,7 @@ func (worker *NamespaceWorker) getAllServiceEndpoints( ...@@ -119,7 +117,7 @@ func (worker *NamespaceWorker) getAllServiceEndpoints(
return return
} }
for _, nsSvc := range svcs { for _, nsSvc := range svcs {
if !reflect.DeepEqual(selector, nsSvc.Spec.Selector) { if !labels.Equals(selector, nsSvc.Spec.Selector) {
continue continue
} }
eps, err := worker.getServiceEndpoints(nsSvc) eps, err := worker.getServiceEndpoints(nsSvc)
......
...@@ -33,7 +33,6 @@ package controller ...@@ -33,7 +33,6 @@ package controller
import ( import (
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"reflect"
"strconv" "strconv"
vcr_v1alpha1 "code.uplex.de/uplex-varnish/k8s-ingress/pkg/apis/varnishingress/v1alpha1" vcr_v1alpha1 "code.uplex.de/uplex-varnish/k8s-ingress/pkg/apis/varnishingress/v1alpha1"
...@@ -939,7 +938,7 @@ func (worker *NamespaceWorker) updateIngStatus( ...@@ -939,7 +938,7 @@ func (worker *NamespaceWorker) updateIngStatus(
ips := map[string]struct{}{} ips := map[string]struct{}{}
hosts := map[string]struct{}{} hosts := map[string]struct{}{}
for _, svc := range svcs { for _, svc := range svcs {
if !reflect.DeepEqual(svc.Spec.Selector, admSvc.Spec.Selector) { if !labels.Equals(svc.Spec.Selector, admSvc.Spec.Selector) {
continue continue
} }
switch svc.Spec.Type { switch svc.Spec.Type {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment