Add support for prometheusOperatorScrapeMetricsPaths on tenant chart

helm/tenant/templates/tenant.yaml

@@ -148,6 +148,11 @@ spec:
   serviceAccountName: {{ dig "serviceAccountName" "" . }}
   {{- end }}
   prometheusOperator: {{ dig "prometheusOperator" "false" . }}
+  {{- if (dig "prometheusOperator" "false" .) }}
+  {{- with (dig "prometheusOperatorScrapeMetricsPaths" (list) .) }}
+  prometheusOperatorScrapeMetricsPaths: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
   {{- with (dig "logging" (dict) .) }}
   logging: {{- toYaml . | nindent 4 }}
   {{- end }}

helm/tenant/values.yaml

@@ -7,21 +7,21 @@ tenant:
   name: myminio
   ###
   # Specify the Operator container image to use for the deployment.
-  # ``image.tag`` 
+  # ``image.tag``
   # For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v7.1.1 tag.
   # The container pulls the image if not already present:
   #
   # .. code-block:: yaml
-  # 
+  #
   #    image:
   #       repository: quay.io/minio/minio
   #       tag: RELEASE.2025-04-08T15-41-24Z
   #       pullPolicy: IfNotPresent
   #
   # The chart also supports specifying an image based on digest value:
-  # 
+  #
   # .. code-block:: yaml
-  # 
+  #
   #    image:
   #       repository: quay.io/minio/minio@sha256
   #       digest: 28c80b379c75242c6fe793dfbf212f43c602140a0de5ebe3d9c2a3a7b9f9f983
@@ -42,7 +42,7 @@ tenant:
   # Specify `initContainers <https://kubernetes.io/docs/concepts/workloads/pods/init-containers/>`__ to perform setup or configuration tasks before the main Tenant pods starts.
   #
   # Example of init container which waits for idenity provider to be reachable before starting MinIO Tenant:
-  # 
+  #
   # .. code-block:: yaml
   #
   #    initContainers:
@@ -181,7 +181,7 @@ tenant:
       # These settings determine the distribution of pods across worker nodes and can help prevent or allow colocating pods onto the same worker nodes.
       affinity: { }
       ###
-      # 
+      #
       # The `Requests or Limits <https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/>`__ for resources to associate to Tenant pods.
       #
       # These settings can control the minimum and maximum resources requested for each pod.
@@ -254,7 +254,7 @@ tenant:
     # Specify an array of Kubernetes secrets, where each entry corresponds to a secret contains the TLS private key and public certificate pair.
     #
     # Omit this to use only the MinIO Operator autogenerated certificates.
-    # 
+    #
     # If you omit this field *and* set ``requestAutoCert`` to false, the Tenant starts without TLS.
     #
     # See `Operator CRD: TenantSpec <https://min.io/docs/minio/kubernetes/upstream/reference/operator-crd.html#tenantspec>`__.
@@ -276,7 +276,7 @@ tenant:
     # certExpiryAlertThreshold: 1
     ###
     # This field is used only when ``requestAutoCert: true``.
-    # Use this field to set CommonName for the auto-generated certificate. 
+    # Use this field to set CommonName for the auto-generated certificate.
     # MinIO defaults to using the internal Kubernetes DNS name for the pod
     # The default DNS name format is typically ``*.minio.default.svc.cluster.local``.
     #
@@ -292,7 +292,7 @@ tenant:
   ###
   # Array of objects describing one or more buckets to create during tenant provisioning.
   # Example:
-  # 
+  #
   # .. code-block:: yaml
   #
   #    - name: my-minio-bucket
@@ -305,20 +305,20 @@ tenant:
   # Each secret should specify the ``CONSOLE_ACCESS_KEY`` and ``CONSOLE_SECRET_KEY`` as the access key and secret key for that user.
   users: [ ]
   ###
-  # The `PodManagement <https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#pod-management-policy>`__ policy for MinIO Tenant Pods. 
+  # The `PodManagement <https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#pod-management-policy>`__ policy for MinIO Tenant Pods.
   # Can be "OrderedReady" or "Parallel"
   podManagementPolicy: Parallel
-  # The `Liveness Probe <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes>`__ for monitoring Tenant pod liveness. 
+  # The `Liveness Probe <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes>`__ for monitoring Tenant pod liveness.
   # Tenant pods will be restarted if the probe fails.
   liveness: { }
   ###
   # `Readiness Probe <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>`__ for monitoring Tenant container readiness.
   # Tenant pods will be removed from service endpoints if the probe fails.
   readiness: { }
   ###
-  # `Startup Probe <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>`__ for monitoring container startup. 
+  # `Startup Probe <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>`__ for monitoring container startup.
   # Tenant pods will be restarted if the probe fails.
-  # Refer 
+  # Refer
   startup: { }
   ###
   # The `Lifecycle hooks <https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/>`__ for container.
@@ -340,6 +340,9 @@ tenant:
   # Directs the Operator to add the Tenant's metric scrape configuration to an existing Kubernetes Prometheus deployment managed by the Prometheus Operator.
   prometheusOperator: false
   ###
+  # When prometheusOperator is enabled, configure the API endpoint(s) to scrape metrics. Default to /minio/v2/metrics/cluster
+  prometheusOperatorScrapeMetricsPaths: []
+  ###
   # Configure pod logging configuration for the MinIO Tenant.
   #
   # - Specify ``json`` for JSON-formatted logs.
@@ -372,7 +375,7 @@ tenant:
   additionalVolumes: [ ]
   ###
   # An array of volume mount points associated to each Tenant container.
-  # 
+  #
   # Specify each item in the array as follows:
   #
   # .. code-block:: yaml