
* 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>
366 lines
11 KiB
Go
366 lines
11 KiB
Go
/*
|
|
Copyright 2017 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 annotations
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/onsi/ginkgo"
|
|
"github.com/stretchr/testify/assert"
|
|
networking "k8s.io/api/networking/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"k8s.io/ingress-nginx/test/e2e/framework"
|
|
)
|
|
|
|
var _ = framework.DescribeAnnotation("affinity session-cookie-name", func() {
|
|
f := framework.NewDefaultFramework("affinity")
|
|
|
|
ginkgo.BeforeEach(func() {
|
|
f.NewEchoDeploymentWithReplicas(2)
|
|
})
|
|
|
|
ginkgo.It("should set sticky cookie SERVERID", func() {
|
|
host := "sticky.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("SERVERID=")
|
|
})
|
|
|
|
ginkgo.It("should change cookie name on ingress definition change", func() {
|
|
host := "change.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("SERVERID")
|
|
|
|
ing.ObjectMeta.Annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "OTHERCOOKIENAME"
|
|
|
|
_, err := f.KubeClientSet.NetworkingV1().Ingresses(f.Namespace).Update(context.TODO(), ing, metav1.UpdateOptions{})
|
|
assert.Nil(ginkgo.GinkgoT(), err, "updating ingress")
|
|
framework.Sleep()
|
|
|
|
f.HTTPTestClient().
|
|
GET("/").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("OTHERCOOKIENAME")
|
|
})
|
|
|
|
ginkgo.It("should set the path to /something on the generated cookie", func() {
|
|
host := "path.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
|
|
ing := framework.NewSingleIngress(host, "/something", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/something").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("Path=/something")
|
|
})
|
|
|
|
ginkgo.It("does not set the path to / on the generated cookie if there's more than one rule referring to the same backend", func() {
|
|
pathtype := networking.PathTypePrefix
|
|
host := "morethanonerule.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
|
|
f.EnsureIngress(&networking.Ingress{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: host,
|
|
Namespace: f.Namespace,
|
|
Annotations: annotations,
|
|
},
|
|
Spec: networking.IngressSpec{
|
|
IngressClassName: &f.IngressClass,
|
|
Rules: []networking.IngressRule{
|
|
{
|
|
Host: host,
|
|
IngressRuleValue: networking.IngressRuleValue{
|
|
HTTP: &networking.HTTPIngressRuleValue{
|
|
Paths: []networking.HTTPIngressPath{
|
|
{
|
|
Path: "/something",
|
|
PathType: &pathtype,
|
|
Backend: networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: framework.EchoService,
|
|
Port: networking.ServiceBackendPort{
|
|
Number: int32(80),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Path: "/somewhereelse",
|
|
PathType: &pathtype,
|
|
Backend: networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: framework.EchoService,
|
|
Port: networking.ServiceBackendPort{
|
|
Number: int32(80),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/something").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("Path=/something")
|
|
|
|
f.HTTPTestClient().
|
|
GET("/somewhereelse").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("Path=/somewhereelse")
|
|
})
|
|
|
|
ginkgo.It("should set cookie with expires", func() {
|
|
host := "cookieexpires.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "ExpiresCookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-expires"] = "172800"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-max-age"] = "259200"
|
|
|
|
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
local, err := time.LoadLocation("GMT")
|
|
assert.Nil(ginkgo.GinkgoT(), err, "loading GMT location")
|
|
assert.NotNil(ginkgo.GinkgoT(), local, "expected a location but none returned")
|
|
|
|
duration, _ := time.ParseDuration("48h")
|
|
expected := time.Now().In(local).Add(duration).Format("Mon, 02-Jan-06 15:04")
|
|
|
|
f.HTTPTestClient().
|
|
GET("/").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains(fmt.Sprintf("Expires=%s", expected)).Contains("Max-Age=259200")
|
|
})
|
|
|
|
ginkgo.It("should work with use-regex annotation and session-cookie-path", func() {
|
|
host := "useregex.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
annotations["nginx.ingress.kubernetes.io/use-regex"] = "true"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-path"] = "/foo/bar"
|
|
|
|
ing := framework.NewSingleIngress(host, "/foo/.*", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/foo/bar").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("Path=/foo/bar").Contains("SERVERID=")
|
|
})
|
|
|
|
ginkgo.It("should warn user when use-regex is true and session-cookie-path is not set", func() {
|
|
host := "useregexwarn.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
annotations["nginx.ingress.kubernetes.io/use-regex"] = "true"
|
|
|
|
ing := framework.NewSingleIngress(host, "/foo/.*", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/foo/bar").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK)
|
|
|
|
logs, err := f.NginxLogs()
|
|
assert.Nil(ginkgo.GinkgoT(), err, "obtaining nginx logs")
|
|
assert.Contains(ginkgo.GinkgoT(), logs, `session-cookie-path should be set when use-regex is true`)
|
|
})
|
|
|
|
ginkgo.It("should not set affinity across all server locations when using separate ingresses", func() {
|
|
host := "separate.foo.com"
|
|
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
|
|
ing1 := framework.NewSingleIngress("ingress1", "/foo/bar", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing1)
|
|
|
|
ing2 := framework.NewSingleIngress("ingress2", "/foo", host, f.Namespace, framework.EchoService, 80, nil)
|
|
f.EnsureIngress(ing2)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
return strings.Contains(server, `location /foo/bar`) && strings.Contains(server, `location /foo`)
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/foo").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Empty()
|
|
|
|
f.HTTPTestClient().
|
|
GET("/foo/bar").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("Path=/foo/bar")
|
|
})
|
|
|
|
ginkgo.It("should set sticky cookie without host", func() {
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
|
|
ing := framework.NewSingleIngress("default-no-host", "/", "", f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer("_",
|
|
func(server string) bool {
|
|
return strings.Contains(server, "server_name _")
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/").
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("SERVERID=")
|
|
})
|
|
|
|
ginkgo.It("should work with server-alias annotation", func() {
|
|
host := "foo.com"
|
|
alias1 := "a1.foo.com"
|
|
alias2 := "a2.foo.com"
|
|
annotations := make(map[string]string)
|
|
annotations["nginx.ingress.kubernetes.io/affinity"] = "cookie"
|
|
annotations["nginx.ingress.kubernetes.io/session-cookie-name"] = "SERVERID"
|
|
annotations["nginx.ingress.kubernetes.io/server-alias"] = fmt.Sprintf("%s,%s", alias1, alias2)
|
|
|
|
ing := framework.NewSingleIngress(host, "/bar", host, f.Namespace, framework.EchoService, 80, annotations)
|
|
f.EnsureIngress(ing)
|
|
|
|
f.WaitForNginxServer(host,
|
|
func(server string) bool {
|
|
//server alias sort by sort.Strings(), see: internal/ingress/annotations/alias/main.go:60
|
|
return strings.Contains(server, fmt.Sprintf("server_name %s %s %s ;", host, alias1, alias2))
|
|
})
|
|
|
|
f.HTTPTestClient().
|
|
GET("/bar").
|
|
WithHeader("Host", host).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("SERVERID=")
|
|
|
|
f.HTTPTestClient().
|
|
GET("/bar").
|
|
WithHeader("Host", alias1).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("SERVERID=")
|
|
|
|
f.HTTPTestClient().
|
|
GET("/bar").
|
|
WithHeader("Host", alias2).
|
|
Expect().
|
|
Status(http.StatusOK).
|
|
Header("Set-Cookie").Contains("SERVERID=")
|
|
})
|
|
|
|
})
|