From 29489097c9fde53676699cbd4fc72b4cd46ff28b Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Wed, 5 Jun 2019 11:04:27 -0400 Subject: [PATCH] SSL expiration metrics cannot be tied to dynamic updates --- internal/ingress/controller/controller.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index 5d2b46810..032116ddf 100755 --- a/internal/ingress/controller/controller.go +++ b/internal/ingress/controller/controller.go @@ -125,11 +125,18 @@ func (n *NGINXController) syncIngress(interface{}) error { ings := n.store.ListIngresses(nil) hosts, servers, pcfg := n.getConfiguration(ings) + if n.isLeader() { + klog.V(2).Infof("Updating ssl expiration metrics.") + n.metricCollector.SetSSLExpireTime(servers) + } + if n.runningConfig.Equal(pcfg) { klog.V(3).Infof("No configuration change detected, skipping backend reload.") return nil } + n.metricCollector.SetHosts(hosts) + if !n.IsDynamicConfigurationEnough(pcfg) { klog.Infof("Configuration changes detected, backend reload required.") @@ -147,16 +154,9 @@ func (n *NGINXController) syncIngress(interface{}) error { return err } - n.metricCollector.SetHosts(hosts) - klog.Infof("Backend successfully reloaded.") n.metricCollector.ConfigSuccess(hash, true) n.metricCollector.IncReloadCount() - - if n.isLeader() { - klog.V(2).Infof("Updating ssl expiration metrics.") - n.metricCollector.SetSSLExpireTime(servers) - } } isFirstSync := n.runningConfig.Equal(&ingress.Configuration{})