Read resolv file just oncce

This commit is contained in:
Manuel de Brito Fontes 2017-04-11 11:47:49 -03:00
parent c36d6ffbff
commit 190788848a
2 changed files with 11 additions and 8 deletions

View file

@ -41,6 +41,7 @@ import (
"k8s.io/ingress/controllers/nginx/pkg/version"
"k8s.io/ingress/core/pkg/ingress"
"k8s.io/ingress/core/pkg/ingress/defaults"
"k8s.io/ingress/core/pkg/net/dns"
"k8s.io/ingress/core/pkg/net/ssl"
)
@ -69,10 +70,17 @@ func newNGINXController() ingress.Controller {
if ngx == "" {
ngx = binary
}
h, err := dns.GetSystemNameServers()
if err != nil {
glog.Warningf("unexpected error reading system nameservers: %v", err)
}
n := &NGINXController{
binary: ngx,
configmap: &api_v1.ConfigMap{},
isIPV6Enabled: isIPv6Enabled(),
resolver: h,
}
var onChange func()
@ -125,6 +133,8 @@ type NGINXController struct {
// returns true if IPV6 is enabled in the pod
isIPV6Enabled bool
resolver []net.IP
}
// Start start a new NGINX master process running in foreground.
@ -340,6 +350,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
}
cfg := ngx_template.ReadConfig(n.configmap.Data)
cfg.Resolver = n.resolver
// we need to check if the status module configuration changed
if cfg.EnableVtsStatus {

View file

@ -24,7 +24,6 @@ import (
"github.com/mitchellh/mapstructure"
"k8s.io/ingress/controllers/nginx/pkg/config"
"k8s.io/ingress/core/pkg/net/dns"
)
const (
@ -72,13 +71,6 @@ func ReadConfig(src map[string]string) config.Configuration {
to.SkipAccessLogURLs = skipUrls
to.WhitelistSourceRange = whitelist
h, err := dns.GetSystemNameServers()
if err != nil {
glog.Warningf("unexpected error reading system nameservers: %v", err)
} else {
to.Resolver = h
}
config := &mapstructure.DecoderConfig{
Metadata: nil,
WeaklyTypedInput: true,