
* 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>
133 lines
3.2 KiB
Go
133 lines
3.2 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 controller
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
|
|
"k8s.io/klog/v2"
|
|
|
|
"pault.ag/go/sniff/parser"
|
|
)
|
|
|
|
// TCPServer describes a server that works in passthrough mode.
|
|
type TCPServer struct {
|
|
Hostname string
|
|
IP string
|
|
Port int
|
|
ProxyProtocol bool
|
|
}
|
|
|
|
// TCPProxy describes the passthrough servers and a default as catch all.
|
|
type TCPProxy struct {
|
|
ServerList []*TCPServer
|
|
Default *TCPServer
|
|
}
|
|
|
|
// Get returns the TCPServer to use for a given host.
|
|
func (p *TCPProxy) Get(host string) *TCPServer {
|
|
if p.ServerList == nil {
|
|
return p.Default
|
|
}
|
|
|
|
for _, s := range p.ServerList {
|
|
if s.Hostname == host {
|
|
return s
|
|
}
|
|
}
|
|
|
|
return p.Default
|
|
}
|
|
|
|
// Handle reads enough information from the connection to extract the hostname
|
|
// and open a connection to the passthrough server.
|
|
func (p *TCPProxy) Handle(conn net.Conn) {
|
|
defer conn.Close()
|
|
data := make([]byte, 4096)
|
|
|
|
length, err := conn.Read(data)
|
|
if err != nil {
|
|
klog.V(4).ErrorS(err, "Error reading the first 4k of the connection")
|
|
return
|
|
}
|
|
|
|
proxy := p.Default
|
|
hostname, err := parser.GetHostname(data[:])
|
|
if err == nil {
|
|
klog.V(4).InfoS("TLS Client Hello", "host", hostname)
|
|
proxy = p.Get(hostname)
|
|
}
|
|
|
|
if proxy == nil {
|
|
klog.V(4).InfoS("There is no configured proxy for SSL connections.")
|
|
return
|
|
}
|
|
|
|
hostPort := net.JoinHostPort(proxy.IP, fmt.Sprintf("%v", proxy.Port))
|
|
clientConn, err := net.Dial("tcp", hostPort)
|
|
if err != nil {
|
|
klog.V(4).ErrorS(err, "error dialing proxy", "ip", proxy.IP, "port", proxy.Port, "hostname", proxy.Hostname)
|
|
return
|
|
}
|
|
defer clientConn.Close()
|
|
|
|
if proxy.ProxyProtocol {
|
|
// write out the Proxy Protocol header
|
|
localAddr := conn.LocalAddr().(*net.TCPAddr)
|
|
remoteAddr := conn.RemoteAddr().(*net.TCPAddr)
|
|
protocol := "UNKNOWN"
|
|
if remoteAddr.IP.To4() != nil {
|
|
protocol = "TCP4"
|
|
} else if remoteAddr.IP.To16() != nil {
|
|
protocol = "TCP6"
|
|
}
|
|
proxyProtocolHeader := fmt.Sprintf("PROXY %s %s %s %d %d\r\n", protocol, remoteAddr.IP.String(), localAddr.IP.String(), remoteAddr.Port, localAddr.Port)
|
|
klog.V(4).InfoS("Writing Proxy Protocol", "header", proxyProtocolHeader)
|
|
_, err = fmt.Fprintf(clientConn, proxyProtocolHeader)
|
|
}
|
|
if err != nil {
|
|
klog.ErrorS(err, "Error writing Proxy Protocol header")
|
|
clientConn.Close()
|
|
} else {
|
|
_, err = clientConn.Write(data[:length])
|
|
if err != nil {
|
|
klog.Errorf("Error writing the first 4k of proxy data: %v", err)
|
|
clientConn.Close()
|
|
}
|
|
}
|
|
|
|
pipe(clientConn, conn)
|
|
}
|
|
|
|
func pipe(client, server net.Conn) {
|
|
doCopy := func(s, c net.Conn, cancel chan<- bool) {
|
|
io.Copy(s, c)
|
|
cancel <- true
|
|
}
|
|
|
|
cancel := make(chan bool, 2)
|
|
|
|
go doCopy(server, client, cancel)
|
|
go doCopy(client, server, cancel)
|
|
|
|
select {
|
|
case <-cancel:
|
|
return
|
|
}
|
|
}
|