fix: allow passing empty metrics config (#2682)

Signed-off-by: Demonsthere <daemonsthere@gmail.com>
envoyproxy · Feb 23, 2024 · c5cd964 · c5cd964
1 parent 78f7edd
commit c5cd964
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/api/v1alpha1/envoygateway_helpers.go b/api/v1alpha1/envoygateway_helpers.go
@@ -104,12 +104,12 @@ func DefaultEnvoyGatewayLogging() *EnvoyGatewayLogging {
 // GetEnvoyGatewayTelemetry returns the EnvoyGatewayTelemetry of EnvoyGateway or a default EnvoyGatewayTelemetry if unspecified.
 func (e *EnvoyGateway) GetEnvoyGatewayTelemetry() *EnvoyGatewayTelemetry {
 	if e.Telemetry != nil {
-		if e.Telemetry.Metrics.Prometheus == nil {
-			e.Telemetry.Metrics.Prometheus = DefaultEnvoyGatewayPrometheus()
-		}
 		if e.Telemetry.Metrics == nil {
 			e.Telemetry.Metrics = DefaultEnvoyGatewayMetrics()
 		}
+		if e.Telemetry.Metrics.Prometheus == nil {
+			e.Telemetry.Metrics.Prometheus = DefaultEnvoyGatewayPrometheus()
+		}
 		return e.Telemetry
 	}
 	e.Telemetry = DefaultEnvoyGatewayTelemetry()