Add reason label to total_reload metric

LorcanMcVeigh · web-flow · commit 71395694b5d9 · 2020-08-24T11:24:04.000+01:00
diff --git a/docs-web/logging-and-monitoring/prometheus.md b/docs-web/logging-and-monitoring/prometheus.md
@@ -26,7 +26,7 @@ The Ingress Controller exports the following metrics:
 * NGINX/NGINX Plus metrics. Please see this [doc](https://github.com/nginxinc/nginx-prometheus-exporter#exported-metrics) to find more information about the exported metrics.
 
 * Ingress Controller metrics
-  * `controller_nginx_reloads_total`. Number of successful NGINX reloads.
+  * `controller_nginx_reloads_total`. Number of successful NGINX reloads. This includes the label `reason` with 2 possible values `endpoints` (the reason for the reload was an endpoints update) and `other` (the reload was caused by something other than an endpoint update like an ingress update).
   * `controller_nginx_reload_errors_total`. Number of unsuccessful NGINX reloads.
   * `controller_nginx_last_reload_status`. Status of the last NGINX reload, 0 meaning down and 1 up.
   * `controller_nginx_last_reload_milliseconds`. Duration in milliseconds of the last NGINX reload.
diff --git a/internal/configs/configurator.go b/internal/configs/configurator.go
@@ -186,7 +186,7 @@ func (cnf *Configurator) AddOrUpdateIngress(ingEx *IngressEx) error {
 		return fmt.Errorf("Error adding or updating ingress %v/%v: %v", ingEx.Ingress.Namespace, ingEx.Ingress.Name, err)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX for %v/%v: %v", ingEx.Ingress.Namespace, ingEx.Ingress.Name, err)
 	}
 
@@ -222,7 +222,7 @@ func (cnf *Configurator) AddOrUpdateMergeableIngress(mergeableIngs *MergeableIng
 		return fmt.Errorf("Error when adding or updating ingress %v/%v: %v", mergeableIngs.Master.Ingress.Namespace, mergeableIngs.Master.Ingress.Name, err)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX for %v/%v: %v", mergeableIngs.Master.Ingress.Namespace, mergeableIngs.Master.Ingress.Name, err)
 	}
 
@@ -309,7 +309,7 @@ func (cnf *Configurator) AddOrUpdateVirtualServer(virtualServerEx *VirtualServer
 		return warnings, fmt.Errorf("Error adding or updating VirtualServer %v/%v: %v", virtualServerEx.VirtualServer.Namespace, virtualServerEx.VirtualServer.Name, err)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return warnings, fmt.Errorf("Error reloading NGINX for VirtualServer %v/%v: %v", virtualServerEx.VirtualServer.Namespace, virtualServerEx.VirtualServer.Name, err)
 	}
 
@@ -356,7 +356,7 @@ func (cnf *Configurator) AddOrUpdateVirtualServers(virtualServerExes []*VirtualS
 		allWarnings.Add(warnings)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return allWarnings, fmt.Errorf("Error when reloading NGINX when updating Policy: %v", err)
 	}
 
@@ -371,7 +371,7 @@ func (cnf *Configurator) AddOrUpdateTransportServer(transportServerEx *Transport
 		return fmt.Errorf("Error adding or updating TransportServer %v/%v: %v", transportServerEx.TransportServer.Namespace, transportServerEx.TransportServer.Name, err)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX for TransportServer %v/%v: %v", transportServerEx.TransportServer.Namespace, transportServerEx.TransportServer.Name, err)
 	}
 
@@ -530,7 +530,7 @@ func (cnf *Configurator) AddOrUpdateTLSSecret(secret *api_v1.Secret, ingExes []I
 		}
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when reloading NGINX when updating Secret: %v", err)
 	}
 
@@ -551,7 +551,7 @@ func (cnf *Configurator) AddOrUpdateSpecialTLSSecrets(secret *api_v1.Secret, sec
 		cnf.nginxManager.CreateSecret(secretName, data, nginx.TLSSecretFileMode)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when reloading NGINX when updating the special Secrets: %v", err)
 	}
 
@@ -597,7 +597,7 @@ func (cnf *Configurator) DeleteSecret(key string, ingExes []IngressEx, mergeable
 	}
 
 	if len(ingExes)+len(mergeableIngresses)+len(virtualServerExes) > 0 {
-		if err := cnf.nginxManager.Reload(); err != nil {
+		if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 			return fmt.Errorf("Error when reloading NGINX when deleting Secret %v: %v", key, err)
 		}
 	}
@@ -617,7 +617,7 @@ func (cnf *Configurator) DeleteIngress(key string) error {
 		cnf.deleteIngressMetricsLabels(key)
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when removing ingress %v: %v", key, err)
 	}
 
@@ -634,7 +634,7 @@ func (cnf *Configurator) DeleteVirtualServer(key string) error {
 		cnf.deleteVirtualServerMetricsLabels(fmt.Sprintf(key))
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when removing VirtualServer %v: %v", key, err)
 	}
 
@@ -648,7 +648,7 @@ func (cnf *Configurator) DeleteTransportServer(key string) error {
 		return fmt.Errorf("Error when removing TransportServer %v: %v", key, err)
 	}
 
-	err = cnf.nginxManager.Reload()
+	err = cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate)
 	if err != nil {
 		return fmt.Errorf("Error when removing TransportServer %v: %v", key, err)
 	}
@@ -694,7 +694,7 @@ func (cnf *Configurator) UpdateEndpoints(ingExes []*IngressEx) error {
 		return nil
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX when updating endpoints: %v", err)
 	}
 
@@ -727,7 +727,7 @@ func (cnf *Configurator) UpdateEndpointsMergeableIngress(mergeableIngresses []*M
 		return nil
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX when updating endpoints for %v: %v", mergeableIngresses, err)
 	}
 
@@ -759,7 +759,7 @@ func (cnf *Configurator) UpdateEndpointsForVirtualServers(virtualServerExes []*V
 		return nil
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX when updating endpoints: %v", err)
 	}
 
@@ -806,7 +806,7 @@ func (cnf *Configurator) UpdateEndpointsForTransportServers(transportServerExes
 		return nil
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {
 		return fmt.Errorf("Error reloading NGINX when updating endpoints: %v", err)
 	}
 
@@ -948,7 +948,7 @@ func (cnf *Configurator) UpdateConfig(cfgParams *ConfigParams, ingExes []*Ingres
 	}
 
 	cnf.nginxManager.SetOpenTracing(mainCfg.OpenTracingLoadModule)
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return allWarnings, fmt.Errorf("Error when updating config from ConfigMap: %v", err)
 	}
 
@@ -981,7 +981,7 @@ func (cnf *Configurator) UpdateGlobalConfiguration(globalConfiguration *conf_v1a
 		}
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return updatedTransportServerExes, deletedTransportServerExes, fmt.Errorf("Error when updating global configuration: %v", err)
 	}
 
@@ -1097,7 +1097,7 @@ func (cnf *Configurator) AddOrUpdateSpiffeCerts(svidResponse *workload.X509SVIDs
 	cnf.nginxManager.CreateSecret(spiffeCertFileName, createSpiffeCert(svid.Certificates), spiffeCertsFileMode)
 	cnf.nginxManager.CreateSecret(spiffeBundleFileName, createSpiffeCert(svid.TrustBundle), spiffeCertsFileMode)
 
-	err = cnf.nginxManager.Reload()
+	err = cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate)
 	if err != nil {
 		return fmt.Errorf("error when reloading NGINX when updating the SPIFFE Certs: %v", err)
 	}
@@ -1174,7 +1174,7 @@ func (cnf *Configurator) AddOrUpdateAppProtectResource(resource *unstructured.Un
 		}
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when reloading NGINX when updating %v: %v", resource.GetKind(), err)
 	}
 
@@ -1201,7 +1201,7 @@ func (cnf *Configurator) DeleteAppProtectPolicy(polNamespaceame string, ingExes
 		}
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when reloading NGINX when removing App Protect Policy: %v", err)
 	}
 
@@ -1228,7 +1228,7 @@ func (cnf *Configurator) DeleteAppProtectLogConf(logConfNamespaceame string, ing
 		}
 	}
 
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when reloading NGINX when removing App Protect Log Configuration: %v", err)
 	}
 
@@ -1246,7 +1246,7 @@ func (cnf *Configurator) AddInternalRouteConfig() error {
 		return fmt.Errorf("Error when writing main Config: %v", err)
 	}
 	cnf.nginxManager.CreateMainConfig(mainCfgContent)
-	if err := cnf.nginxManager.Reload(); err != nil {
+	if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {
 		return fmt.Errorf("Error when reloading nginx: %v", err)
 	}
 	return nil
diff --git a/internal/metrics/collectors/manager.go b/internal/metrics/collectors/manager.go
@@ -8,7 +8,7 @@ import (
 
 // ManagerCollector is an interface for the metrics of the Nginx Manager
 type ManagerCollector interface {
-	IncNginxReloadCount()
+	IncNginxReloadCount(isEndPointUpdate bool)
 	IncNginxReloadErrors()
 	UpdateLastReloadTime(ms time.Duration)
 	Register(registry *prometheus.Registry) error
@@ -17,7 +17,7 @@ type ManagerCollector interface {
 // LocalManagerMetricsCollector implements NginxManagerCollector interface and prometheus.Collector interface
 type LocalManagerMetricsCollector struct {
 	// Metrics
-	reloadsTotal     prometheus.Counter
+	reloadsTotal     *prometheus.CounterVec
 	reloadsError     prometheus.Counter
 	lastReloadStatus prometheus.Gauge
 	lastReloadTime   prometheus.Gauge
@@ -26,13 +26,14 @@ type LocalManagerMetricsCollector struct {
 // NewLocalManagerMetricsCollector creates a new LocalManagerMetricsCollector
 func NewLocalManagerMetricsCollector(constLabels map[string]string) *LocalManagerMetricsCollector {
 	nc := &LocalManagerMetricsCollector{
-		reloadsTotal: prometheus.NewCounter(
+		reloadsTotal: prometheus.NewCounterVec(
 			prometheus.CounterOpts{
 				Name:        "nginx_reloads_total",
 				Namespace:   metricsNamespace,
 				Help:        "Number of successful NGINX reloads",
 				ConstLabels: constLabels,
 			},
+			[]string{"reason"},
 		),
 		reloadsError: prometheus.NewCounter(
 			prometheus.CounterOpts{
@@ -59,12 +60,20 @@ func NewLocalManagerMetricsCollector(constLabels map[string]string) *LocalManage
 			},
 		),
 	}
+	nc.reloadsTotal.WithLabelValues("other")
+	nc.reloadsTotal.WithLabelValues("endpoints")
 	return nc
 }
 
 // IncNginxReloadCount increments the counter of successful NGINX reloads and sets the last reload status to true
-func (nc *LocalManagerMetricsCollector) IncNginxReloadCount() {
-	nc.reloadsTotal.Inc()
+func (nc *LocalManagerMetricsCollector) IncNginxReloadCount(isEndPointUpdate bool) {
+	var label string
+	if isEndPointUpdate {
+		label = "endpoints"
+	} else {
+		label = "other"
+	}
+	nc.reloadsTotal.WithLabelValues(label).Inc()
 	nc.updateLastReloadStatus(true)
 }
 
@@ -121,7 +130,7 @@ func NewManagerFakeCollector() *ManagerFakeCollector {
 func (nc *ManagerFakeCollector) Register(registry *prometheus.Registry) error { return nil }
 
 // IncNginxReloadCount implements a fake IncNginxReloadCount
-func (nc *ManagerFakeCollector) IncNginxReloadCount() {}
+func (nc *ManagerFakeCollector) IncNginxReloadCount(isEndPointUpdate bool) {}
 
 // IncNginxReloadErrors implements a fake IncNginxReloadErrors
 func (nc *ManagerFakeCollector) IncNginxReloadErrors() {}
diff --git a/internal/nginx/fake_manager.go b/internal/nginx/fake_manager.go
@@ -97,7 +97,7 @@ func (*FakeManager) Start(done chan error) {
 }
 
 // Reload provides a fake implementation of Reload.
-func (*FakeManager) Reload() error {
+func (*FakeManager) Reload(isEndpointsUpdate bool) error {
 	glog.V(3).Infof("Reloading nginx")
 	return nil
 }
diff --git a/internal/nginx/manager.go b/internal/nginx/manager.go
@@ -15,6 +15,12 @@ import (
 	"github.com/nginxinc/nginx-plus-go-client/client"
 )
 
+// ReloadForEndpointsUpdate means that is caused by an endpoints update.
+const ReloadForEndpointsUpdate = true
+
+// ReloadForOtherUpdate means that a reload is caused by an update for a resource(s) other than endpoints.
+const ReloadForOtherUpdate = false
+
 // TLSSecretFileMode defines the default filemode for files with TLS Secrets.
 const TLSSecretFileMode = 0600
 
@@ -61,7 +67,7 @@ type Manager interface {
 	CreateDHParam(content string) (string, error)
 	CreateOpenTracingTracerConfig(content string) error
 	Start(done chan error)
-	Reload() error
+	Reload(isEndpointsUpdate bool) error
 	Quit()
 	UpdateConfigVersionFile(openTracing bool)
 	SetPlusClients(plusClient *client.NginxClient, plusConfigVersionCheckClient *http.Client)
@@ -268,7 +274,7 @@ func (lm *LocalManager) Start(done chan error) {
 }
 
 // Reload reloads NGINX.
-func (lm *LocalManager) Reload() error {
+func (lm *LocalManager) Reload(isEndpointsUpdate bool) error {
 	// write a new config version
 	lm.configVersion++
 	lm.UpdateConfigVersionFile(lm.OpenTracing)
@@ -287,7 +293,7 @@ func (lm *LocalManager) Reload() error {
 		return fmt.Errorf("could not get newest config version: %v", err)
 	}
 
-	lm.metricsCollector.IncNginxReloadCount()
+	lm.metricsCollector.IncNginxReloadCount(isEndpointsUpdate)
 
 	t2 := time.Now()
 	lm.metricsCollector.UpdateLastReloadTime(t2.Sub(t1))

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ func (cnf Configurator) AddOrUpdateIngress(ingEx IngressEx) error {`
`186`	`186`	`return fmt.Errorf("Error adding or updating ingress %v/%v: %v", ingEx.Ingress.Namespace, ingEx.Ingress.Name, err)`
`187`	`187`	`}`
`188`	`188`
`189`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`189`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`190`	`190`	`return fmt.Errorf("Error reloading NGINX for %v/%v: %v", ingEx.Ingress.Namespace, ingEx.Ingress.Name, err)`
`191`	`191`	`}`
`192`	`192`
`@@ -222,7 +222,7 @@ func (cnf Configurator) AddOrUpdateMergeableIngress(mergeableIngs MergeableIng`
`222`	`222`	`return fmt.Errorf("Error when adding or updating ingress %v/%v: %v", mergeableIngs.Master.Ingress.Namespace, mergeableIngs.Master.Ingress.Name, err)`
`223`	`223`	`}`
`224`	`224`
`225`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`225`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`226`	`226`	`return fmt.Errorf("Error reloading NGINX for %v/%v: %v", mergeableIngs.Master.Ingress.Namespace, mergeableIngs.Master.Ingress.Name, err)`
`227`	`227`	`}`
`228`	`228`
`@@ -309,7 +309,7 @@ func (cnf Configurator) AddOrUpdateVirtualServer(virtualServerEx VirtualServer`
`309`	`309`	`return warnings, fmt.Errorf("Error adding or updating VirtualServer %v/%v: %v", virtualServerEx.VirtualServer.Namespace, virtualServerEx.VirtualServer.Name, err)`
`310`	`310`	`}`
`311`	`311`
`312`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`312`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`313`	`313`	`return warnings, fmt.Errorf("Error reloading NGINX for VirtualServer %v/%v: %v", virtualServerEx.VirtualServer.Namespace, virtualServerEx.VirtualServer.Name, err)`
`314`	`314`	`}`
`315`	`315`
`@@ -356,7 +356,7 @@ func (cnf Configurator) AddOrUpdateVirtualServers(virtualServerExes []VirtualS`
`356`	`356`	`allWarnings.Add(warnings)`
`357`	`357`	`}`
`358`	`358`
`359`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`359`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`360`	`360`	`return allWarnings, fmt.Errorf("Error when reloading NGINX when updating Policy: %v", err)`
`361`	`361`	`}`
`362`	`362`
`@@ -371,7 +371,7 @@ func (cnf Configurator) AddOrUpdateTransportServer(transportServerEx Transport`
`371`	`371`	`return fmt.Errorf("Error adding or updating TransportServer %v/%v: %v", transportServerEx.TransportServer.Namespace, transportServerEx.TransportServer.Name, err)`
`372`	`372`	`}`
`373`	`373`
`374`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`374`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`375`	`375`	`return fmt.Errorf("Error reloading NGINX for TransportServer %v/%v: %v", transportServerEx.TransportServer.Namespace, transportServerEx.TransportServer.Name, err)`
`376`	`376`	`}`
`377`	`377`
`@@ -530,7 +530,7 @@ func (cnf Configurator) AddOrUpdateTLSSecret(secret api_v1.Secret, ingExes []I`
`530`	`530`	`}`
`531`	`531`	`}`
`532`	`532`
`533`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`533`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`534`	`534`	`return fmt.Errorf("Error when reloading NGINX when updating Secret: %v", err)`
`535`	`535`	`}`
`536`	`536`
`@@ -551,7 +551,7 @@ func (cnf Configurator) AddOrUpdateSpecialTLSSecrets(secret api_v1.Secret, sec`
`551`	`551`	`cnf.nginxManager.CreateSecret(secretName, data, nginx.TLSSecretFileMode)`
`552`	`552`	`}`
`553`	`553`
`554`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`554`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`555`	`555`	`return fmt.Errorf("Error when reloading NGINX when updating the special Secrets: %v", err)`
`556`	`556`	`}`
`557`	`557`
`@@ -597,7 +597,7 @@ func (cnf *Configurator) DeleteSecret(key string, ingExes []IngressEx, mergeable`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`if len(ingExes)+len(mergeableIngresses)+len(virtualServerExes) > 0 {`
`600`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`600`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`601`	`601`	`return fmt.Errorf("Error when reloading NGINX when deleting Secret %v: %v", key, err)`
`602`	`602`	`}`
`603`	`603`	`}`
`@@ -617,7 +617,7 @@ func (cnf *Configurator) DeleteIngress(key string) error {`
`617`	`617`	`cnf.deleteIngressMetricsLabels(key)`
`618`	`618`	`}`
`619`	`619`
`620`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`620`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`621`	`621`	`return fmt.Errorf("Error when removing ingress %v: %v", key, err)`
`622`	`622`	`}`
`623`	`623`
`@@ -634,7 +634,7 @@ func (cnf *Configurator) DeleteVirtualServer(key string) error {`
`634`	`634`	`cnf.deleteVirtualServerMetricsLabels(fmt.Sprintf(key))`
`635`	`635`	`}`
`636`	`636`
`637`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`637`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`638`	`638`	`return fmt.Errorf("Error when removing VirtualServer %v: %v", key, err)`
`639`	`639`	`}`
`640`	`640`
`@@ -648,7 +648,7 @@ func (cnf *Configurator) DeleteTransportServer(key string) error {`
`648`	`648`	`return fmt.Errorf("Error when removing TransportServer %v: %v", key, err)`
`649`	`649`	`}`
`650`	`650`
`651`		`- err = cnf.nginxManager.Reload()`
	`651`	`+ err = cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate)`
`652`	`652`	`if err != nil {`
`653`	`653`	`return fmt.Errorf("Error when removing TransportServer %v: %v", key, err)`
`654`	`654`	`}`
`@@ -694,7 +694,7 @@ func (cnf Configurator) UpdateEndpoints(ingExes []IngressEx) error {`
`694`	`694`	`return nil`
`695`	`695`	`}`
`696`	`696`
`697`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`697`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {`
`698`	`698`	`return fmt.Errorf("Error reloading NGINX when updating endpoints: %v", err)`
`699`	`699`	`}`
`700`	`700`
`@@ -727,7 +727,7 @@ func (cnf Configurator) UpdateEndpointsMergeableIngress(mergeableIngresses []M`
`727`	`727`	`return nil`
`728`	`728`	`}`
`729`	`729`
`730`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`730`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {`
`731`	`731`	`return fmt.Errorf("Error reloading NGINX when updating endpoints for %v: %v", mergeableIngresses, err)`
`732`	`732`	`}`
`733`	`733`
`@@ -759,7 +759,7 @@ func (cnf Configurator) UpdateEndpointsForVirtualServers(virtualServerExes []V`
`759`	`759`	`return nil`
`760`	`760`	`}`
`761`	`761`
`762`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`762`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {`
`763`	`763`	`return fmt.Errorf("Error reloading NGINX when updating endpoints: %v", err)`
`764`	`764`	`}`
`765`	`765`
`@@ -806,7 +806,7 @@ func (cnf *Configurator) UpdateEndpointsForTransportServers(transportServerExes`
`806`	`806`	`return nil`
`807`	`807`	`}`
`808`	`808`
`809`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`809`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForEndpointsUpdate); err != nil {`
`810`	`810`	`return fmt.Errorf("Error reloading NGINX when updating endpoints: %v", err)`
`811`	`811`	`}`
`812`	`812`
`@@ -948,7 +948,7 @@ func (cnf Configurator) UpdateConfig(cfgParams ConfigParams, ingExes []*Ingres`
`948`	`948`	`}`
`949`	`949`
`950`	`950`	`cnf.nginxManager.SetOpenTracing(mainCfg.OpenTracingLoadModule)`
`951`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`951`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`952`	`952`	`return allWarnings, fmt.Errorf("Error when updating config from ConfigMap: %v", err)`
`953`	`953`	`}`
`954`	`954`
`@@ -981,7 +981,7 @@ func (cnf Configurator) UpdateGlobalConfiguration(globalConfiguration conf_v1a`
`981`	`981`	`}`
`982`	`982`	`}`
`983`	`983`
`984`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`984`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`985`	`985`	`return updatedTransportServerExes, deletedTransportServerExes, fmt.Errorf("Error when updating global configuration: %v", err)`
`986`	`986`	`}`
`987`	`987`
`@@ -1097,7 +1097,7 @@ func (cnf Configurator) AddOrUpdateSpiffeCerts(svidResponse workload.X509SVIDs`
`1097`	`1097`	`cnf.nginxManager.CreateSecret(spiffeCertFileName, createSpiffeCert(svid.Certificates), spiffeCertsFileMode)`
`1098`	`1098`	`cnf.nginxManager.CreateSecret(spiffeBundleFileName, createSpiffeCert(svid.TrustBundle), spiffeCertsFileMode)`
`1099`	`1099`
`1100`		`- err = cnf.nginxManager.Reload()`
	`1100`	`+ err = cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate)`
`1101`	`1101`	`if err != nil {`
`1102`	`1102`	`return fmt.Errorf("error when reloading NGINX when updating the SPIFFE Certs: %v", err)`
`1103`	`1103`	`}`
`@@ -1174,7 +1174,7 @@ func (cnf Configurator) AddOrUpdateAppProtectResource(resource unstructured.Un`
`1174`	`1174`	`}`
`1175`	`1175`	`}`
`1176`	`1176`
`1177`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`1177`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`1178`	`1178`	`return fmt.Errorf("Error when reloading NGINX when updating %v: %v", resource.GetKind(), err)`
`1179`	`1179`	`}`
`1180`	`1180`
`@@ -1201,7 +1201,7 @@ func (cnf *Configurator) DeleteAppProtectPolicy(polNamespaceame string, ingExes`
`1201`	`1201`	`}`
`1202`	`1202`	`}`
`1203`	`1203`
`1204`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`1204`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`1205`	`1205`	`return fmt.Errorf("Error when reloading NGINX when removing App Protect Policy: %v", err)`
`1206`	`1206`	`}`
`1207`	`1207`
`@@ -1228,7 +1228,7 @@ func (cnf *Configurator) DeleteAppProtectLogConf(logConfNamespaceame string, ing`
`1228`	`1228`	`}`
`1229`	`1229`	`}`
`1230`	`1230`
`1231`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`1231`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`1232`	`1232`	`return fmt.Errorf("Error when reloading NGINX when removing App Protect Log Configuration: %v", err)`
`1233`	`1233`	`}`
`1234`	`1234`
`@@ -1246,7 +1246,7 @@ func (cnf *Configurator) AddInternalRouteConfig() error {`
`1246`	`1246`	`return fmt.Errorf("Error when writing main Config: %v", err)`
`1247`	`1247`	`}`
`1248`	`1248`	`cnf.nginxManager.CreateMainConfig(mainCfgContent)`
`1249`		`- if err := cnf.nginxManager.Reload(); err != nil {`
	`1249`	`+ if err := cnf.nginxManager.Reload(nginx.ReloadForOtherUpdate); err != nil {`
`1250`	`1250`	`return fmt.Errorf("Error when reloading nginx: %v", err)`
`1251`	`1251`	`}`
`1252`	`1252`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func (*FakeManager) Start(done chan error) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`// Reload provides a fake implementation of Reload.`
`100`		`-func (*FakeManager) Reload() error {`
	`100`	`+func (*FakeManager) Reload(isEndpointsUpdate bool) error {`
`101`	`101`	`glog.V(3).Infof("Reloading nginx")`
`102`	`102`	`return nil`
`103`	`103`	`}`