helm: add annotations for ServiceMonitor (#15020)

This commit is contained in:
Mathieu Parent 2022-07-16 10:04:27 +02:00 committed by GitHub
parent e94eb9af10
commit 2bc7ca2d34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions

View File

@ -16,6 +16,10 @@ metadata:
{{- if .Values.metrics.serviceMonitor.additionalLabels }} {{- if .Values.metrics.serviceMonitor.additionalLabels }}
{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} {{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
{{- end }} {{- end }}
{{- if .Values.metrics.serviceMonitor.annotations }}
annotations:
{{ toYaml .Values.metrics.serviceMonitor.annotations | trimSuffix "\n" | indent 4 }}
{{- end }}
spec: spec:
endpoints: endpoints:
{{- if .Values.tls.enabled }} {{- if .Values.tls.enabled }}

View File

@ -38,8 +38,8 @@ additionalLabels: []
additionalAnnotations: [] additionalAnnotations: []
## Typically the deployment/statefulset includes checksums of secrets/config, ## Typically the deployment/statefulset includes checksums of secrets/config,
## So that when these change on a subsequent helm install, the deployment/statefulset ## 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 ## is restarted. This can result in unnecessary restarts under GitOps tooling such as
## flux, so set to "true" to disable this behaviour. ## flux, so set to "true" to disable this behaviour.
ignoreChartChecksums: false ignoreChartChecksums: false
@ -255,12 +255,12 @@ resources:
## In addition to default policies [readonly|readwrite|writeonly|consoleAdmin|diagnostics] ## In addition to default policies [readonly|readwrite|writeonly|consoleAdmin|diagnostics]
## you can define additional policies with custom supported actions and resources ## you can define additional policies with custom supported actions and resources
policies: [] 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 ## starting with example. In addition, grants objects write permissions on buckets starting with
## example. ## example.
# - name: writeexamplepolicy # - name: writeexamplepolicy
# statements: # statements:
# - resources: # - resources:
# - 'arn:aws:s3:::example*/*' # - 'arn:aws:s3:::example*/*'
# actions: # actions:
# - "s3:AbortMultipartUpload" # - "s3:AbortMultipartUpload"
@ -268,7 +268,7 @@ policies: []
# - "s3:DeleteObject" # - "s3:DeleteObject"
# - "s3:PutObject" # - "s3:PutObject"
# - "s3:ListMultipartUploadParts" # - "s3:ListMultipartUploadParts"
# - resources: # - resources:
# - 'arn:aws:s3:::example*' # - 'arn:aws:s3:::example*'
# actions: # actions:
# - "s3:CreateBucket" # - "s3:CreateBucket"
@ -276,15 +276,15 @@ policies: []
# - "s3:GetBucketLocation" # - "s3:GetBucketLocation"
# - "s3:ListBucket" # - "s3:ListBucket"
# - "s3:ListBucketMultipartUploads" # - "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. ## In addition, grants objects read permissions on buckets starting with example.
# - name: readonlyexamplepolicy # - name: readonlyexamplepolicy
# statements: # statements:
# - resources: # - resources:
# - 'arn:aws:s3:::example*/*' # - 'arn:aws:s3:::example*/*'
# actions: # actions:
# - "s3:GetObject" # - "s3:GetObject"
# - resources: # - resources:
# - 'arn:aws:s3:::example*' # - 'arn:aws:s3:::example*'
# actions: # actions:
# - "s3:GetBucketLocation" # - "s3:GetBucketLocation"
@ -432,6 +432,7 @@ metrics:
enabled: false enabled: false
public: true public: true
additionalLabels: {} additionalLabels: {}
annotations: {}
relabelConfigs: {} relabelConfigs: {}
# namespace: monitoring # namespace: monitoring
# interval: 30s # interval: 30s