chore: Update promtail configuration for GKE Autopilot clusters

NaturalSelectionLabs · Jul 27, 2024 · 6467c4f · 6467c4f
1 parent e4bf375
commit 6467c4f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 4 deletions.
diff --git a/application_set.tf b/application_set.tf
@@ -669,9 +669,9 @@ resource "argocd_application_set" "argo-workflow" {
   }
 }
 
-resource "argocd_application_set" "promtail-gke-autopilot" {
+resource "argocd_application_set" "promtail" {
   metadata {
-    name = "promtail-gke-autopilot"
+    name = "promtail"
   }
   spec {
     go_template = true
@@ -680,7 +680,6 @@ resource "argocd_application_set" "promtail-gke-autopilot" {
         selector {
           match_labels = {
             "argocd.argoproj.io/secret-type" = "cluster"
-            "cluster-type"                   = "gke-autopilot"
           }
         }
       }
@@ -698,7 +697,7 @@ resource "argocd_application_set" "promtail-gke-autopilot" {
         source {
           repo_url        = var.repo_url
           target_revision = "HEAD"
-          path            = "promtail/gke-autopilot"
+          path            = "promtail/{{.name}}"
           kustomize {
             common_annotations = {
               "github.com/url" = var.repo_url

diff --git a/loki/ops/values.yaml b/loki/ops/values.yaml
@@ -86,6 +86,7 @@ singleBinary:
       value: "1"
 
 gateway:
+  replicas: 3
   service:
     type: LoadBalancer
     annotations:

diff --git a/promtail/dev/kustomization.yaml b/promtail/dev/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+helmCharts:
+  - name: promtail
+    releaseName: promtail
+    namespace: guardian
+    repo: https://grafana.github.io/helm-charts
+    version: x.x.x
+    valuesInline:
+      config:
+        clients:
+          - url: http://loki.internal.naturalselectionlabs.com/loki/api/v1/push
+            tenant_id: "1"
diff --git a/promtail/gke-autopilot/kustomization.yaml → promtail/ops/kustomization.yaml b/promtail/gke-autopilot/kustomization.yaml → promtail/ops/kustomization.yaml
diff --git a/promtail/gke-autopilot/values.yaml → promtail/ops/values.yaml b/promtail/gke-autopilot/values.yaml → promtail/ops/values.yaml
diff --git a/promtail/prod/kustomization.yaml b/promtail/prod/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+helmCharts:
+  - name: promtail
+    releaseName: promtail
+    namespace: guardian
+    repo: https://grafana.github.io/helm-charts
+    version: x.x.x
+    valuesInline:
+      config:
+        clients:
+          - url: http://loki.internal.naturalselectionlabs.com/loki/api/v1/push
+            tenant_id: "2"