
* 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.1 KiB
Go
214 lines
6.1 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 (
|
|
networking "k8s.io/api/networking/v1"
|
|
|
|
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
|
|
"k8s.io/ingress-nginx/internal/ingress/resolver"
|
|
)
|
|
|
|
// Config returns the proxy timeout to use in the upstream server/s
|
|
type Config struct {
|
|
BodySize string `json:"bodySize"`
|
|
ConnectTimeout int `json:"connectTimeout"`
|
|
SendTimeout int `json:"sendTimeout"`
|
|
ReadTimeout int `json:"readTimeout"`
|
|
BuffersNumber int `json:"buffersNumber"`
|
|
BufferSize string `json:"bufferSize"`
|
|
CookieDomain string `json:"cookieDomain"`
|
|
CookiePath string `json:"cookiePath"`
|
|
NextUpstream string `json:"nextUpstream"`
|
|
NextUpstreamTimeout int `json:"nextUpstreamTimeout"`
|
|
NextUpstreamTries int `json:"nextUpstreamTries"`
|
|
ProxyRedirectFrom string `json:"proxyRedirectFrom"`
|
|
ProxyRedirectTo string `json:"proxyRedirectTo"`
|
|
RequestBuffering string `json:"requestBuffering"`
|
|
ProxyBuffering string `json:"proxyBuffering"`
|
|
ProxyHTTPVersion string `json:"proxyHTTPVersion"`
|
|
ProxyMaxTempFileSize string `json:"proxyMaxTempFileSize"`
|
|
}
|
|
|
|
// Equal tests for equality between two Configuration types
|
|
func (l1 *Config) Equal(l2 *Config) bool {
|
|
if l1 == l2 {
|
|
return true
|
|
}
|
|
if l1 == nil || l2 == nil {
|
|
return false
|
|
}
|
|
if l1.BodySize != l2.BodySize {
|
|
return false
|
|
}
|
|
if l1.ConnectTimeout != l2.ConnectTimeout {
|
|
return false
|
|
}
|
|
if l1.SendTimeout != l2.SendTimeout {
|
|
return false
|
|
}
|
|
if l1.ReadTimeout != l2.ReadTimeout {
|
|
return false
|
|
}
|
|
if l1.BuffersNumber != l2.BuffersNumber {
|
|
return false
|
|
}
|
|
if l1.BufferSize != l2.BufferSize {
|
|
return false
|
|
}
|
|
if l1.CookieDomain != l2.CookieDomain {
|
|
return false
|
|
}
|
|
if l1.CookiePath != l2.CookiePath {
|
|
return false
|
|
}
|
|
if l1.NextUpstream != l2.NextUpstream {
|
|
return false
|
|
}
|
|
if l1.NextUpstreamTimeout != l2.NextUpstreamTimeout {
|
|
return false
|
|
}
|
|
if l1.NextUpstreamTries != l2.NextUpstreamTries {
|
|
return false
|
|
}
|
|
if l1.RequestBuffering != l2.RequestBuffering {
|
|
return false
|
|
}
|
|
if l1.ProxyRedirectFrom != l2.ProxyRedirectFrom {
|
|
return false
|
|
}
|
|
if l1.ProxyRedirectTo != l2.ProxyRedirectTo {
|
|
return false
|
|
}
|
|
if l1.ProxyBuffering != l2.ProxyBuffering {
|
|
return false
|
|
}
|
|
if l1.ProxyHTTPVersion != l2.ProxyHTTPVersion {
|
|
return false
|
|
}
|
|
|
|
if l1.ProxyMaxTempFileSize != l2.ProxyMaxTempFileSize {
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
type proxy struct {
|
|
r resolver.Resolver
|
|
}
|
|
|
|
// NewParser creates a new reverse proxy configuration annotation parser
|
|
func NewParser(r resolver.Resolver) parser.IngressAnnotation {
|
|
return proxy{r}
|
|
}
|
|
|
|
// ParseAnnotations parses the annotations contained in the ingress
|
|
// rule used to configure upstream check parameters
|
|
func (a proxy) Parse(ing *networking.Ingress) (interface{}, error) {
|
|
defBackend := a.r.GetDefaultBackend()
|
|
config := &Config{}
|
|
|
|
var err error
|
|
|
|
config.ConnectTimeout, err = parser.GetIntAnnotation("proxy-connect-timeout", ing)
|
|
if err != nil {
|
|
config.ConnectTimeout = defBackend.ProxyConnectTimeout
|
|
}
|
|
|
|
config.SendTimeout, err = parser.GetIntAnnotation("proxy-send-timeout", ing)
|
|
if err != nil {
|
|
config.SendTimeout = defBackend.ProxySendTimeout
|
|
}
|
|
|
|
config.ReadTimeout, err = parser.GetIntAnnotation("proxy-read-timeout", ing)
|
|
if err != nil {
|
|
config.ReadTimeout = defBackend.ProxyReadTimeout
|
|
}
|
|
|
|
config.BuffersNumber, err = parser.GetIntAnnotation("proxy-buffers-number", ing)
|
|
if err != nil {
|
|
config.BuffersNumber = defBackend.ProxyBuffersNumber
|
|
}
|
|
|
|
config.BufferSize, err = parser.GetStringAnnotation("proxy-buffer-size", ing)
|
|
if err != nil {
|
|
config.BufferSize = defBackend.ProxyBufferSize
|
|
}
|
|
|
|
config.CookiePath, err = parser.GetStringAnnotation("proxy-cookie-path", ing)
|
|
if err != nil {
|
|
config.CookiePath = defBackend.ProxyCookiePath
|
|
}
|
|
|
|
config.CookieDomain, err = parser.GetStringAnnotation("proxy-cookie-domain", ing)
|
|
if err != nil {
|
|
config.CookieDomain = defBackend.ProxyCookieDomain
|
|
}
|
|
|
|
config.BodySize, err = parser.GetStringAnnotation("proxy-body-size", ing)
|
|
if err != nil {
|
|
config.BodySize = defBackend.ProxyBodySize
|
|
}
|
|
|
|
config.NextUpstream, err = parser.GetStringAnnotation("proxy-next-upstream", ing)
|
|
if err != nil {
|
|
config.NextUpstream = defBackend.ProxyNextUpstream
|
|
}
|
|
|
|
config.NextUpstreamTimeout, err = parser.GetIntAnnotation("proxy-next-upstream-timeout", ing)
|
|
if err != nil {
|
|
config.NextUpstreamTimeout = defBackend.ProxyNextUpstreamTimeout
|
|
}
|
|
|
|
config.NextUpstreamTries, err = parser.GetIntAnnotation("proxy-next-upstream-tries", ing)
|
|
if err != nil {
|
|
config.NextUpstreamTries = defBackend.ProxyNextUpstreamTries
|
|
}
|
|
|
|
config.RequestBuffering, err = parser.GetStringAnnotation("proxy-request-buffering", ing)
|
|
if err != nil {
|
|
config.RequestBuffering = defBackend.ProxyRequestBuffering
|
|
}
|
|
|
|
config.ProxyRedirectFrom, err = parser.GetStringAnnotation("proxy-redirect-from", ing)
|
|
if err != nil {
|
|
config.ProxyRedirectFrom = defBackend.ProxyRedirectFrom
|
|
}
|
|
|
|
config.ProxyRedirectTo, err = parser.GetStringAnnotation("proxy-redirect-to", ing)
|
|
if err != nil {
|
|
config.ProxyRedirectTo = defBackend.ProxyRedirectTo
|
|
}
|
|
|
|
config.ProxyBuffering, err = parser.GetStringAnnotation("proxy-buffering", ing)
|
|
if err != nil {
|
|
config.ProxyBuffering = defBackend.ProxyBuffering
|
|
}
|
|
|
|
config.ProxyHTTPVersion, err = parser.GetStringAnnotation("proxy-http-version", ing)
|
|
if err != nil {
|
|
config.ProxyHTTPVersion = defBackend.ProxyHTTPVersion
|
|
}
|
|
|
|
config.ProxyMaxTempFileSize, err = parser.GetStringAnnotation("proxy-max-temp-file-size", ing)
|
|
if err != nil {
|
|
config.ProxyMaxTempFileSize = defBackend.ProxyMaxTempFileSize
|
|
}
|
|
|
|
return config, nil
|
|
}
|