Merge pull request #271 from vyzigold/default_prometheu_port

openshift-merge-bot[bot] · web-flow · commit 9348e8bb5a55 · 2024-01-10T16:01:47.000Z
Add default prometheus port to consts
diff --git a/controllers/autoscaling_controller.go b/controllers/autoscaling_controller.go
@@ -408,7 +408,7 @@ func (r *AutoscalingReconciler) reconcileNormal(
 		instance.Status.PrometheusHost = instance.Spec.PrometheusHost
 	}
 	if instance.Spec.PrometheusPort == 0 {
-		instance.Status.PrometheusPort = 9090
+		instance.Status.PrometheusPort = metricstorage.DefaultPrometheusPort
 	} else {
 		instance.Status.PrometheusPort = instance.Spec.PrometheusPort
 	}
diff --git a/pkg/metricstorage/const.go b/pkg/metricstorage/const.go
@@ -22,6 +22,8 @@ const (
 	DefaultServiceName = "metric-storage"
 	// DefaultPvcStorageRequest -
 	DefaultPvcStorageRequest = "20G"
+	// DefaultPrometheusPort -
+	DefaultPrometheusPort = 9090
 	// DefaultNodeExporterPort -
 	DefaultNodeExporterPort = 9100
 	// DefaultScrapeInterval -

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (r *AutoscalingReconciler) reconcileNormal(`
`408`	`408`	`instance.Status.PrometheusHost = instance.Spec.PrometheusHost`
`409`	`409`	`}`
`410`	`410`	`if instance.Spec.PrometheusPort == 0 {`
`411`		`- instance.Status.PrometheusPort = 9090`
	`411`	`+ instance.Status.PrometheusPort = metricstorage.DefaultPrometheusPort`
`412`	`412`	`} else {`
`413`	`413`	`instance.Status.PrometheusPort = instance.Spec.PrometheusPort`
`414`	`414`	`}`