
* Drop v1beta1 from ingress nginx (#7156) * Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview * Prepare for v1.0.0-alpha.1 release Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Update changelog and matrix table for v1.0.0-alpha.1 (#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (#7219) * Fix link to e2e-tests.md in developer-guide (#7201) * Use ENV expansion for namespace in args (#7146) Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does. * chart: using Helm builtin capabilities check (#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944) It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780 * Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107) * Fix MaxWorkerOpenFiles calculation on high cores nodes * Add e2e test for rlimit_nofile * Fix doc for max-worker-open-files * ingress/tcp: add additional error logging on failed (#7208) * Add file containing stable release (#7313) * Handle named (non-numeric) ports correctly (#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (#7308) * remove mercurial from build (#7031) * Retry to download maxmind DB if it fails (#7242) * Retry to download maxmind DB if it fails. Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Add retries count arg, move retry logic into DownloadGeoLite2DB function Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Reorder parameters in DownloadGeoLite2DB Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Remove hardcoded value Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Release v1.0.0-alpha.1 * Add changelog for v1.0.0-alpha.2 * controller: ignore non-service backends (#7332) * controller: ignore non-service backends Signed-off-by: Carlos Panato <ctadeu@gmail.com> * update per feedback Signed-off-by: Carlos Panato <ctadeu@gmail.com> * fix: allow scope/tcp/udp configmap namespace to altered (#7161) * Lower webhook timeout for digital ocean (#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (#7365) (#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (#7341) * Fix IngressClass logic for newer releases Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Change e2e tests for the new IngressClass presence * Fix chart and admission tests Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix helm chart test Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix reviews * Remove ingressclass code from admission * update tag to v1.0.0-beta.1 * update readme and changelog for v1.0.0-beta.1 * Release v1.0.0-beta.1 - helm and manifests (#7422) * Change the order of annotation just to trigger a new helm release (#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (#7428) * Add dev-v1 branch into helm releaser (#7424) * chore: add link for artifacthub.io/prerelease annotations Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> * k8s job ci pipeline for dev-v1 br v1.22.0 (#7453) * k8s job ci pipeline for dev-v1 br v1.22.0 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * k8s job ci pipeline for dev-v1 br v1.21.2 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * remove v1.21.1 version Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * Add controller.watchIngressWithoutClass config option (#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (#7490) * Fix CI conflict * Fix CI conflict * Fix build.sh from rebase process * Fix controller_test post rebase Co-authored-by: Tianhao Guo <rggth09@gmail.com> Co-authored-by: Ray <61553+rctay@users.noreply.github.com> Co-authored-by: Bill Cassidy <cassid4@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com> Co-authored-by: Sathish Ramani <rsathishx87@gmail.com> Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com> Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com> Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com> Co-authored-by: Tom Hayward <thayward@infoblox.com> Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com> Co-authored-by: Tore <tore.lonoy@gmail.com> Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl> Co-authored-by: Shahid <shahid@us.ibm.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com> Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com> Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
186 lines
6.5 KiB
Go
186 lines
6.5 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package sessionaffinity
|
|
|
|
import (
|
|
"regexp"
|
|
|
|
networking "k8s.io/api/networking/v1"
|
|
"k8s.io/klog/v2"
|
|
|
|
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
|
|
"k8s.io/ingress-nginx/internal/ingress/resolver"
|
|
)
|
|
|
|
const (
|
|
annotationAffinityType = "affinity"
|
|
annotationAffinityMode = "affinity-mode"
|
|
annotationAffinityCanaryBehavior = "affinity-canary-behavior"
|
|
|
|
// If a cookie with this name exists,
|
|
// its value is used as an index into the list of available backends.
|
|
annotationAffinityCookieName = "session-cookie-name"
|
|
|
|
defaultAffinityCookieName = "INGRESSCOOKIE"
|
|
|
|
// This is used to control the cookie expires, its value is a number of seconds until the
|
|
// cookie expires
|
|
annotationAffinityCookieExpires = "session-cookie-expires"
|
|
|
|
// 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"
|
|
|
|
// This is used to control the SameSite attribute of the cookie
|
|
annotationAffinityCookieSameSite = "session-cookie-samesite"
|
|
|
|
// This is used to control whether SameSite=None should be conditionally applied based on the User-Agent
|
|
annotationAffinityCookieConditionalSameSiteNone = "session-cookie-conditional-samesite-none"
|
|
|
|
// This is used to control the cookie change after request failure
|
|
annotationAffinityCookieChangeOnFailure = "session-cookie-change-on-failure"
|
|
)
|
|
|
|
var (
|
|
affinityCookieExpiresRegex = regexp.MustCompile(`(^0|-?[1-9]\d*$)`)
|
|
)
|
|
|
|
// Config describes the per ingress session affinity config
|
|
type Config struct {
|
|
// The type of affinity that will be used
|
|
Type string `json:"type"`
|
|
// The affinity mode, i.e. how sticky a session is
|
|
Mode string `json:"mode"`
|
|
// Affinity behavior for canaries (sticky or legacy)
|
|
CanaryBehavior string `json:"canaryBehavior"`
|
|
Cookie
|
|
}
|
|
|
|
// Cookie describes the Config of cookie type affinity
|
|
type Cookie struct {
|
|
// The name of the cookie that will be used in case of cookie affinity type.
|
|
Name string `json:"name"`
|
|
// The time duration to control cookie expires
|
|
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"`
|
|
// Flag that allows cookie regeneration on request failure
|
|
ChangeOnFailure bool `json:"changeonfailure"`
|
|
// SameSite attribute value
|
|
SameSite string `json:"samesite"`
|
|
// Flag that conditionally applies SameSite=None attribute on cookie if user agent accepts it.
|
|
ConditionalSameSiteNone bool `json:"conditional-samesite-none"`
|
|
}
|
|
|
|
// cookieAffinityParse gets the annotation values related to Cookie Affinity
|
|
// It also sets default values when no value or incorrect value is found
|
|
func (a affinity) cookieAffinityParse(ing *networking.Ingress) *Cookie {
|
|
var err error
|
|
|
|
cookie := &Cookie{}
|
|
|
|
cookie.Name, err = parser.GetStringAnnotation(annotationAffinityCookieName, ing)
|
|
if err != nil {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieName, "default", defaultAffinityCookieName)
|
|
cookie.Name = defaultAffinityCookieName
|
|
}
|
|
|
|
cookie.Expires, err = parser.GetStringAnnotation(annotationAffinityCookieExpires, ing)
|
|
if err != nil || !affinityCookieExpiresRegex.MatchString(cookie.Expires) {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieExpires)
|
|
cookie.Expires = ""
|
|
}
|
|
|
|
cookie.MaxAge, err = parser.GetStringAnnotation(annotationAffinityCookieMaxAge, ing)
|
|
if err != nil || !affinityCookieExpiresRegex.MatchString(cookie.MaxAge) {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieMaxAge)
|
|
cookie.MaxAge = ""
|
|
}
|
|
|
|
cookie.Path, err = parser.GetStringAnnotation(annotationAffinityCookiePath, ing)
|
|
if err != nil {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookiePath)
|
|
}
|
|
|
|
cookie.SameSite, err = parser.GetStringAnnotation(annotationAffinityCookieSameSite, ing)
|
|
if err != nil {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieSameSite)
|
|
}
|
|
|
|
cookie.ConditionalSameSiteNone, err = parser.GetBoolAnnotation(annotationAffinityCookieConditionalSameSiteNone, ing)
|
|
if err != nil {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieConditionalSameSiteNone)
|
|
}
|
|
|
|
cookie.ChangeOnFailure, err = parser.GetBoolAnnotation(annotationAffinityCookieChangeOnFailure, ing)
|
|
if err != nil {
|
|
klog.V(3).InfoS("Invalid or no annotation value found. Ignoring", "ingress", klog.KObj(ing), "annotation", annotationAffinityCookieChangeOnFailure)
|
|
}
|
|
|
|
return cookie
|
|
}
|
|
|
|
// NewParser creates a new Affinity annotation parser
|
|
func NewParser(r resolver.Resolver) parser.IngressAnnotation {
|
|
return affinity{r}
|
|
}
|
|
|
|
type affinity struct {
|
|
r resolver.Resolver
|
|
}
|
|
|
|
// ParseAnnotations parses the annotations contained in the ingress
|
|
// rule used to configure the affinity directives
|
|
func (a affinity) Parse(ing *networking.Ingress) (interface{}, error) {
|
|
cookie := &Cookie{}
|
|
// Check the type of affinity that will be used
|
|
at, err := parser.GetStringAnnotation(annotationAffinityType, ing)
|
|
if err != nil {
|
|
at = ""
|
|
}
|
|
|
|
// Check the affinity mode that will be used
|
|
am, err := parser.GetStringAnnotation(annotationAffinityMode, ing)
|
|
if err != nil {
|
|
am = ""
|
|
}
|
|
|
|
cb, err := parser.GetStringAnnotation(annotationAffinityCanaryBehavior, ing)
|
|
if err != nil {
|
|
cb = ""
|
|
}
|
|
|
|
switch at {
|
|
case "cookie":
|
|
cookie = a.cookieAffinityParse(ing)
|
|
default:
|
|
klog.V(3).InfoS("No default affinity found", "ingress", ing.Name)
|
|
|
|
}
|
|
|
|
return &Config{
|
|
Type: at,
|
|
Mode: am,
|
|
CanaryBehavior: cb,
|
|
Cookie: *cookie,
|
|
}, nil
|
|
}
|