diff --git a/helm/minio/templates/servicemonitor.yaml b/helm/minio/templates/servicemonitor.yaml index ab24dcefb..d3fb6291c 100644 --- a/helm/minio/templates/servicemonitor.yaml +++ b/helm/minio/templates/servicemonitor.yaml @@ -16,6 +16,10 @@ metadata: {{- if .Values.metrics.serviceMonitor.additionalLabels }} {{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} {{- end }} +{{- if .Values.metrics.serviceMonitor.annotations }} + annotations: +{{ toYaml .Values.metrics.serviceMonitor.annotations | trimSuffix "\n" | indent 4 }} +{{- end }} spec: endpoints: {{- if .Values.tls.enabled }} diff --git a/helm/minio/values.yaml b/helm/minio/values.yaml index bc4e57198..f6128d2dd 100644 --- a/helm/minio/values.yaml +++ b/helm/minio/values.yaml @@ -38,8 +38,8 @@ additionalLabels: [] additionalAnnotations: [] ## Typically the deployment/statefulset includes checksums of secrets/config, -## So that when these change on a subsequent helm install, the deployment/statefulset -## is restarted. This can result in unnecessary restarts under GitOps tooling such as +## So that when these change on a subsequent helm install, the deployment/statefulset +## is restarted. This can result in unnecessary restarts under GitOps tooling such as ## flux, so set to "true" to disable this behaviour. ignoreChartChecksums: false @@ -255,12 +255,12 @@ resources: ## In addition to default policies [readonly|readwrite|writeonly|consoleAdmin|diagnostics] ## you can define additional policies with custom supported actions and resources policies: [] -## writeexamplepolicy policy grants creation or deletion of buckets with name +## writeexamplepolicy policy grants creation or deletion of buckets with name ## starting with example. In addition, grants objects write permissions on buckets starting with ## example. # - name: writeexamplepolicy # statements: -# - resources: +# - resources: # - 'arn:aws:s3:::example*/*' # actions: # - "s3:AbortMultipartUpload" @@ -268,7 +268,7 @@ policies: [] # - "s3:DeleteObject" # - "s3:PutObject" # - "s3:ListMultipartUploadParts" -# - resources: +# - resources: # - 'arn:aws:s3:::example*' # actions: # - "s3:CreateBucket" @@ -276,15 +276,15 @@ policies: [] # - "s3:GetBucketLocation" # - "s3:ListBucket" # - "s3:ListBucketMultipartUploads" -## readonlyexamplepolicy policy grants access to buckets with name starting with example. +## readonlyexamplepolicy policy grants access to buckets with name starting with example. ## In addition, grants objects read permissions on buckets starting with example. # - name: readonlyexamplepolicy # statements: -# - resources: +# - resources: # - 'arn:aws:s3:::example*/*' # actions: # - "s3:GetObject" -# - resources: +# - resources: # - 'arn:aws:s3:::example*' # actions: # - "s3:GetBucketLocation" @@ -432,6 +432,7 @@ metrics: enabled: false public: true additionalLabels: {} + annotations: {} relabelConfigs: {} # namespace: monitoring # interval: 30s