DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6993 from cjyyb/dev

Browse source 
Fix cookieAffinity log printing error
This commit is contained in:
Kubernetes Prow Robot 2021-05-03 13:40:08 -07:00 committed by GitHub
commit 1b76ad70ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/ingress/annotations/sessionaffinity/main.go
View file

@ -96,7 +96,7 @@ func (a affinity) cookieAffinityParse(ing *networking.Ingress) *Cookie {
cookie.Name, err = parser.GetStringAnnotation(annotationAffinityCookieName, ing) cookie.Name, err = parser.GetStringAnnotation(annotationAffinityCookieName, ing)
if err != nil { if err != nil {
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieExpires, "default", defaultAffinityCookieName) klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieName, "default", defaultAffinityCookieName)
cookie.Name = defaultAffinityCookieName cookie.Name = defaultAffinityCookieName
} }
@ -114,7 +114,7 @@ func (a affinity) cookieAffinityParse(ing *networking.Ingress) *Cookie {
cookie.Path, err = parser.GetStringAnnotation(annotationAffinityCookiePath, ing) cookie.Path, err = parser.GetStringAnnotation(annotationAffinityCookiePath, ing)
if err != nil { if err != nil {
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieMaxAge) klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookiePath)
} }
cookie.SameSite, err = parser.GetStringAnnotation(annotationAffinityCookieSameSite, ing) cookie.SameSite, err = parser.GetStringAnnotation(annotationAffinityCookieSameSite, ing)