Add Results Prometheus histogram config

This adds the PROMETHEUS_HISTOGRAM configuration option existing in Tekton Results.
tektoncd · Oct 30, 2024 · 50d3c05 · 50d3c05
1 parent 57b7385
commit 50d3c05
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/pkg/apis/operator/v1alpha1/tektonresult_types.go b/pkg/apis/operator/v1alpha1/tektonresult_types.go
@@ -71,6 +71,7 @@ type ResultsAPIProperties struct {
 	DBEnableAutoMigration *bool  `json:"db_enable_auto_migration,omitempty"`
 	ServerPort            *int64 `json:"server_port,omitempty"`
 	PrometheusPort        *int64 `json:"prometheus_port,omitempty"`
+	PrometheusHistogram   *bool  `json:"prometheus_histogram,omitempty"`
 	LogLevel              string `json:"log_level,omitempty"`
 	LogsAPI               *bool  `json:"logs_api,omitempty"`
 	LogsType              string `json:"logs_type,omitempty"`

diff --git a/pkg/reconciler/kubernetes/tektonresult/testdata/api-config.yaml b/pkg/reconciler/kubernetes/tektonresult/testdata/api-config.yaml
@@ -5,6 +5,7 @@ data:
     DB_PORT=5432
     SERVER_PORT=8080
     PROMETHEUS_PORT=9090
+    PROMETHEUS_HISTOGRAM=true
     DB_NAME=
     DB_SSLMODE=disable
     DB_ENABLE_AUTO_MIGRATION=true

diff --git a/pkg/reconciler/kubernetes/tektonresult/transform_test.go b/pkg/reconciler/kubernetes/tektonresult/transform_test.go
@@ -84,6 +84,8 @@ func Test_updateApiConfig(t *testing.T) {
 			TLSHostnameOverride:                 "localhostTest",
 			AuthDisable:                         &boolVal,
 			AuthImpersonate:                     &boolVal,
+			PrometheusPort:                      &intVal,
+			PrometheusHistogram:                 &boolVal,
 			LogLevel:                            "warn",
 			LogsAPI:                             &boolVal,
 			LogsPath:                            "/logs/test",
@@ -105,7 +107,8 @@ func Test_updateApiConfig(t *testing.T) {
 	assert.Equal(t, cm.Data["config"], `DB_HOST=localhost
 DB_PORT=5432
 SERVER_PORT=12345
-PROMETHEUS_PORT=9090
+PROMETHEUS_PORT=12345
+PROMETHEUS_HISTOGRAM=true
 DB_NAME=test
 DB_SSLMODE=enable
 DB_ENABLE_AUTO_MIGRATION=true