DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix default-backend annotation

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-05-26 19:08:07 -04:00 • committed by Manuel Alejandro de Brito Fontes
parent 15ffb51394
commit 2023e56115
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
3 changed files with 62 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/ingress/annotations/annotations.go
View file

@ -21,6 +21,7 @@ import (
"github.com/imdario/mergo"
"k8s.io/ingress-nginx/internal/ingress/annotations/sslcipher"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -72,7 +73,7 @@ type Ingress struct {
ConfigurationSnippet string
Connection connection.Config
CorsConfig cors.Config
DefaultBackend string
DefaultBackend *apiv1.Service
Denied error
ExternalAuth authreq.Config
HealthCheck healthcheck.Config

2
internal/ingress/controller/controller.go
View file

@ -451,6 +451,7 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
loc.GRPC = anns.GRPC
loc.LuaRestyWAF = anns.LuaRestyWAF
loc.InfluxDB = anns.InfluxDB
loc.DefaultBackend = anns.DefaultBackend
if loc.Redirect.FromToWWW {
server.RedirectFromToWWW = true
@ -488,6 +489,7 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
GRPC: anns.GRPC,
LuaRestyWAF: anns.LuaRestyWAF,
InfluxDB: anns.InfluxDB,
DefaultBackend: anns.DefaultBackend,
}
if loc.Redirect.FromToWWW {