Start using a secret

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
This commit is contained in:
Michel Hollands 2024-05-03 15:38:07 +01:00
parent 29b831ca00
commit cea8076b75

View File

@ -229,9 +229,9 @@ loki:
common: common:
storage: storage:
s3: s3:
access_key_id: "{{ .Values.global.minio.rootUser }}" access_key_id: "${rootUser}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}" secret_access_key: "${rootPassword}"
compactor: compactor:
retention_enabled: true retention_enabled: true
delete_request_store: s3 delete_request_store: s3
@ -254,8 +254,24 @@ loki:
installOperator: false installOperator: false
lokiCanary: lokiCanary:
enabled: false enabled: false
test: write:
enabled: false extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
read:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
backend:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
alloy: alloy:
alloy: alloy:
@ -292,29 +308,33 @@ alloy:
mimir-distributed: mimir-distributed:
minio: minio:
enabled: false enabled: false
global:
extraEnvFrom:
- secretRef:
name: "mmc-minio"
mimir: mimir:
structuredConfig: structuredConfig:
alertmanager_storage: alertmanager_storage:
s3: s3:
bucket_name: mimir-ruler bucket_name: mimir-ruler
access_key_id: "{{ .Values.global.minio.rootUser }}" access_key_id: ${rootUser2}
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}" secret_access_key: ${rootPassword}
insecure: true insecure: true
blocks_storage: blocks_storage:
backend: s3 backend: s3
s3: s3:
bucket_name: mimir-tsdb bucket_name: mimir-tsdb
access_key_id: "{{ .Values.global.minio.rootUser }}" access_key_id: ${rootUser3}
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}" secret_access_key: ${rootPassword}
insecure: true insecure: true
ruler_storage: ruler_storage:
s3: s3:
bucket_name: mimir-ruler bucket_name: mimir-ruler
access_key_id: "{{ .Values.global.minio.rootUser }}" access_key_id: "${rootUser4}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}" secret_access_key: ${rootPassword}
insecure: true insecure: true
limits: limits:
compactor_blocks_retention_period: 30d compactor_blocks_retention_period: 30d
@ -328,12 +348,42 @@ tempo-distributed:
s3: s3:
bucket: tempo bucket: tempo
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
access_key: "{{ .Values.global.minio.rootUser }}" access_key: "${rootUser}"
secret_key: "{{ .Values.global.minio.rootPassword }}" secret_key: "${rootPassword}"
insecure: true insecure: true
compactor: compactor:
compaction: compaction:
block_retention: 30d block_retention: 30d
distributor:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
ingester:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
compactor:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
querier:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
queryFrontend:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "mmc-minio"
traces: traces:
otlp: otlp:
http: http:
@ -342,8 +392,7 @@ tempo-distributed:
enabled: true enabled: true
minio: minio:
rootUser: rootuser existingSecret: "mmc-minio"
rootPassword: rootpassword
buckets: buckets:
- name: loki-chunks - name: loki-chunks
policy: none policy: none