
* 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>
214 lines
6.6 KiB
Go
214 lines
6.6 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 proxy
|
|
|
|
import (
|
|
"testing"
|
|
|
|
api "k8s.io/api/core/v1"
|
|
networking "k8s.io/api/networking/v1"
|
|
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
|
|
"k8s.io/ingress-nginx/internal/ingress/defaults"
|
|
"k8s.io/ingress-nginx/internal/ingress/resolver"
|
|
)
|
|
|
|
func buildIngress() *networking.Ingress {
|
|
defaultBackend := networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: "default-backend",
|
|
Port: networking.ServiceBackendPort{
|
|
Number: 80,
|
|
},
|
|
},
|
|
}
|
|
|
|
return &networking.Ingress{
|
|
ObjectMeta: meta_v1.ObjectMeta{
|
|
Name: "foo",
|
|
Namespace: api.NamespaceDefault,
|
|
},
|
|
Spec: networking.IngressSpec{
|
|
DefaultBackend: &networking.IngressBackend{
|
|
Service: &networking.IngressServiceBackend{
|
|
Name: "default-backend",
|
|
Port: networking.ServiceBackendPort{
|
|
Number: 80,
|
|
},
|
|
},
|
|
},
|
|
Rules: []networking.IngressRule{
|
|
{
|
|
Host: "foo.bar.com",
|
|
IngressRuleValue: networking.IngressRuleValue{
|
|
HTTP: &networking.HTTPIngressRuleValue{
|
|
Paths: []networking.HTTPIngressPath{
|
|
{
|
|
Path: "/foo",
|
|
Backend: defaultBackend,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
type mockBackend struct {
|
|
resolver.Mock
|
|
}
|
|
|
|
func (m mockBackend) GetDefaultBackend() defaults.Backend {
|
|
return defaults.Backend{
|
|
ProxyConnectTimeout: 10,
|
|
ProxySendTimeout: 15,
|
|
ProxyReadTimeout: 20,
|
|
ProxyBuffersNumber: 4,
|
|
ProxyBufferSize: "10k",
|
|
ProxyBodySize: "3k",
|
|
ProxyNextUpstream: "error",
|
|
ProxyNextUpstreamTimeout: 0,
|
|
ProxyNextUpstreamTries: 3,
|
|
ProxyRequestBuffering: "on",
|
|
ProxyBuffering: "off",
|
|
ProxyHTTPVersion: "1.1",
|
|
ProxyMaxTempFileSize: "1024m",
|
|
}
|
|
}
|
|
|
|
func TestProxy(t *testing.T) {
|
|
ing := buildIngress()
|
|
|
|
data := map[string]string{}
|
|
data[parser.GetAnnotationWithPrefix("proxy-connect-timeout")] = "1"
|
|
data[parser.GetAnnotationWithPrefix("proxy-send-timeout")] = "2"
|
|
data[parser.GetAnnotationWithPrefix("proxy-read-timeout")] = "3"
|
|
data[parser.GetAnnotationWithPrefix("proxy-buffers-number")] = "8"
|
|
data[parser.GetAnnotationWithPrefix("proxy-buffer-size")] = "1k"
|
|
data[parser.GetAnnotationWithPrefix("proxy-body-size")] = "2k"
|
|
data[parser.GetAnnotationWithPrefix("proxy-next-upstream")] = "off"
|
|
data[parser.GetAnnotationWithPrefix("proxy-next-upstream-timeout")] = "5"
|
|
data[parser.GetAnnotationWithPrefix("proxy-next-upstream-tries")] = "3"
|
|
data[parser.GetAnnotationWithPrefix("proxy-request-buffering")] = "off"
|
|
data[parser.GetAnnotationWithPrefix("proxy-buffering")] = "on"
|
|
data[parser.GetAnnotationWithPrefix("proxy-http-version")] = "1.0"
|
|
data[parser.GetAnnotationWithPrefix("proxy-max-temp-file-size")] = "128k"
|
|
ing.SetAnnotations(data)
|
|
|
|
i, err := NewParser(mockBackend{}).Parse(ing)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error parsing a valid")
|
|
}
|
|
p, ok := i.(*Config)
|
|
if !ok {
|
|
t.Fatalf("expected a Config type")
|
|
}
|
|
if p.ConnectTimeout != 1 {
|
|
t.Errorf("expected 1 as connect-timeout but returned %v", p.ConnectTimeout)
|
|
}
|
|
if p.SendTimeout != 2 {
|
|
t.Errorf("expected 2 as send-timeout but returned %v", p.SendTimeout)
|
|
}
|
|
if p.ReadTimeout != 3 {
|
|
t.Errorf("expected 3 as read-timeout but returned %v", p.ReadTimeout)
|
|
}
|
|
if p.BuffersNumber != 8 {
|
|
t.Errorf("expected 8 as proxy-buffers-number but returned %v", p.BuffersNumber)
|
|
}
|
|
if p.BufferSize != "1k" {
|
|
t.Errorf("expected 1k as buffer-size but returned %v", p.BufferSize)
|
|
}
|
|
if p.BodySize != "2k" {
|
|
t.Errorf("expected 2k as body-size but returned %v", p.BodySize)
|
|
}
|
|
if p.NextUpstream != "off" {
|
|
t.Errorf("expected off as next-upstream but returned %v", p.NextUpstream)
|
|
}
|
|
if p.NextUpstreamTimeout != 5 {
|
|
t.Errorf("expected 5 as next-upstream-timeout but returned %v", p.NextUpstreamTimeout)
|
|
}
|
|
if p.NextUpstreamTries != 3 {
|
|
t.Errorf("expected 3 as next-upstream-tries but returned %v", p.NextUpstreamTries)
|
|
}
|
|
if p.RequestBuffering != "off" {
|
|
t.Errorf("expected off as request-buffering but returned %v", p.RequestBuffering)
|
|
}
|
|
if p.ProxyBuffering != "on" {
|
|
t.Errorf("expected on as proxy-buffering but returned %v", p.ProxyBuffering)
|
|
}
|
|
if p.ProxyHTTPVersion != "1.0" {
|
|
t.Errorf("expected 1.0 as proxy-http-version but returned %v", p.ProxyHTTPVersion)
|
|
}
|
|
if p.ProxyMaxTempFileSize != "128k" {
|
|
t.Errorf("expected 128k as proxy-max-temp-file-size but returned %v", p.ProxyMaxTempFileSize)
|
|
}
|
|
}
|
|
|
|
func TestProxyWithNoAnnotation(t *testing.T) {
|
|
ing := buildIngress()
|
|
|
|
data := map[string]string{}
|
|
ing.SetAnnotations(data)
|
|
|
|
i, err := NewParser(mockBackend{}).Parse(ing)
|
|
if err != nil {
|
|
t.Fatalf("unexpected error parsing a valid")
|
|
}
|
|
p, ok := i.(*Config)
|
|
if !ok {
|
|
t.Fatalf("expected a Config type")
|
|
}
|
|
if p.ConnectTimeout != 10 {
|
|
t.Errorf("expected 10 as connect-timeout but returned %v", p.ConnectTimeout)
|
|
}
|
|
if p.SendTimeout != 15 {
|
|
t.Errorf("expected 15 as send-timeout but returned %v", p.SendTimeout)
|
|
}
|
|
if p.ReadTimeout != 20 {
|
|
t.Errorf("expected 20 as read-timeout but returned %v", p.ReadTimeout)
|
|
}
|
|
if p.BuffersNumber != 4 {
|
|
t.Errorf("expected 4 as buffer-number but returned %v", p.BuffersNumber)
|
|
}
|
|
if p.BufferSize != "10k" {
|
|
t.Errorf("expected 10k as buffer-size but returned %v", p.BufferSize)
|
|
}
|
|
if p.BodySize != "3k" {
|
|
t.Errorf("expected 3k as body-size but returned %v", p.BodySize)
|
|
}
|
|
if p.NextUpstream != "error" {
|
|
t.Errorf("expected error as next-upstream but returned %v", p.NextUpstream)
|
|
}
|
|
if p.NextUpstreamTimeout != 0 {
|
|
t.Errorf("expected 0 as next-upstream-timeout but returned %v", p.NextUpstreamTimeout)
|
|
}
|
|
if p.NextUpstreamTries != 3 {
|
|
t.Errorf("expected 3 as next-upstream-tries but returned %v", p.NextUpstreamTries)
|
|
}
|
|
if p.RequestBuffering != "on" {
|
|
t.Errorf("expected on as request-buffering but returned %v", p.RequestBuffering)
|
|
}
|
|
if p.ProxyHTTPVersion != "1.1" {
|
|
t.Errorf("expected 1.1 as proxy-http-version but returned %v", p.ProxyHTTPVersion)
|
|
}
|
|
if p.ProxyMaxTempFileSize != "1024m" {
|
|
t.Errorf("expected 1024m as proxy-max-temp-file-size but returned %v", p.ProxyMaxTempFileSize)
|
|
}
|
|
}
|