Merge pull request #2 from projectsyn/feat/expand-env

Expand environment variables in config by default
projectsyn · Sep 20, 2024 · c041054 · c041054
2 parents 5f1bbf3 + 0f966b0
commit c041054
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -106,6 +106,8 @@ parameters:
         namespaced: true
 
       backend:
+        extraArgs:
+          - '-config.expand-env=true'
         nodeSelector: ${loki:globalNodeSelector}
         replicas: 3
         resources:
@@ -116,6 +118,8 @@ parameters:
             cpu: 0.5
             memory: 1Gi
       read:
+        extraArgs:
+          - '-config.expand-env=true'
         nodeSelector: ${loki:globalNodeSelector}
         replicas: 2
         resources:
@@ -126,6 +130,8 @@ parameters:
             cpu: 1
             memory: 3Gi
       write:
+        extraArgs:
+          - '-config.expand-env=true'
         nodeSelector: ${loki:globalNodeSelector}
         replicas: 3
         resources:

diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/statefulset-backend.yaml b/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/backend/statefulset-backend.yaml
@@ -68,6 +68,7 @@ spec:
             - -config.file=/etc/loki/config/config.yaml
             - -target=backend
             - -legacy-read-mode=false
+            - -config.expand-env=true
           image: docker.io/grafana/loki:3.1.1
           imagePullPolicy: IfNotPresent
           name: loki

diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/read/deployment-read.yaml b/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/read/deployment-read.yaml
@@ -47,6 +47,7 @@ spec:
             - -target=read
             - -legacy-read-mode=false
             - -common.compactor-grpc-address=loki-backend.syn-loki.svc.cluster.local:9095
+            - -config.expand-env=true
           image: docker.io/grafana/loki:3.1.1
           imagePullPolicy: IfNotPresent
           name: loki

diff --git a/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/write/statefulset-write.yaml b/tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/write/statefulset-write.yaml
@@ -43,6 +43,7 @@ spec:
         - args:
             - -config.file=/etc/loki/config/config.yaml
             - -target=write
+            - -config.expand-env=true
           image: docker.io/grafana/loki:3.1.1
           imagePullPolicy: IfNotPresent
           name: loki