diff --git a/helm/tenant/templates/tenant.yaml b/helm/tenant/templates/tenant.yaml index e1e9ee802e7..91d8077706f 100644 --- a/helm/tenant/templates/tenant.yaml +++ b/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 }} diff --git a/helm/tenant/values.yaml b/helm/tenant/values.yaml index ccb5e2b111a..85324bb18f0 100644 --- a/helm/tenant/values.yaml +++ b/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 `__ 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 `__ 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 `__. @@ -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,10 +305,10 @@ 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 `__ policy for MinIO Tenant Pods. + # The `PodManagement `__ policy for MinIO Tenant Pods. # Can be "OrderedReady" or "Parallel" podManagementPolicy: Parallel - # The `Liveness Probe `__ for monitoring Tenant pod liveness. + # The `Liveness Probe `__ for monitoring Tenant pod liveness. # Tenant pods will be restarted if the probe fails. liveness: { } ### @@ -316,9 +316,9 @@ tenant: # Tenant pods will be removed from service endpoints if the probe fails. readiness: { } ### - # `Startup Probe `__ for monitoring container startup. + # `Startup Probe `__ for monitoring container startup. # Tenant pods will be restarted if the probe fails. - # Refer + # Refer startup: { } ### # The `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