Revert removal of support for TCP and UDP services
This commit is contained in:
parent
d26543aa85
commit
168f30d1ec
16 changed files with 600 additions and 11 deletions
|
@ -64,6 +64,18 @@ Takes the form "namespace/name". When used together with update-status, the
|
||||||
controller mirrors the address of this service's endpoints to the load-balancer
|
controller mirrors the address of this service's endpoints to the load-balancer
|
||||||
status of all Ingress objects it satisfies.`)
|
status of all Ingress objects it satisfies.`)
|
||||||
|
|
||||||
|
tcpConfigMapName = flags.String("tcp-services-configmap", "",
|
||||||
|
`Name of the ConfigMap containing the definition of the TCP services to expose.
|
||||||
|
The key in the map indicates the external port to be used. The value is a
|
||||||
|
reference to a Service in the form "namespace/name:port", where "port" can
|
||||||
|
either be a port number or name. TCP ports 80 and 443 are reserved by the
|
||||||
|
controller for servicing HTTP traffic.`)
|
||||||
|
udpConfigMapName = flags.String("udp-services-configmap", "",
|
||||||
|
`Name of the ConfigMap containing the definition of the UDP services to expose.
|
||||||
|
The key in the map indicates the external port to be used. The value is a
|
||||||
|
reference to a Service in the form "namespace/name:port", where "port" can
|
||||||
|
either be a port name or number.`)
|
||||||
|
|
||||||
resyncPeriod = flags.Duration("sync-period", 0,
|
resyncPeriod = flags.Duration("sync-period", 0,
|
||||||
`Period at which the controller forces the repopulation of its local object stores. Disabled by default.`)
|
`Period at which the controller forces the repopulation of its local object stores. Disabled by default.`)
|
||||||
|
|
||||||
|
@ -217,6 +229,8 @@ Feature backed by OpenResty Lua libraries. Requires that OCSP stapling is not en
|
||||||
DefaultService: *defaultSvc,
|
DefaultService: *defaultSvc,
|
||||||
Namespace: *watchNamespace,
|
Namespace: *watchNamespace,
|
||||||
ConfigMapName: *configMap,
|
ConfigMapName: *configMap,
|
||||||
|
TCPConfigMapName: *tcpConfigMapName,
|
||||||
|
UDPConfigMapName: *udpConfigMapName,
|
||||||
DefaultSSLCertificate: *defSSLCertificate,
|
DefaultSSLCertificate: *defSSLCertificate,
|
||||||
DefaultHealthzURL: *defHealthzURL,
|
DefaultHealthzURL: *defHealthzURL,
|
||||||
HealthCheckTimeout: *healthCheckTimeout,
|
HealthCheckTimeout: *healthCheckTimeout,
|
||||||
|
|
|
@ -8,4 +8,21 @@ metadata:
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
||||||
---
|
---
|
||||||
|
kind: ConfigMap
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: tcp-services
|
||||||
|
namespace: ingress-nginx
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: ingress-nginx
|
||||||
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: ConfigMap
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: udp-services
|
||||||
|
namespace: ingress-nginx
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: ingress-nginx
|
||||||
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
|
@ -4,7 +4,6 @@ metadata:
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -15,7 +14,6 @@ metadata:
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -162,7 +160,6 @@ subjects:
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: extensions/v1beta1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -193,6 +190,8 @@ spec:
|
||||||
args:
|
args:
|
||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
||||||
|
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
|
||||||
|
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services
|
||||||
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
|
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
|
||||||
- --annotations-prefix=nginx.ingress.kubernetes.io
|
- --annotations-prefix=nginx.ingress.kubernetes.io
|
||||||
securityContext:
|
securityContext:
|
||||||
|
@ -238,3 +237,4 @@ spec:
|
||||||
timeoutSeconds: 1
|
timeoutSeconds: 1
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,8 @@ spec:
|
||||||
args:
|
args:
|
||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
||||||
|
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
|
||||||
|
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services
|
||||||
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
|
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
|
||||||
- --annotations-prefix=nginx.ingress.kubernetes.io
|
- --annotations-prefix=nginx.ingress.kubernetes.io
|
||||||
securityContext:
|
securityContext:
|
||||||
|
|
|
@ -709,6 +709,8 @@ type TemplateConfig struct {
|
||||||
Backends []*ingress.Backend
|
Backends []*ingress.Backend
|
||||||
PassthroughBackends []*ingress.SSLPassthroughBackend
|
PassthroughBackends []*ingress.SSLPassthroughBackend
|
||||||
Servers []*ingress.Server
|
Servers []*ingress.Server
|
||||||
|
TCPBackends []ingress.L4Service
|
||||||
|
UDPBackends []ingress.L4Service
|
||||||
HealthzURI string
|
HealthzURI string
|
||||||
CustomErrors bool
|
CustomErrors bool
|
||||||
Cfg Configuration
|
Cfg Configuration
|
||||||
|
|
|
@ -21,6 +21,7 @@ import (
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
|
@ -60,6 +61,11 @@ type Configuration struct {
|
||||||
|
|
||||||
ForceNamespaceIsolation bool
|
ForceNamespaceIsolation bool
|
||||||
|
|
||||||
|
// +optional
|
||||||
|
TCPConfigMapName string
|
||||||
|
// +optional
|
||||||
|
UDPConfigMapName string
|
||||||
|
|
||||||
DefaultHealthzURL string
|
DefaultHealthzURL string
|
||||||
HealthCheckTimeout time.Duration
|
HealthCheckTimeout time.Duration
|
||||||
DefaultSSLCertificate string
|
DefaultSSLCertificate string
|
||||||
|
@ -151,6 +157,8 @@ func (n *NGINXController) syncIngress(interface{}) error {
|
||||||
pcfg := &ingress.Configuration{
|
pcfg := &ingress.Configuration{
|
||||||
Backends: upstreams,
|
Backends: upstreams,
|
||||||
Servers: servers,
|
Servers: servers,
|
||||||
|
TCPEndpoints: n.getStreamServices(n.cfg.TCPConfigMapName, apiv1.ProtocolTCP),
|
||||||
|
UDPEndpoints: n.getStreamServices(n.cfg.UDPConfigMapName, apiv1.ProtocolUDP),
|
||||||
PassthroughBackends: passUpstreams,
|
PassthroughBackends: passUpstreams,
|
||||||
BackendConfigChecksum: n.store.GetBackendConfiguration().Checksum,
|
BackendConfigChecksum: n.store.GetBackendConfiguration().Checksum,
|
||||||
}
|
}
|
||||||
|
@ -216,6 +224,120 @@ func (n *NGINXController) syncIngress(interface{}) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (n *NGINXController) getStreamServices(configmapName string, proto apiv1.Protocol) []ingress.L4Service {
|
||||||
|
if configmapName == "" {
|
||||||
|
return []ingress.L4Service{}
|
||||||
|
}
|
||||||
|
glog.V(3).Infof("Obtaining information about %v stream services from ConfigMap %q", proto, configmapName)
|
||||||
|
_, _, err := k8s.ParseNameNS(configmapName)
|
||||||
|
if err != nil {
|
||||||
|
glog.Errorf("Error parsing ConfigMap reference %q: %v", configmapName, err)
|
||||||
|
return []ingress.L4Service{}
|
||||||
|
}
|
||||||
|
configmap, err := n.store.GetConfigMap(configmapName)
|
||||||
|
if err != nil {
|
||||||
|
glog.Errorf("Error getting ConfigMap %q: %v", configmapName, err)
|
||||||
|
return []ingress.L4Service{}
|
||||||
|
}
|
||||||
|
var svcs []ingress.L4Service
|
||||||
|
var svcProxyProtocol ingress.ProxyProtocol
|
||||||
|
rp := []int{
|
||||||
|
n.cfg.ListenPorts.HTTP,
|
||||||
|
n.cfg.ListenPorts.HTTPS,
|
||||||
|
n.cfg.ListenPorts.SSLProxy,
|
||||||
|
n.cfg.ListenPorts.Status,
|
||||||
|
n.cfg.ListenPorts.Health,
|
||||||
|
n.cfg.ListenPorts.Default,
|
||||||
|
}
|
||||||
|
reserverdPorts := sets.NewInt(rp...)
|
||||||
|
// svcRef format: <(str)namespace>/<(str)service>:<(intstr)port>[:<("PROXY")decode>:<("PROXY")encode>]
|
||||||
|
for port, svcRef := range configmap.Data {
|
||||||
|
externalPort, err := strconv.Atoi(port)
|
||||||
|
if err != nil {
|
||||||
|
glog.Warningf("%q is not a valid %v port number", port, proto)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if reserverdPorts.Has(externalPort) {
|
||||||
|
glog.Warningf("Port %d cannot be used for %v stream services. It is reserved for the Ingress controller.", externalPort, proto)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
nsSvcPort := strings.Split(svcRef, ":")
|
||||||
|
if len(nsSvcPort) < 2 {
|
||||||
|
glog.Warningf("Invalid Service reference %q for %v port %d", svcRef, proto, externalPort)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
nsName := nsSvcPort[0]
|
||||||
|
svcPort := nsSvcPort[1]
|
||||||
|
svcProxyProtocol.Decode = false
|
||||||
|
svcProxyProtocol.Encode = false
|
||||||
|
// Proxy Protocol is only compatible with TCP Services
|
||||||
|
if len(nsSvcPort) >= 3 && proto == apiv1.ProtocolTCP {
|
||||||
|
if len(nsSvcPort) >= 3 && strings.ToUpper(nsSvcPort[2]) == "PROXY" {
|
||||||
|
svcProxyProtocol.Decode = true
|
||||||
|
}
|
||||||
|
if len(nsSvcPort) == 4 && strings.ToUpper(nsSvcPort[3]) == "PROXY" {
|
||||||
|
svcProxyProtocol.Encode = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
svcNs, svcName, err := k8s.ParseNameNS(nsName)
|
||||||
|
if err != nil {
|
||||||
|
glog.Warningf("%v", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
svc, err := n.store.GetService(nsName)
|
||||||
|
if err != nil {
|
||||||
|
glog.Warningf("Error getting Service %q: %v", nsName, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var endps []ingress.Endpoint
|
||||||
|
targetPort, err := strconv.Atoi(svcPort)
|
||||||
|
if err != nil {
|
||||||
|
// not a port number, fall back to using port name
|
||||||
|
glog.V(3).Infof("Searching Endpoints with %v port name %q for Service %q", proto, svcPort, nsName)
|
||||||
|
for _, sp := range svc.Spec.Ports {
|
||||||
|
if sp.Name == svcPort {
|
||||||
|
if sp.Protocol == proto {
|
||||||
|
endps = getEndpoints(svc, &sp, proto, n.store.GetServiceEndpoints)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
glog.V(3).Infof("Searching Endpoints with %v port number %d for Service %q", proto, targetPort, nsName)
|
||||||
|
for _, sp := range svc.Spec.Ports {
|
||||||
|
if sp.Port == int32(targetPort) {
|
||||||
|
if sp.Protocol == proto {
|
||||||
|
endps = getEndpoints(svc, &sp, proto, n.store.GetServiceEndpoints)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// stream services cannot contain empty upstreams and there is
|
||||||
|
// no default backend equivalent
|
||||||
|
if len(endps) == 0 {
|
||||||
|
glog.Warningf("Service %q does not have any active Endpoint for %v port %v", nsName, proto, svcPort)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
svcs = append(svcs, ingress.L4Service{
|
||||||
|
Port: externalPort,
|
||||||
|
Backend: ingress.L4Backend{
|
||||||
|
Name: svcName,
|
||||||
|
Namespace: svcNs,
|
||||||
|
Port: intstr.FromString(svcPort),
|
||||||
|
Protocol: proto,
|
||||||
|
ProxyProtocol: svcProxyProtocol,
|
||||||
|
},
|
||||||
|
Endpoints: endps,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// Keep upstream order sorted to reduce unnecessary nginx config reloads.
|
||||||
|
sort.SliceStable(svcs, func(i, j int) bool {
|
||||||
|
return svcs[i].Port < svcs[j].Port
|
||||||
|
})
|
||||||
|
return svcs
|
||||||
|
}
|
||||||
|
|
||||||
// getDefaultUpstream returns the upstream associated with the default backend.
|
// getDefaultUpstream returns the upstream associated with the default backend.
|
||||||
// Configures the upstream to return HTTP code 503 in case of error.
|
// Configures the upstream to return HTTP code 503 in case of error.
|
||||||
func (n *NGINXController) getDefaultUpstream() *ingress.Backend {
|
func (n *NGINXController) getDefaultUpstream() *ingress.Backend {
|
||||||
|
|
|
@ -39,6 +39,7 @@ import (
|
||||||
proxyproto "github.com/armon/go-proxyproto"
|
proxyproto "github.com/armon/go-proxyproto"
|
||||||
"github.com/eapache/channels"
|
"github.com/eapache/channels"
|
||||||
apiv1 "k8s.io/api/core/v1"
|
apiv1 "k8s.io/api/core/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/util/intstr"
|
||||||
"k8s.io/client-go/kubernetes/scheme"
|
"k8s.io/client-go/kubernetes/scheme"
|
||||||
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
|
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||||
"k8s.io/client-go/tools/record"
|
"k8s.io/client-go/tools/record"
|
||||||
|
@ -112,6 +113,8 @@ func NewNGINXController(config *Configuration, mc metric.Collector, fs file.File
|
||||||
config.EnableSSLChainCompletion,
|
config.EnableSSLChainCompletion,
|
||||||
config.Namespace,
|
config.Namespace,
|
||||||
config.ConfigMapName,
|
config.ConfigMapName,
|
||||||
|
config.TCPConfigMapName,
|
||||||
|
config.UDPConfigMapName,
|
||||||
config.DefaultSSLCertificate,
|
config.DefaultSSLCertificate,
|
||||||
config.ResyncPeriod,
|
config.ResyncPeriod,
|
||||||
config.Client,
|
config.Client,
|
||||||
|
@ -578,6 +581,8 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
|
||||||
Backends: ingressCfg.Backends,
|
Backends: ingressCfg.Backends,
|
||||||
PassthroughBackends: ingressCfg.PassthroughBackends,
|
PassthroughBackends: ingressCfg.PassthroughBackends,
|
||||||
Servers: ingressCfg.Servers,
|
Servers: ingressCfg.Servers,
|
||||||
|
TCPBackends: ingressCfg.TCPEndpoints,
|
||||||
|
UDPBackends: ingressCfg.UDPEndpoints,
|
||||||
HealthzURI: ngxHealthPath,
|
HealthzURI: ngxHealthPath,
|
||||||
CustomErrors: len(cfg.CustomHTTPErrors) > 0,
|
CustomErrors: len(cfg.CustomHTTPErrors) > 0,
|
||||||
Cfg: cfg,
|
Cfg: cfg,
|
||||||
|
@ -789,6 +794,42 @@ func configureDynamically(pcfg *ingress.Configuration, port int, isDynamicCertif
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
streamSocket := "/tmp/ingress-stream.sock"
|
||||||
|
conn, err := net.Dial("unix", streamSocket)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
var streams []*ingress.Backend
|
||||||
|
for _, ep := range pcfg.TCPEndpoints {
|
||||||
|
key := fmt.Sprintf("tcp-%v-%v-%v", ep.Backend.Namespace, ep.Backend.Name, ep.Backend.Port.String())
|
||||||
|
streams = append(streams, &ingress.Backend{
|
||||||
|
Name: key,
|
||||||
|
Endpoints: ep.Endpoints,
|
||||||
|
Port: intstr.FromInt(ep.Port),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
for _, ep := range pcfg.UDPEndpoints {
|
||||||
|
key := fmt.Sprintf("udp-%v-%v-%v", ep.Backend.Namespace, ep.Backend.Name, ep.Backend.Port.String())
|
||||||
|
streams = append(streams, &ingress.Backend{
|
||||||
|
Name: key,
|
||||||
|
Endpoints: ep.Endpoints,
|
||||||
|
Port: intstr.FromInt(ep.Port),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
buf, err := json.Marshal(streams)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = conn.Write(buf)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fmt.Fprintf(conn, "\r\n")
|
||||||
|
|
||||||
if isDynamicCertificatesEnabled {
|
if isDynamicCertificatesEnabled {
|
||||||
err = configureCertificates(pcfg, port)
|
err = configureCertificates(pcfg, port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -824,7 +865,6 @@ func post(url string, data interface{}) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
glog.V(2).Infof("Posting to %s", url)
|
glog.V(2).Infof("Posting to %s", url)
|
||||||
|
|
||||||
resp, err := http.Post(url, "application/json", bytes.NewReader(buf))
|
resp, err := http.Post(url, "application/json", bytes.NewReader(buf))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -218,7 +218,7 @@ type k8sStore struct {
|
||||||
|
|
||||||
// New creates a new object store to be used in the ingress controller
|
// New creates a new object store to be used in the ingress controller
|
||||||
func New(checkOCSP bool,
|
func New(checkOCSP bool,
|
||||||
namespace, configmap, defaultSSLCertificate string,
|
namespace, configmap, tcp, udp, defaultSSLCertificate string,
|
||||||
resyncPeriod time.Duration,
|
resyncPeriod time.Duration,
|
||||||
client clientset.Interface,
|
client clientset.Interface,
|
||||||
fs file.Filesystem,
|
fs file.Filesystem,
|
||||||
|
@ -473,7 +473,7 @@ func New(checkOCSP bool,
|
||||||
cm := obj.(*corev1.ConfigMap)
|
cm := obj.(*corev1.ConfigMap)
|
||||||
key := k8s.MetaNamespaceKey(cm)
|
key := k8s.MetaNamespaceKey(cm)
|
||||||
// updates to configuration configmaps can trigger an update
|
// updates to configuration configmaps can trigger an update
|
||||||
if key == configmap {
|
if key == configmap || key == tcp || key == udp {
|
||||||
recorder.Eventf(cm, corev1.EventTypeNormal, "CREATE", fmt.Sprintf("ConfigMap %v", key))
|
recorder.Eventf(cm, corev1.EventTypeNormal, "CREATE", fmt.Sprintf("ConfigMap %v", key))
|
||||||
if key == configmap {
|
if key == configmap {
|
||||||
store.setConfig(cm)
|
store.setConfig(cm)
|
||||||
|
@ -489,7 +489,7 @@ func New(checkOCSP bool,
|
||||||
cm := cur.(*corev1.ConfigMap)
|
cm := cur.(*corev1.ConfigMap)
|
||||||
key := k8s.MetaNamespaceKey(cm)
|
key := k8s.MetaNamespaceKey(cm)
|
||||||
// updates to configuration configmaps can trigger an update
|
// updates to configuration configmaps can trigger an update
|
||||||
if key == configmap {
|
if key == configmap || key == tcp || key == udp {
|
||||||
recorder.Eventf(cm, corev1.EventTypeNormal, "UPDATE", fmt.Sprintf("ConfigMap %v", key))
|
recorder.Eventf(cm, corev1.EventTypeNormal, "UPDATE", fmt.Sprintf("ConfigMap %v", key))
|
||||||
if key == configmap {
|
if key == configmap {
|
||||||
store.setConfig(cm)
|
store.setConfig(cm)
|
||||||
|
|
|
@ -63,6 +63,8 @@ func TestStore(t *testing.T) {
|
||||||
storer := New(true,
|
storer := New(true,
|
||||||
ns,
|
ns,
|
||||||
fmt.Sprintf("%v/config", ns),
|
fmt.Sprintf("%v/config", ns),
|
||||||
|
fmt.Sprintf("%v/tcp", ns),
|
||||||
|
fmt.Sprintf("%v/udp", ns),
|
||||||
"",
|
"",
|
||||||
10*time.Minute,
|
10*time.Minute,
|
||||||
clientSet,
|
clientSet,
|
||||||
|
@ -149,6 +151,8 @@ func TestStore(t *testing.T) {
|
||||||
storer := New(true,
|
storer := New(true,
|
||||||
ns,
|
ns,
|
||||||
fmt.Sprintf("%v/config", ns),
|
fmt.Sprintf("%v/config", ns),
|
||||||
|
fmt.Sprintf("%v/tcp", ns),
|
||||||
|
fmt.Sprintf("%v/udp", ns),
|
||||||
"",
|
"",
|
||||||
10*time.Minute,
|
10*time.Minute,
|
||||||
clientSet,
|
clientSet,
|
||||||
|
@ -295,6 +299,8 @@ func TestStore(t *testing.T) {
|
||||||
storer := New(true,
|
storer := New(true,
|
||||||
ns,
|
ns,
|
||||||
fmt.Sprintf("%v/config", ns),
|
fmt.Sprintf("%v/config", ns),
|
||||||
|
fmt.Sprintf("%v/tcp", ns),
|
||||||
|
fmt.Sprintf("%v/udp", ns),
|
||||||
"",
|
"",
|
||||||
10*time.Minute,
|
10*time.Minute,
|
||||||
clientSet,
|
clientSet,
|
||||||
|
@ -382,6 +388,8 @@ func TestStore(t *testing.T) {
|
||||||
storer := New(true,
|
storer := New(true,
|
||||||
ns,
|
ns,
|
||||||
fmt.Sprintf("%v/config", ns),
|
fmt.Sprintf("%v/config", ns),
|
||||||
|
fmt.Sprintf("%v/tcp", ns),
|
||||||
|
fmt.Sprintf("%v/udp", ns),
|
||||||
"",
|
"",
|
||||||
10*time.Minute,
|
10*time.Minute,
|
||||||
clientSet,
|
clientSet,
|
||||||
|
@ -492,6 +500,8 @@ func TestStore(t *testing.T) {
|
||||||
storer := New(true,
|
storer := New(true,
|
||||||
ns,
|
ns,
|
||||||
fmt.Sprintf("%v/config", ns),
|
fmt.Sprintf("%v/config", ns),
|
||||||
|
fmt.Sprintf("%v/tcp", ns),
|
||||||
|
fmt.Sprintf("%v/udp", ns),
|
||||||
"",
|
"",
|
||||||
10*time.Minute,
|
10*time.Minute,
|
||||||
clientSet,
|
clientSet,
|
||||||
|
|
|
@ -54,6 +54,12 @@ type Configuration struct {
|
||||||
Backends []*Backend `json:"backends,omitempty"`
|
Backends []*Backend `json:"backends,omitempty"`
|
||||||
// Servers save the website config
|
// Servers save the website config
|
||||||
Servers []*Server `json:"servers,omitempty"`
|
Servers []*Server `json:"servers,omitempty"`
|
||||||
|
// TCPEndpoints contain endpoints for tcp streams handled by this backend
|
||||||
|
// +optional
|
||||||
|
TCPEndpoints []L4Service `json:"tcpEndpoints,omitempty"`
|
||||||
|
// UDPEndpoints contain endpoints for udp streams handled by this backend
|
||||||
|
// +optional
|
||||||
|
UDPEndpoints []L4Service `json:"udpEndpoints,omitempty"`
|
||||||
// PassthroughBackends contains the backends used for SSL passthrough.
|
// PassthroughBackends contains the backends used for SSL passthrough.
|
||||||
// It contains information about the associated Server Name Indication (SNI).
|
// It contains information about the associated Server Name Indication (SNI).
|
||||||
// +optional
|
// +optional
|
||||||
|
|
|
@ -53,6 +53,40 @@ func (c1 *Configuration) Equal(c2 *Configuration) bool {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(c1.TCPEndpoints) != len(c2.TCPEndpoints) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, tcp1 := range c1.TCPEndpoints {
|
||||||
|
found := false
|
||||||
|
for _, tcp2 := range c2.TCPEndpoints {
|
||||||
|
if (&tcp1).Equal(&tcp2) {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(c1.UDPEndpoints) != len(c2.UDPEndpoints) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, udp1 := range c1.UDPEndpoints {
|
||||||
|
found := false
|
||||||
|
for _, udp2 := range c2.UDPEndpoints {
|
||||||
|
if (&udp1).Equal(&udp2) {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(c1.PassthroughBackends) != len(c2.PassthroughBackends) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
for _, ptb1 := range c1.PassthroughBackends {
|
for _, ptb1 := range c1.PassthroughBackends {
|
||||||
found := false
|
found := false
|
||||||
for _, ptb2 := range c2.PassthroughBackends {
|
for _, ptb2 := range c2.PassthroughBackends {
|
||||||
|
|
|
@ -47,7 +47,7 @@ local function handle_servers()
|
||||||
|
|
||||||
local ok, servers = pcall(json.decode, raw_servers)
|
local ok, servers = pcall(json.decode, raw_servers)
|
||||||
if not ok then
|
if not ok then
|
||||||
ngx.log(ngx.ERR, "could not parse servers: " .. tostring(servers))
|
ngx.log(ngx.ERR, "could not parse servers: " .. tostring(servers))
|
||||||
ngx.status = ngx.HTTP_BAD_REQUEST
|
ngx.status = ngx.HTTP_BAD_REQUEST
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -63,8 +63,7 @@ local function handle_servers()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local err_msg = string.format("error setting certificate for %s: %s\n",
|
local err_msg = string.format("error setting certificate for %s: %s\n", server.hostname, tostring(err))
|
||||||
server.hostname, tostring(err))
|
|
||||||
table.insert(err_buf, err_msg)
|
table.insert(err_buf, err_msg)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
184
rootfs/etc/nginx/lua/tcp_udp_balancer.lua
Normal file
184
rootfs/etc/nginx/lua/tcp_udp_balancer.lua
Normal file
|
@ -0,0 +1,184 @@
|
||||||
|
local ngx_balancer = require("ngx.balancer")
|
||||||
|
local json = require("cjson")
|
||||||
|
local util = require("util")
|
||||||
|
local dns_util = require("util.dns")
|
||||||
|
local configuration = require("tcp_udp_configuration")
|
||||||
|
local round_robin = require("balancer.round_robin")
|
||||||
|
|
||||||
|
-- measured in seconds
|
||||||
|
-- for an Nginx worker to pick up the new list of upstream peers
|
||||||
|
-- it will take <the delay until controller POSTed the backend object to the Nginx endpoint> + BACKENDS_SYNC_INTERVAL
|
||||||
|
local BACKENDS_SYNC_INTERVAL = 1
|
||||||
|
|
||||||
|
local DEFAULT_LB_ALG = "round_robin"
|
||||||
|
local IMPLEMENTATIONS = {
|
||||||
|
round_robin = round_robin
|
||||||
|
}
|
||||||
|
|
||||||
|
local _M = {}
|
||||||
|
local balancers = {}
|
||||||
|
|
||||||
|
local function get_implementation(backend)
|
||||||
|
local name = backend["load-balance"] or DEFAULT_LB_ALG
|
||||||
|
|
||||||
|
local implementation = IMPLEMENTATIONS[name]
|
||||||
|
if not implementation then
|
||||||
|
ngx.log(ngx.WARN, string.format("%s is not supported, falling back to %s", backend["load-balance"], DEFAULT_LB_ALG))
|
||||||
|
implementation = IMPLEMENTATIONS[DEFAULT_LB_ALG]
|
||||||
|
end
|
||||||
|
|
||||||
|
return implementation
|
||||||
|
end
|
||||||
|
|
||||||
|
local function resolve_external_names(original_backend)
|
||||||
|
local backend = util.deepcopy(original_backend)
|
||||||
|
local endpoints = {}
|
||||||
|
for _, endpoint in ipairs(backend.endpoints) do
|
||||||
|
local ips = dns_util.resolve(endpoint.address)
|
||||||
|
for _, ip in ipairs(ips) do
|
||||||
|
table.insert(endpoints, {address = ip, port = endpoint.port})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
backend.endpoints = endpoints
|
||||||
|
return backend
|
||||||
|
end
|
||||||
|
|
||||||
|
local function format_ipv6_endpoints(endpoints)
|
||||||
|
local formatted_endpoints = {}
|
||||||
|
for _, endpoint in ipairs(endpoints) do
|
||||||
|
local formatted_endpoint = endpoint
|
||||||
|
if not endpoint.address:match("^%d+.%d+.%d+.%d+$") then
|
||||||
|
formatted_endpoint.address = string.format("[%s]", endpoint.address)
|
||||||
|
end
|
||||||
|
table.insert(formatted_endpoints, formatted_endpoint)
|
||||||
|
end
|
||||||
|
return formatted_endpoints
|
||||||
|
end
|
||||||
|
|
||||||
|
local function sync_backend(backend)
|
||||||
|
if not backend.endpoints or #backend.endpoints == 0 then
|
||||||
|
ngx.log(ngx.INFO, string.format("there is no endpoint for backend %s. Skipping...", backend.name))
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
ngx.log(ngx.INFO, string.format("backend ", backend.name))
|
||||||
|
local implementation = get_implementation(backend)
|
||||||
|
local balancer = balancers[backend.name]
|
||||||
|
|
||||||
|
if not balancer then
|
||||||
|
balancers[backend.name] = implementation:new(backend)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- every implementation is the metatable of its instances (see .new(...) functions)
|
||||||
|
-- here we check if `balancer` is the instance of `implementation`
|
||||||
|
-- if it is not then we deduce LB algorithm has changed for the backend
|
||||||
|
if getmetatable(balancer) ~= implementation then
|
||||||
|
ngx.log(
|
||||||
|
ngx.INFO,
|
||||||
|
string.format("LB algorithm changed from %s to %s, resetting the instance", balancer.name, implementation.name)
|
||||||
|
)
|
||||||
|
balancers[backend.name] = implementation:new(backend)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local service_type = backend.service and backend.service.spec and backend.service.spec["type"]
|
||||||
|
if service_type == "ExternalName" then
|
||||||
|
backend = resolve_external_names(backend)
|
||||||
|
end
|
||||||
|
|
||||||
|
backend.endpoints = format_ipv6_endpoints(backend.endpoints)
|
||||||
|
|
||||||
|
balancer:sync(backend)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function sync_backends()
|
||||||
|
local backends_data = configuration.get_backends_data()
|
||||||
|
if not backends_data then
|
||||||
|
balancers = {}
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local ok, new_backends = pcall(json.decode, backends_data)
|
||||||
|
if not ok then
|
||||||
|
ngx.log(ngx.ERR, "could not parse backends data: " .. tostring(new_backends))
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local balancers_to_keep = {}
|
||||||
|
for _, new_backend in ipairs(new_backends) do
|
||||||
|
sync_backend(new_backend)
|
||||||
|
balancers_to_keep[new_backend.name] = balancers[new_backend.name]
|
||||||
|
end
|
||||||
|
|
||||||
|
for backend_name, _ in pairs(balancers) do
|
||||||
|
if not balancers_to_keep[backend_name] then
|
||||||
|
balancers[backend_name] = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function get_balancer()
|
||||||
|
local backend_name = ngx.var.proxy_upstream_name
|
||||||
|
local balancer = balancers[backend_name]
|
||||||
|
if not balancer then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
return balancer
|
||||||
|
end
|
||||||
|
|
||||||
|
function _M.init_worker()
|
||||||
|
sync_backends() -- when worker starts, sync backends without delay
|
||||||
|
local _, err = ngx.timer.every(BACKENDS_SYNC_INTERVAL, sync_backends)
|
||||||
|
if err then
|
||||||
|
ngx.log(ngx.ERR, string.format("error when setting up timer.every for sync_backends: %s", tostring(err)))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function _M.balance()
|
||||||
|
local balancer = get_balancer()
|
||||||
|
if not balancer then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local peer = balancer:balance()
|
||||||
|
if not peer then
|
||||||
|
ngx.log(ngx.WARN, "no peer was returned, balancer: " .. balancer.name)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local ctx = ngx.ctx
|
||||||
|
if not ctx.has_run then
|
||||||
|
ctx.has_run = true
|
||||||
|
local _, err = ngx_balancer.set_more_tries(1)
|
||||||
|
if err then
|
||||||
|
ngx.log(ngx.ERR, "failed to set more tries: ", err)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local ok, err = ngx_balancer.set_current_peer(peer)
|
||||||
|
if not ok then
|
||||||
|
ngx.log(ngx.ERR, string.format("error while setting current upstream peer %s: %s", peer, err))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function _M.log()
|
||||||
|
local balancer = get_balancer()
|
||||||
|
if not balancer then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if not balancer.after_balance then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
balancer:after_balance()
|
||||||
|
end
|
||||||
|
|
||||||
|
if _TEST then
|
||||||
|
_M.get_implementation = get_implementation
|
||||||
|
_M.sync_backend = sync_backend
|
||||||
|
end
|
||||||
|
|
||||||
|
return _M
|
36
rootfs/etc/nginx/lua/tcp_udp_configuration.lua
Normal file
36
rootfs/etc/nginx/lua/tcp_udp_configuration.lua
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
-- this is the Lua representation of TCP/UDP Configuration
|
||||||
|
local tcp_udp_configuration_data = ngx.shared.tcp_udp_configuration_data
|
||||||
|
|
||||||
|
local _M = {
|
||||||
|
nameservers = {}
|
||||||
|
}
|
||||||
|
|
||||||
|
function _M.get_backends_data()
|
||||||
|
return tcp_udp_configuration_data:get("backends")
|
||||||
|
end
|
||||||
|
|
||||||
|
function _M.call()
|
||||||
|
local sock, err = ngx.req.socket(true)
|
||||||
|
if not sock then
|
||||||
|
ngx.log(ngx.ERR, "failed to get raw req socket: ", err)
|
||||||
|
ngx.say("error: ", err)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local reader = sock:receiveuntil("\r\n")
|
||||||
|
local backends, err_read = reader()
|
||||||
|
if not backends then
|
||||||
|
ngx.log(ngx.ERR, "failed TCP/UDP dynamic-configuration:", err_read)
|
||||||
|
ngx.say("error: ", err_read)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local success, err_conf = tcp_udp_configuration_data:set("backends", backends)
|
||||||
|
if not success then
|
||||||
|
ngx.log(ngx.ERR, "dynamic-configuration: error updating configuration: " .. tostring(err_conf))
|
||||||
|
ngx.say("error: ", err_conf)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return _M
|
|
@ -680,6 +680,40 @@ http {
|
||||||
}
|
}
|
||||||
|
|
||||||
stream {
|
stream {
|
||||||
|
lua_package_cpath "/usr/local/lib/lua/?.so;/usr/lib/lua-platform-path/lua/5.1/?.so;;";
|
||||||
|
lua_package_path "/etc/nginx/lua/?.lua;/etc/nginx/lua/vendor/?.lua;/usr/local/lib/lua/?.lua;;";
|
||||||
|
|
||||||
|
lua_shared_dict tcp_udp_configuration_data 5M;
|
||||||
|
|
||||||
|
init_by_lua_block {
|
||||||
|
require("resty.core")
|
||||||
|
collectgarbage("collect")
|
||||||
|
|
||||||
|
-- init modules
|
||||||
|
local ok, res
|
||||||
|
|
||||||
|
ok, res = pcall(require, "tcp_udp_configuration")
|
||||||
|
if not ok then
|
||||||
|
error("require failed: " .. tostring(res))
|
||||||
|
else
|
||||||
|
tcp_udp_configuration = res
|
||||||
|
tcp_udp_configuration.nameservers = { {{ buildResolversForLua $cfg.Resolver $cfg.DisableIpv6DNS }} }
|
||||||
|
end
|
||||||
|
|
||||||
|
ok, res = pcall(require, "tcp_udp_balancer")
|
||||||
|
if not ok then
|
||||||
|
error("require failed: " .. tostring(res))
|
||||||
|
else
|
||||||
|
tcp_udp_balancer = res
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
init_worker_by_lua_block {
|
||||||
|
tcp_udp_balancer.init_worker()
|
||||||
|
}
|
||||||
|
|
||||||
|
lua_add_variable $proxy_upstream_name;
|
||||||
|
|
||||||
log_format log_stream {{ $cfg.LogFormatStream }};
|
log_format log_stream {{ $cfg.LogFormatStream }};
|
||||||
|
|
||||||
{{ if $cfg.DisableAccessLog }}
|
{{ if $cfg.DisableAccessLog }}
|
||||||
|
@ -689,6 +723,74 @@ stream {
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
error_log {{ $cfg.ErrorLogPath }};
|
error_log {{ $cfg.ErrorLogPath }};
|
||||||
|
|
||||||
|
upstream upstream_balancer {
|
||||||
|
server 0.0.0.1:1234; # placeholder
|
||||||
|
|
||||||
|
balancer_by_lua_block {
|
||||||
|
tcp_udp_balancer.balance()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen unix:/tmp/ingress-stream.sock;
|
||||||
|
|
||||||
|
content_by_lua_block {
|
||||||
|
tcp_udp_configuration.call()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# TCP services
|
||||||
|
{{ range $tcpServer := .TCPBackends }}
|
||||||
|
server {
|
||||||
|
preread_by_lua_block {
|
||||||
|
ngx.var.proxy_upstream_name="tcp-{{ $tcpServer.Backend.Namespace }}-{{ $tcpServer.Backend.Name }}-{{ $tcpServer.Backend.Port }}";
|
||||||
|
}
|
||||||
|
|
||||||
|
{{ range $address := $all.Cfg.BindAddressIpv4 }}
|
||||||
|
listen {{ $address }}:{{ $tcpServer.Port }}{{ if $tcpServer.Backend.ProxyProtocol.Decode }} proxy_protocol{{ end }};
|
||||||
|
{{ else }}
|
||||||
|
listen {{ $tcpServer.Port }}{{ if $tcpServer.Backend.ProxyProtocol.Decode }} proxy_protocol{{ end }};
|
||||||
|
{{ end }}
|
||||||
|
{{ if $IsIPV6Enabled }}
|
||||||
|
{{ range $address := $all.Cfg.BindAddressIpv6 }}
|
||||||
|
listen {{ $address }}:{{ $tcpServer.Port }}{{ if $tcpServer.Backend.ProxyProtocol.Decode }} proxy_protocol{{ end }};
|
||||||
|
{{ else }}
|
||||||
|
listen [::]:{{ $tcpServer.Port }}{{ if $tcpServer.Backend.ProxyProtocol.Decode }} proxy_protocol{{ end }};
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
proxy_timeout {{ $cfg.ProxyStreamTimeout }};
|
||||||
|
proxy_pass upstream_balancer;
|
||||||
|
{{ if $tcpServer.Backend.ProxyProtocol.Encode }}
|
||||||
|
proxy_protocol on;
|
||||||
|
{{ end }}
|
||||||
|
}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
# UDP services
|
||||||
|
{{ range $udpServer := .UDPBackends }}
|
||||||
|
server {
|
||||||
|
preread_by_lua_block {
|
||||||
|
ngx.var.proxy_upstream_name="udp-{{ $udpServer.Backend.Namespace }}-{{ $udpServer.Backend.Name }}-{{ $udpServer.Backend.Port }}";
|
||||||
|
}
|
||||||
|
|
||||||
|
{{ range $address := $all.Cfg.BindAddressIpv4 }}
|
||||||
|
listen {{ $address }}:{{ $udpServer.Port }} udp;
|
||||||
|
{{ else }}
|
||||||
|
listen {{ $udpServer.Port }} udp;
|
||||||
|
{{ end }}
|
||||||
|
{{ if $IsIPV6Enabled }}
|
||||||
|
{{ range $address := $all.Cfg.BindAddressIpv6 }}
|
||||||
|
listen {{ $address }}:{{ $udpServer.Port }} udp;
|
||||||
|
{{ else }}
|
||||||
|
listen [::]:{{ $udpServer.Port }} udp;
|
||||||
|
{{ end }}
|
||||||
|
{{ end }}
|
||||||
|
proxy_responses {{ $cfg.ProxyStreamResponses }};
|
||||||
|
proxy_timeout {{ $cfg.ProxyStreamTimeout }};
|
||||||
|
proxy_pass upstream_balancer;
|
||||||
|
}
|
||||||
|
{{ end }}
|
||||||
}
|
}
|
||||||
|
|
||||||
{{/* definition of templates to avoid repetitions */}}
|
{{/* definition of templates to avoid repetitions */}}
|
||||||
|
|
|
@ -5,6 +5,25 @@ metadata:
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: ConfigMap
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: tcp-services
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: ingress-nginx
|
||||||
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: ConfigMap
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: udp-services
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/name: ingress-nginx
|
||||||
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
@ -206,6 +225,8 @@ spec:
|
||||||
args:
|
args:
|
||||||
- /nginx-ingress-controller
|
- /nginx-ingress-controller
|
||||||
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
- --configmap=$(POD_NAMESPACE)/nginx-configuration
|
||||||
|
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
|
||||||
|
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services
|
||||||
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
|
- --publish-service=$(POD_NAMESPACE)/ingress-nginx
|
||||||
- --annotations-prefix=nginx.ingress.kubernetes.io
|
- --annotations-prefix=nginx.ingress.kubernetes.io
|
||||||
- --watch-namespace=${NAMESPACE}
|
- --watch-namespace=${NAMESPACE}
|
||||||
|
|
Loading…
Reference in a new issue