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

Merge 555259eeee into abc53ccfc5

Browse source
This commit is contained in:
Daniel Martins 2017-08-31 15:13:23 +00:00 committed by GitHub
commit 0ca2754eaf
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -372,7 +372,7 @@ func (n *NGINXController) OverrideFlags(flags *pflag.FlagSet) {
} }
flags.Set("ingress-class", ic) flags.Set("ingress-class", ic)
n.stats = newStatsCollector(wc, ic, n.binary, n.ports.Health) n.stats = newStatsCollector(wc, ic, n.binary, n.ports.Status)
if n.isSSLPassthroughEnabled { if n.isSSLPassthroughEnabled {
if !isPortAvailable(n.ports.SSLProxy) { if !isPortAvailable(n.ports.SSLProxy) {

1
controllers/nginx/pkg/config/config.go
View file

@ -475,7 +475,6 @@ type ListenPorts struct {
HTTP int HTTP int
HTTPS int HTTPS int
Status int Status int
Health int
Default int Default int
SSLProxy int SSLProxy int
} }