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

Remove secrets from ingress after a Delete event

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-05-11 21:50:43 -03:00
parent 4bd4bf3be6
commit a537d2d0fa
6 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,9 +85,9 @@ func newNGINXController() ingress.Controller {
resolver: h,
proxy: &proxy{
Default: &server{
Hostname: "localhost",
IP: "127.0.0.1",
Port: 442,
Hostname: "localhost",
IP: "127.0.0.1",
Port: 442,
ProxyProtocol: true,
},
},
@ -534,9 +534,9 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
//TODO: Allow PassthroughBackends to specify they support proxy-protocol
servers = append(servers, &server{
Hostname: pb.Hostname,
IP: svc.Spec.ClusterIP,
Port: port,
Hostname: pb.Hostname,
IP: svc.Spec.ClusterIP,
Port: port,
ProxyProtocol: false,
})
}

4
controllers/nginx/pkg/config/config_test.go
View file

@ -28,8 +28,8 @@ func TestBuildLogFormatUpstream(t *testing.T) {
curLogFormat string
expected string
}{
{true, logFormatUpstream, fmt.Sprintf(logFormatUpstream, "$proxy_protocol_addr")},
{false, logFormatUpstream, fmt.Sprintf(logFormatUpstream, "$remote_addr")},
{true, logFormatUpstream, fmt.Sprintf(logFormatUpstream, "$the_x_forwarded_for")},
{false, logFormatUpstream, fmt.Sprintf(logFormatUpstream, "$the_x_forwarded_for")},
{true, "my-log-format", "my-log-format"},
{false, "john-log-format", "john-log-format"},
}

3
controllers/nginx/pkg/template/configmap_test.go
View file

@ -76,8 +76,7 @@ func TestMergeConfigMapToStruct(t *testing.T) {
}
func TestDefaultLoadBalance(t *testing.T) {
conf := map[string]string{
}
conf := map[string]string{}
to := ReadConfig(conf)
if to.LoadBalanceAlgorithm != "least_conn" {
t.Errorf("default load balance algorithm wrong")