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

Update nginx and generic controller

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-04-01 11:39:42 -03:00
parent c7c2a564a9
commit e0561ddeb9
62 changed files with 1043 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ import (
"github.com/golang/glog"
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/api"
api_v1 "k8s.io/client-go/pkg/api/v1"
"strings"
@ -71,7 +71,7 @@ func newNGINXController() ingress.Controller {
}
n := &NGINXController{
binary: ngx,
configmap: &api.ConfigMap{},
configmap: &api_v1.ConfigMap{},
}
var onChange func()
@ -108,7 +108,7 @@ Error loading new template : %v
type NGINXController struct {
t *ngx_template.Template
configmap *api.ConfigMap
configmap *api_v1.ConfigMap
storeLister ingress.StoreLister
@ -308,7 +308,7 @@ Error: %v
}
// SetConfig sets the configured configmap
func (n *NGINXController) SetConfig(cmap *api.ConfigMap) {
func (n *NGINXController) SetConfig(cmap *api_v1.ConfigMap) {
n.configmap = cmap
}
@ -383,7 +383,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
}
if exists {
setHeaders = cmap.(*api.ConfigMap).Data
setHeaders = cmap.(*api_v1.ConfigMap).Data
}
}
@ -396,7 +396,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
}
if exists {
secret := s.(*api.Secret)
secret := s.(*api_v1.Secret)
nsSecName := strings.Replace(secretName, "/", "-", -1)
dh, ok := secret.Data["dhparam.pem"]