From 3c5e3eda7bed85ce2aca2737ca18199e848a98c8 Mon Sep 17 00:00:00 2001 From: Kevin Frommelt Date: Fri, 8 May 2020 09:14:10 -0500 Subject: [PATCH 1/2] Remove duplicate annotation parsing for annotationAffinityCookieChangeOnFailure --- internal/ingress/annotations/sessionaffinity/main.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/internal/ingress/annotations/sessionaffinity/main.go b/internal/ingress/annotations/sessionaffinity/main.go index ac2a287c4..0324d8d90 100644 --- a/internal/ingress/annotations/sessionaffinity/main.go +++ b/internal/ingress/annotations/sessionaffinity/main.go @@ -132,11 +132,6 @@ func (a affinity) cookieAffinityParse(ing *networking.Ingress) *Cookie { klog.V(3).Infof("Invalid or no annotation value found in Ingress %v: %v. Ignoring it", ing.Name, annotationAffinityCookieChangeOnFailure) } - cookie.ChangeOnFailure, err = parser.GetBoolAnnotation(annotationAffinityCookieChangeOnFailure, ing) - if err != nil { - klog.V(3).Infof("Invalid or no annotation value found in Ingress %v: %v. Ignoring it", ing.Name, annotationAffinityCookieChangeOnFailure) - } - return cookie } From e775495a5630be101caa0a92b4942dd94aa220a5 Mon Sep 17 00:00:00 2001 From: Kevin Frommelt Date: Fri, 8 May 2020 13:51:14 -0500 Subject: [PATCH 2/2] Remove duplicate Cookie.ChangeOnFailure assertion --- internal/ingress/annotations/sessionaffinity/main_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/ingress/annotations/sessionaffinity/main_test.go b/internal/ingress/annotations/sessionaffinity/main_test.go index 29c514047..51d92ffb0 100644 --- a/internal/ingress/annotations/sessionaffinity/main_test.go +++ b/internal/ingress/annotations/sessionaffinity/main_test.go @@ -108,8 +108,4 @@ func TestIngressAffinityCookieConfig(t *testing.T) { if !nginxAffinity.Cookie.ChangeOnFailure { t.Errorf("expected change of failure parameter set to true but returned %v", nginxAffinity.Cookie.ChangeOnFailure) } - - if !nginxAffinity.Cookie.ChangeOnFailure { - t.Errorf("expected change of failure parameter set to true but returned %v", nginxAffinity.Cookie.ChangeOnFailure) - } }