diff --git a/internal/ingress/annotations/authreq/main.go b/internal/ingress/annotations/authreq/main.go index f4dfed88c..310a5d153 100644 --- a/internal/ingress/annotations/authreq/main.go +++ b/internal/ingress/annotations/authreq/main.go @@ -86,12 +86,7 @@ func (e1 *Config) Equal(e2 *Config) bool { return false } - match = sets.StringElementsMatch(e1.AuthCacheDuration, e2.AuthCacheDuration) - if !match { - return false - } - - return true + return sets.StringElementsMatch(e1.AuthCacheDuration, e2.AuthCacheDuration) } var ( diff --git a/internal/ingress/annotations/authreq/main_test.go b/internal/ingress/annotations/authreq/main_test.go index cbd8c18b1..f9b9d50d0 100644 --- a/internal/ingress/annotations/authreq/main_test.go +++ b/internal/ingress/annotations/authreq/main_test.go @@ -168,7 +168,7 @@ func TestHeaderAnnotations(t *testing.T) { i, err := NewParser(&resolver.Mock{}).Parse(ing) if test.expErr { if err == nil { - t.Errorf("%v: expected error but retuned nil", err.Error()) + t.Error("expected error but retuned nil") } continue } @@ -216,7 +216,7 @@ func TestCacheDurationAnnotations(t *testing.T) { i, err := NewParser(&resolver.Mock{}).Parse(ing) if test.expErr { if err == nil { - t.Errorf("%v: expected error but retuned nil", err.Error()) + t.Errorf("expected error but retuned nil") } continue } diff --git a/internal/k8s/main.go b/internal/k8s/main.go index 7b1f0aec0..85f1c15c2 100644 --- a/internal/k8s/main.go +++ b/internal/k8s/main.go @@ -122,13 +122,13 @@ func NetworkingIngressAvailable(client clientset.Interface) bool { return false } - serverVersion, _ := client.Discovery().ServerVersion() + serverVersion, err := client.Discovery().ServerVersion() if err != nil { klog.Errorf("unexpected error parsing Kubernetes version: %v", err) return false } - runningVersion, _ := version.ParseGeneric(serverVersion.String()) + runningVersion, err := version.ParseGeneric(serverVersion.String()) if err != nil { klog.Errorf("unexpected error parsing running Kubernetes version: %v", err) return false