diff --git a/internal/ingress/annotations/authreq/main.go b/internal/ingress/annotations/authreq/main.go index f4dfed88c2..310a5d1535 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 cbd8c18b19..f9b9d50d08 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/ingress/types.go b/internal/ingress/types.go index 71f8a71217..3d75fede8c 100644 --- a/internal/ingress/types.go +++ b/internal/ingress/types.go @@ -227,7 +227,7 @@ type Location struct { // Backend describes the name of the backend to use. Backend string `json:"backend"` // Service describes the referenced services from the ingress - Service *apiv1.Service `json:"service,omitempty"` + Service *apiv1.Service `json:"service,omitempty" hash:"ignore"` // Port describes to which port from the service Port intstr.IntOrString `json:"port"` // Overwrite the Host header passed into the backend. Defaults to @@ -290,7 +290,7 @@ type Location struct { ClientBodyBufferSize string `json:"clientBodyBufferSize,omitempty"` // DefaultBackend allows the use of a custom default backend for this location. // +optional - DefaultBackend *apiv1.Service `json:"defaultBackend,omitempty"` + DefaultBackend *apiv1.Service `json:"defaultBackend,omitempty" hash:"ignore"` // DefaultBackendUpstreamName is the upstream-formatted string for the name of // this location's custom default backend DefaultBackendUpstreamName string `json:"defaultBackendUpstreamName,omitempty"` @@ -327,7 +327,7 @@ type Location struct { // The endpoints must provide the TLS termination exposing the required SSL certificate. // The ingress controller only pipes the underlying TCP connection type SSLPassthroughBackend struct { - Service *apiv1.Service `json:"service,omitempty"` + Service *apiv1.Service `json:"service,omitempty" hash:"ignore"` Port intstr.IntOrString `json:"port"` // Backend describes the endpoints to use. Backend string `json:"namespace,omitempty"` @@ -344,7 +344,7 @@ type L4Service struct { // Endpoints active endpoints of the service Endpoints []Endpoint `json:"endpoints,omitempty"` // k8s Service - Service *apiv1.Service `json:"service,omitempty"` + Service *apiv1.Service `json:"service,omitempty" hash:"ignore"` } // L4Backend describes the kubernetes service behind L4 Ingress service @@ -365,8 +365,8 @@ type ProxyProtocol struct { // Ingress holds the definition of an Ingress plus its annotations type Ingress struct { - networking.Ingress - ParsedAnnotations *annotations.Ingress + networking.Ingress `hash:"ignore"` + ParsedAnnotations *annotations.Ingress `json:"parsedAnnotations"` } // GeneralConfig holds the definition of lua general configuration data diff --git a/internal/k8s/main.go b/internal/k8s/main.go index 7b1f0aec07..85f1c15c29 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