feat: add loki as helmfile

This commit is contained in:
2025-06-22 19:45:52 +02:00
parent 8c80deb8de
commit ac5645fc03
5 changed files with 84 additions and 34 deletions
+43
View File
@@ -0,0 +1,43 @@
bases:
- ../envs/environments.yaml.gotmpl
repositories:
- name: loki
url: https://grafana.github.io/helm-charts
commonLabels:
tier: system
releases:
- name: loki
namespace: loki
chart: loki/loki
# version: 1.2.3
condition: loki.enabled
values:
- ../values/loki/values/loki.yaml.gotmpl
- ../values/loki/values/loki-{{ .Environment.Name }}.yaml.gotmpl
postRenderer: ../bin/kustomizer
postRendererArgs:
- ../values/loki/kustomize/{{ .Environment.Name }}
missingFileHandler: Info
- name: manifests
namespace: loki
chart: manifests
condition: loki.enabled
missingFileHandler: Info
values:
- ../values/env.yaml
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
- ../values/loki/env.yaml.gotmpl
- ../values/loki/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
hooks:
- events: [ prepare, cleanup ]
showlogs: true
command: ../bin/helmify
args:
- '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
- '{{`{{ .Release.Chart }}`}}'
- '{{`{{ .Environment.Name }}`}}'
- ../values/loki/manifests
- manifests
+3
View File
@@ -0,0 +1,3 @@
loki:
enabled: true
+10 -10
View File
@@ -3,14 +3,14 @@ loki:
autosync: true autosync: true
compactor: false compactor: false
s3: s3:
endpoint: "" endpoint: "http://10.255.241.30:30080"
region: "" region: tos
insecure_skip_verify: false insecure_skip_verify: false
secret: secret:
name: "" name: loki-s3
access_key: "" access_key: AWS_ACCESS_KEY_ID
access_secret: "" access_secret: AWS_ACCESS_KEY_SECRET
buckets: buckets:
chunks: "" chunks: loki-chunks
ruler: "" ruler: loki-chunks
admin: "" admin: loki-chunks
+8 -4
View File
@@ -2,7 +2,7 @@
apiVersion: argoproj.io/v1alpha1 apiVersion: argoproj.io/v1alpha1
kind: Application kind: Application
metadata: metadata:
name: loki name: loki
namespace: argocd namespace: argocd
annotations: annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
@@ -15,12 +15,16 @@ spec:
sources: sources:
- repoURL: {{ .Values.clusterConfig.manifests }} - repoURL: {{ .Values.clusterConfig.manifests }}
targetRevision: HEAD targetRevision: HEAD
path: helmfiles/loki path: helmfile.d
plugin: plugin:
name: helmfile name: helmfile-cmp
env: env:
- name: CLUSTER_NAME - name: CLUSTER_NAME
value: {{ .Values.clusterConfig.cluster }} value: {{ .Values.clusterConfig.cluster }}
- name: HELMFILE_ENVIRONMENT
value: default
- name: HELMFILE_FILE_PATH
value: ingress-nginx.yaml.gotmpl
project: sys project: sys
syncPolicy: syncPolicy:
managedNamespaceMetadata: managedNamespaceMetadata:
@@ -29,7 +33,7 @@ spec:
syncOptions: syncOptions:
- CreateNamespace=true - CreateNamespace=true
- ApplyOutOfSyncOnly=true - ApplyOutOfSyncOnly=true
# - ServerSideApply=true - ServerSideApply=true
{{- if .Values.loki.autosync }} {{- if .Values.loki.autosync }}
automated: automated:
prune: true prune: true
+20 -20
View File
@@ -2,11 +2,11 @@ loki:
auth_enabled: false auth_enabled: false
storage: storage:
bucketNames: bucketNames:
chunks: {{ .Values.loki.buckets.chunks }} chunks: {{ .Values.loki.s3.buckets.chunks }}
ruler: {{ .Values.loki.buckets.ruler }} ruler: {{ .Values.loki.s3.buckets.ruler }}
admin: {{ .Values.loki.buckets.admin }} admin: {{ .Values.loki.s3.buckets.admin }}
s3: s3:
endpoint: {{ .Values.loki.s3.endpoint | default "https://s3.production.itpartner.no" }} endpoint: {{ .Values.loki.s3.endpoint }}
region: {{ .Values.loki.s3.region | default "us-east-1" }} region: {{ .Values.loki.s3.region | default "us-east-1" }}
secretAccessKey: ${S3SECRET} secretAccessKey: ${S3SECRET}
accessKeyId: ${S3KEY} accessKeyId: ${S3KEY}
@@ -40,13 +40,13 @@ write:
- name: S3KEY - name: S3KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_key" }} key: {{ .Values.loki.s3.secret.access_key | default "access_key" }}
- name: S3SECRET - name: S3SECRET
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_secret" }} key: {{ .Values.loki.s3.secret.access_key | default "access_secret" }}
tolerations: tolerations:
- effect: "NoSchedule" - effect: "NoSchedule"
operator: "Equal" operator: "Equal"
@@ -59,13 +59,13 @@ read:
- name: S3KEY - name: S3KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_key" }} key: {{ .Values.loki.s3.secret.access_key | default "access_key" }}
- name: S3SECRET - name: S3SECRET
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_secret" }} key: {{ .Values.loki.s3.secret.access_key | default "access_secret" }}
tolerations: tolerations:
- effect: "NoSchedule" - effect: "NoSchedule"
operator: "Equal" operator: "Equal"
@@ -79,13 +79,13 @@ compactor:
- name: S3KEY - name: S3KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_key" }} key: {{ .Values.loki.s3.secret.access_key | default "access_key" }}
- name: S3SECRET - name: S3SECRET
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_secret" }} key: {{ .Values.loki.s3.secret.access_key | default "access_secret" }}
{{- end }} {{- end }}
backend: backend:
extraArgs: extraArgs:
@@ -94,10 +94,10 @@ backend:
- name: S3KEY - name: S3KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_key" }} key: {{ .Values.loki.s3.secret.access_key | default "access_key" }}
- name: S3SECRET - name: S3SECRET
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.loki.secret.name | default "s3-credentials"}} name: {{ .Values.loki.s3.secret.name | default "s3-credentials"}}
key: {{ .Values.loki.secret.access_key | default "access_secret" }} key: {{ .Values.loki.s3.secret.access_key | default "access_secret" }}