Adds support for detecting if publish-service type

estaleiro · Sep 1, 2017 · 8043c59 · boazy · Sep 1, 2017 · 8043c59
1 parent cda42f9
commit 8043c59
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile
@@ -6,7 +6,7 @@ BUILDTAGS=
 TAG?=0.9.0-beta.12
 REGISTRY?=gcr.io/google_containers
 GOOS?=linux
-DOCKER?=gcloud docker --
+DOCKER?=docker
 SED_I?=sed -i
 GOHOSTOS ?= $(shell go env GOHOSTOS)
 

diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -677,6 +677,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
 		IsIPV6Enabled:           n.isIPV6Enabled && !cfg.DisableIpv6,
 		RedirectServers:         redirectServers,
 		IsSSLPassthroughEnabled: n.isSSLPassthroughEnabled,
+		IsPublishLoadBalancer:   n.controller.PublishLoadBalancer(),
 		ListenPorts:             n.ports,
 	}
 

diff --git a/controllers/nginx/pkg/config/config.go b/controllers/nginx/pkg/config/config.go
@@ -465,6 +465,7 @@ type TemplateConfig struct {
 	Cfg                     Configuration
 	IsIPV6Enabled           bool
 	IsSSLPassthroughEnabled bool
+	IsPublishLoadBalancer bool
 	RedirectServers         map[string]string
 	ListenPorts             *ListenPorts
 }

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -13,7 +13,7 @@ pid /run/nginx.pid;
 {{ if ne .MaxOpenFiles 0 }}
 worker_rlimit_nofile {{ .MaxOpenFiles }};
 {{ end}}
-
+# Publish Load Balancer: {{ $all.IsPublishLoadBalancer }}
 {{/* http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout */}}
 {{/* avoid waiting too long during a reload */}}
 worker_shutdown_timeout {{ $cfg.WorkerShutdownTimeout }} ;

diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go
@@ -139,7 +139,8 @@ type Configuration struct {
 	DefaultHealthzURL     string
 	DefaultIngressClass   string
 	// optional
-	PublishService string
+	PublishService        string
+	IsPublishLoadBalancer bool
 	// Backend is the particular implementation to be used.
 	// (for instance NGINX)
 	Backend ingress.Controller
@@ -368,6 +369,11 @@ func (ic GenericController) IngressClass() string {
 	return ic.cfg.IngressClass
 }
 
+// PublishLoadBalancer returns a boolean about if publish service is a Load Balancer
+func (ic GenericController) PublishLoadBalancer() bool {
+	return ic.cfg.IsPublishLoadBalancer
+}
+
 // GetDefaultBackend returns the default backend
 func (ic GenericController) GetDefaultBackend() defaults.Backend {
 	return ic.cfg.Backend.BackendDefaults()

diff --git a/core/pkg/ingress/controller/launch.go b/core/pkg/ingress/controller/launch.go
@@ -130,12 +130,15 @@ func NewIngressController(backend ingress.Controller) *GenericController {
 	}
 	glog.Infof("validated %v as the default backend", *defaultSvc)
 
+	var isPublishLoadBalancer bool
 	if *publishSvc != "" {
 		svc, err := k8s.IsValidService(kubeClient, *publishSvc)
 		if err != nil {
 			glog.Fatalf("no service with name %v found: %v", *publishSvc, err)
 		}
-
+		if svc.Spec.Type == "LoadBalancer" {
+			isPublishLoadBalancer = true
+		}
 		if len(svc.Status.LoadBalancer.Ingress) == 0 {
 			if len(svc.Spec.ExternalIPs) > 0 {
 				glog.Infof("service %v validated as assigned with externalIP", *publishSvc)
@@ -147,6 +150,7 @@ func NewIngressController(backend ingress.Controller) *GenericController {
 			glog.Infof("service %v validated as source of Ingress status", *publishSvc)
 		}
 	}
+	glog.Infof("Setting Publush Load Balancer to: %v", isPublishLoadBalancer)
 
 	if *watchNamespace != "" {
 
@@ -181,6 +185,7 @@ func NewIngressController(backend ingress.Controller) *GenericController {
 		DefaultSSLCertificate:   *defSSLCertificate,
 		DefaultHealthzURL:       *defHealthzURL,
 		PublishService:          *publishSvc,
+		IsPublishLoadBalancer:   isPublishLoadBalancer,
 		Backend:                 backend,
 		ForceNamespaceIsolation: *forceIsolation,
 		UpdateStatusOnShutdown:  *updateStatusOnShutdown,