Fix panic

nginx · Nov 5, 2021 · 6b2e372 · 6b2e372
1 parent 4b8eb16
commit 6b2e372
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 33 deletions.
diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go
@@ -1642,6 +1642,10 @@ func (lbc *LoadBalancerController) updateVirtualServerMetrics() {
 }
 
 func (lbc *LoadBalancerController) updateTransportServerMetrics() {
+	if !lbc.areCustomResourcesEnabled {
+		return
+	}
+
 	metrics := lbc.configuration.GetTransportServerMetrics()
 	lbc.metricsCollector.SetTransportServers(metrics.TotalTLSPassthrough, metrics.TotalTCP, metrics.TotalUDP)
 }

diff --git a/internal/metrics/collectors/controller.go b/internal/metrics/collectors/controller.go
@@ -34,51 +34,56 @@ func NewControllerMetricsCollector(crdsEnabled bool, constLabels map[string]stri
 		labelNamesController,
 	)
 
-	if !crdsEnabled {
-		return &ControllerMetricsCollector{ingressesTotal: ingResTotal}
+	var vsResTotal, vsrResTotal prometheus.Gauge
+	var tsResTotal *prometheus.GaugeVec
+
+	if crdsEnabled {
+		vsResTotal = prometheus.NewGauge(
+			prometheus.GaugeOpts{
+				Name:        "virtualserver_resources_total",
+				Namespace:   metricsNamespace,
+				Help:        "Number of handled VirtualServer resources",
+				ConstLabels: constLabels,
+			},
+		)
+
+		vsrResTotal = prometheus.NewGauge(
+			prometheus.GaugeOpts{
+				Name:        "virtualserverroute_resources_total",
+				Namespace:   metricsNamespace,
+				Help:        "Number of handled VirtualServerRoute resources",
+				ConstLabels: constLabels,
+			},
+		)
+
+		tsResTotal = prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Name:        "transportserver_resources_total",
+				Namespace:   metricsNamespace,
+				Help:        "Number of handled TransportServer resources",
+				ConstLabels: constLabels,
+			},
+			labelNamesController,
+		)
 	}
 
-	vsResTotal := prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Name:        "virtualserver_resources_total",
-			Namespace:   metricsNamespace,
-			Help:        "Number of handled VirtualServer resources",
-			ConstLabels: constLabels,
-		},
-	)
-
-	vsrResTotal := prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Name:        "virtualserverroute_resources_total",
-			Namespace:   metricsNamespace,
-			Help:        "Number of handled VirtualServerRoute resources",
-			ConstLabels: constLabels,
-		},
-	)
-
-	tsResTotal := prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Name:        "transportserver_resources_total",
-			Namespace:   metricsNamespace,
-			Help:        "Number of handled TransportServer resources",
-			ConstLabels: constLabels,
-		},
-		labelNamesController,
-	)
-
 	c := &ControllerMetricsCollector{
-		crdsEnabled:              true,
+		crdsEnabled:              crdsEnabled,
 		ingressesTotal:           ingResTotal,
 		virtualServersTotal:      vsResTotal,
 		virtualServerRoutesTotal: vsrResTotal,
 		transportServersTotal:    tsResTotal,
 	}
 
-	// if we don't set to 0 metrics with types, the metrics will not be created initially
+	// if we don't set to 0 metrics with the label type, the metrics will not be created initially
+
 	c.SetIngresses("regular", 0)
 	c.SetIngresses("master", 0)
 	c.SetIngresses("minion", 0)
-	c.SetTransportServers(0, 0, 0)
+
+	if crdsEnabled {
+		c.SetTransportServers(0, 0, 0)
+	}
 
 	return c
 }