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

Cleanup

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-09-17 15:42:31 -03:00
parent f478084cd8
commit 0661eaa08c
29 changed files with 264 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,7 @@ import (
"github.com/spf13/pflag"
proxyproto "github.com/armon/go-proxyproto"
api "k8s.io/api/core/v1"
api_v1 "k8s.io/api/core/v1"
apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/ingress/controllers/nginx/pkg/config"
@ -83,7 +82,7 @@ func newNGINXController() *NGINXController {
n := &NGINXController{
binary: ngx,
configmap: &api_v1.ConfigMap{},
configmap: &apiv1.ConfigMap{},
isIPV6Enabled: isIPv6Enabled(),
resolver: h,
ports: &config.ListenPorts{},
@ -123,7 +122,7 @@ type NGINXController struct {
controller *controller.GenericController
t *ngx_template.Template
configmap *api_v1.ConfigMap
configmap *apiv1.ConfigMap
storeLister ingress.StoreLister
@ -309,7 +308,7 @@ func (n NGINXController) DefaultEndpoint() ingress.Endpoint {
return ingress.Endpoint{
Address: "127.0.0.1",
Port: fmt.Sprintf("%v", n.ports.Default),
Target: &api.ObjectReference{},
Target: &apiv1.ObjectReference{},
}
}
@ -443,7 +442,7 @@ Error: %v
}
// SetConfig sets the configured configmap
func (n *NGINXController) SetConfig(cmap *api_v1.ConfigMap) {
func (n *NGINXController) SetConfig(cmap *apiv1.ConfigMap) {
n.configmap = cmap
n.isProxyProtocolEnabled = false
@ -469,7 +468,7 @@ func (n *NGINXController) SetListers(lister ingress.StoreLister) {
}
// UpdateIngressStatus custom Ingress status update
func (n *NGINXController) UpdateIngressStatus(*extensions.Ingress) []api_v1.LoadBalancerIngress {
func (n *NGINXController) UpdateIngressStatus(*extensions.Ingress) []apiv1.LoadBalancerIngress {
return nil
}
@ -598,7 +597,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
if exists {
setHeaders = cmap.(*api_v1.ConfigMap).Data
setHeaders = cmap.(*apiv1.ConfigMap).Data
}
}
@ -610,7 +609,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
if exists {
addHeaders = cmap.(*api_v1.ConfigMap).Data
addHeaders = cmap.(*apiv1.ConfigMap).Data
}
}
@ -623,7 +622,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
if exists {
secret := s.(*api_v1.Secret)
secret := s.(*apiv1.Secret)
nsSecName := strings.Replace(secretName, "/", "-", -1)
dh, ok := secret.Data["dhparam.pem"]

1
controllers/nginx/pkg/cmd/controller/tcp.go
View file

@ -6,6 +6,7 @@ import (
"net"
"github.com/golang/glog"
"github.com/paultag/sniff/parser"
)

4
controllers/nginx/pkg/cmd/controller/utils.go
View file

@ -24,9 +24,9 @@ import (
"os/exec"
"syscall"
"k8s.io/kubernetes/pkg/util/sysctl"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util/sysctl"
)
// sysctlSomaxconn returns the value of net.core.somaxconn, i.e.