refactor

minio · Dec 9, 2024 · 9f11411 · 9f11411
1 parent 3bd8d7f
commit 9f11411
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/docs/tenant_crd.adoc b/docs/tenant_crd.adoc
@@ -1143,7 +1143,7 @@ Directs the MinIO Operator to use prometheus operator. +
 
 Tenant scrape configuration will be added to prometheus managed by the prometheus-operator.
 
-|*`prometheusOperatorScrape`* __string array__ 
+|*`prometheusOperatorScrapeMetricsPath`* __string array__ 
 |*Optional* +
 
 

diff --git a/helm/operator/templates/minio.min.io_tenants.yaml b/helm/operator/templates/minio.min.io_tenants.yaml
@@ -3682,7 +3682,7 @@ spec:
                 type: string
               prometheusOperator:
                 type: boolean
-              prometheusOperatorScrape:
+              prometheusOperatorScrapeMetricsPath:
                 items:
                   type: string
                 type: array

diff --git a/helm/operator/templates/sts.min.io_policybindings.yaml b/helm/operator/templates/sts.min.io_policybindings.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.min.io/version: v6.0.4
+    operator.min.io/version: v5.0.15
   name: policybindings.sts.min.io
 spec:
   group: sts.min.io

diff --git a/pkg/apis/minio.min.io/v2/constants.go b/pkg/apis/minio.min.io/v2/constants.go
@@ -197,9 +197,6 @@ const StatefulSetPrefix = "ss"
 // StatefulSetLegacyPrefix by old operators
 const StatefulSetLegacyPrefix = "zone"
 
-// MinIOPrometheusPathPrefix is the path prefix where MinIO tenant exposes cluster Prometheus metrics
-const MinIOPrometheusPathPrefix = "/minio/v2/metrics/"
-
 // MinIOPrometheusScrapeInterval defines how frequently to scrape targets.
 const MinIOPrometheusScrapeInterval = 30 * time.Second
 

diff --git a/pkg/apis/minio.min.io/v2/types.go b/pkg/apis/minio.min.io/v2/types.go
@@ -281,7 +281,7 @@ type TenantSpec struct {
 	// The name of the Prometheus instance to scrape metrics from.
 	//
 	// +optional
-	PrometheusOperatorScrape []string `json:"prometheusOperatorScrape,omitempty"`
+	PrometheusOperatorScrapeMetricsPath []string `json:"prometheusOperatorScrapeMetricsPath,omitempty"`
 	// *Optional* +
 	//
 	// The https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/[Kubernetes Service Account] to use for running MinIO pods created as part of the Tenant. +

diff --git a/pkg/resources/configmaps/prometheus.go b/pkg/resources/configmaps/prometheus.go
@@ -83,15 +83,15 @@ func GetPrometheusConfig(t *miniov2.Tenant, accessKey, secretKey string) *Promet
 		ScrapeConfigs: []ScrapeConfig{},
 	}
 
-	if len(t.Spec.PrometheusOperatorScrape) == 0 {
-		t.Spec.PrometheusOperatorScrape = []string{"cluster"}
+	if len(t.Spec.PrometheusOperatorScrapeMetricsPath) == 0 {
+		t.Spec.PrometheusOperatorScrapeMetricsPath = []string{"/minio/v2/metrics/cluster"}
 	}
 
-	for _, scrape := range t.Spec.PrometheusOperatorScrape {
+	for _, scrape := range t.Spec.PrometheusOperatorScrapeMetricsPath {
 		promConfig.ScrapeConfigs = append(promConfig.ScrapeConfigs, ScrapeConfig{
 			JobName:     t.PrometheusConfigJobName(),
 			BearerToken: bearerToken,
-			MetricsPath: fmt.Sprintf("%s%s", miniov2.MinIOPrometheusPathPrefix, scrape),
+			MetricsPath: scrape,
 			Scheme:      minioScheme,
 			TLSConfig: tlsConfig{
 				CAFile: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",

diff --git a/resources/base/crds/minio.min.io_tenants.yaml b/resources/base/crds/minio.min.io_tenants.yaml
@@ -3682,7 +3682,7 @@ spec:
                 type: string
               prometheusOperator:
                 type: boolean
-              prometheusOperatorScrape:
+              prometheusOperatorScrapeMetricsPath:
                 items:
                   type: string
                 type: array

diff --git a/resources/base/crds/sts.min.io_policybindings.yaml b/resources/base/crds/sts.min.io_policybindings.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.min.io/version: v6.0.4
+    operator.min.io/version: v5.0.15
   name: policybindings.sts.min.io
 spec:
   group: sts.min.io