Add LOKI_GATEWAY_HOST replacement

pelotech · Jun 20, 2023 · 7ce3c7c · 7ce3c7c
1 parent 3a9f568
commit 7ce3c7c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/gitops/components/loki/kustomization.yaml b/gitops/components/loki/kustomization.yaml
@@ -61,3 +61,17 @@ replacements:
           - spec.source.helm.parameters.[name=storage.bucketNames.chunks].value
           - spec.source.helm.parameters.[name=storage.bucketNames.ruler].value
           - spec.source.helm.parameters.[name=storage.bucketNames.admin].value
+  - source:
+      version: v1
+      kind: ConfigMap
+      name: kustomize-environment
+      fieldPath: data.LOKI_GATEWAY_HOST
+    targets:
+      - select:
+          group: argoproj.io
+          version: v1alpha1
+          kind: Application
+          name: loki
+        fieldPaths:
+          - spec.source.helm.parameters.0.value
+          - spec.source.helm.parameters.1.value
diff --git a/gitops/components/loki/resources.yaml b/gitops/components/loki/resources.yaml
@@ -34,6 +34,10 @@ spec:
     helm:
       releaseName: loki
       parameters:
+        - name: 'gateway.ingress.hosts[0].host'
+          value: LOKI_GATEWAY_HOST
+        - name: 'gateway.ingress.tls[0].hosts[0]'
+          value: LOKI_GATEWAY_HOST
         - name: loki.storage.s3.region
           value: AWS_REGION
         - name: loki.storage.bucketNames.chunks
@@ -42,10 +46,6 @@ spec:
           value: LOKI_S3_BUCKET
         - name: loki.storage.bucketNames.admin
           value: LOKI_S3_BUCKET
-        - name: 'gateway.ingress.hosts[0].host'
-          value: LOKI_GATEWAY_HOST
-        - name: 'gateway.ingress.tls[0].hosts[0]'
-          value: LOKI_GATEWAY_HOST
       values: |
         serviceAccount:
           create: false