Add annotation for session affinity path

internal/ingress/annotations/sessionaffinity/main.go

@@ -47,6 +47,9 @@ const (
 	// This is used to control the cookie expires, its value is a number of seconds until the
 	// cookie expires
 	annotationAffinityCookieMaxAge = "session-cookie-max-age"
+
+	// This is used to control the cookie path when use-regex is set to true
+	annotationAffinityCookiePath = "session-cookie-path"
 )
 
 var (
@@ -71,6 +74,8 @@ type Cookie struct {
 	Expires string `json:"expires"`
 	// The number of seconds until the cookie expires
 	MaxAge string `json:"maxage"`
+	// The path that a cookie will be set on
+	Path string `json:"path"`
 }
 
 // cookieAffinityParse gets the annotation values related to Cookie Affinity
@@ -106,6 +111,12 @@ func (a affinity) cookieAffinityParse(ing *extensions.Ingress) *Cookie {
 		sm = ""
 	}
 	cookie.MaxAge = sm
+
+	sp, err := parser.GetStringAnnotation(annotationAffinityCookiePath, ing)
+	if err != nil || sp == "" {
+		glog.V(3).Infof("Invalid or no annotation value found in Ingress %v: %v. Ignoring it", ing.Name, annotationAffinityCookieMaxAge)
+	}
+	cookie.Path = sp
 	return cookie
 }
 

internal/ingress/annotations/sessionaffinity/main_test.go

@@ -71,6 +71,7 @@ func TestIngressAffinityCookieConfig(t *testing.T) {
 	data[parser.GetAnnotationWithPrefix(annotationAffinityCookieName)] = "INGRESSCOOKIE"
 	data[parser.GetAnnotationWithPrefix(annotationAffinityCookieExpires)] = "4500"
 	data[parser.GetAnnotationWithPrefix(annotationAffinityCookieMaxAge)] = "3000"
+	data[parser.GetAnnotationWithPrefix(annotationAffinityCookiePath)] = "/foo"
 	ing.SetAnnotations(data)
 
 	affin, _ := NewParser(&resolver.Mock{}).Parse(ing)
@@ -80,22 +81,26 @@ func TestIngressAffinityCookieConfig(t *testing.T) {
 	}
 
 	if nginxAffinity.Type != "cookie" {
-		t.Errorf("expected cookie as sticky-type but returned %v", nginxAffinity.Type)
+		t.Errorf("expected cookie as affinity but returned %v", nginxAffinity.Type)
 	}
 
 	if nginxAffinity.Cookie.Hash != "md5" {
-		t.Errorf("expected md5 as sticky-hash but returned %v", nginxAffinity.Cookie.Hash)
+		t.Errorf("expected md5 as session-cookie-hash but returned %v", nginxAffinity.Cookie.Hash)
 	}
 
 	if nginxAffinity.Cookie.Name != "INGRESSCOOKIE" {
-		t.Errorf("expected route as sticky-name but returned %v", nginxAffinity.Cookie.Name)
+		t.Errorf("expected route as session-cookie-name but returned %v", nginxAffinity.Cookie.Name)
 	}
 
 	if nginxAffinity.Cookie.Expires != "4500" {
-		t.Errorf("expected 1h as sticky-expires but returned %v", nginxAffinity.Cookie.Expires)
+		t.Errorf("expected 1h as session-cookie-expires but returned %v", nginxAffinity.Cookie.Expires)
 	}
 
 	if nginxAffinity.Cookie.MaxAge != "3000" {
-		t.Errorf("expected 3000 as sticky-max-age but returned %v", nginxAffinity.Cookie.MaxAge)
+		t.Errorf("expected 3000 as session-cookie-max-age but returned %v", nginxAffinity.Cookie.MaxAge)
+	}
+
+	if nginxAffinity.Cookie.Path != "/foo" {
+		t.Errorf("expected /foo as session-cookie-path but returned %v", nginxAffinity.Cookie.Path)
 	}
 }

internal/ingress/controller/controller.go

@@ -404,16 +404,21 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
 				}
 
 				if anns.SessionAffinity.Type == "cookie" {
+					cookiePath := anns.SessionAffinity.Cookie.Path
+					if anns.Rewrite.UseRegex && cookiePath == "" {
+						glog.Warningf("session-cookie-path should be set when use-regex is true")
+					}
+
 					ups.SessionAffinity.CookieSessionAffinity.Name = anns.SessionAffinity.Cookie.Name
 					ups.SessionAffinity.CookieSessionAffinity.Hash = anns.SessionAffinity.Cookie.Hash
 					ups.SessionAffinity.CookieSessionAffinity.Expires = anns.SessionAffinity.Cookie.Expires
 					ups.SessionAffinity.CookieSessionAffinity.MaxAge = anns.SessionAffinity.Cookie.MaxAge
+					ups.SessionAffinity.CookieSessionAffinity.Path = cookiePath
 
 					locs := ups.SessionAffinity.CookieSessionAffinity.Locations
 					if _, ok := locs[host]; !ok {
 						locs[host] = []string{}
 					}
-
 					locs[host] = append(locs[host], path.Path)
 				}
 			}

internal/ingress/types.go

@@ -112,6 +112,7 @@ type CookieSessionAffinity struct {
 	Expires   string              `json:"expires,omitempty"`
 	MaxAge    string              `json:"maxage,omitempty"`
 	Locations map[string][]string `json:"locations,omitempty"`
+	Path      string              `json:"path,omitempty"`
 }
 
 // Endpoint describes a kubernetes endpoint in a backend

internal/ingress/types_equals.go

@@ -168,6 +168,9 @@ func (csa1 *CookieSessionAffinity) Equal(csa2 *CookieSessionAffinity) bool {
 	if csa1.Hash != csa2.Hash {
 		return false
 	}
+	if csa1.Path != csa2.Path {
+		return false
+	}
 
 	return true
 }