From b3cbd6c3195b89716becf8d82b14655ec0cf16db Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Thu, 6 Oct 2022 08:55:50 -0400
Subject: [PATCH] feat(loki): integrate standalone v3 helm chart

---
 .holo/branches/k8s-blueprint/loki/helm-chart.toml | 7 ++++---
 .holo/sources/loki.toml                           | 4 ++--
 k8s-common/.holo/lenses/loki.toml                 | 1 +
 k8s-common/loki/default-values.yaml               | 5 +++++
 k8s-common/loki/release-values.yaml               | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.holo/branches/k8s-blueprint/loki/helm-chart.toml b/.holo/branches/k8s-blueprint/loki/helm-chart.toml
index 28a3d81..15bedae 100644
--- a/.holo/branches/k8s-blueprint/loki/helm-chart.toml
+++ b/.holo/branches/k8s-blueprint/loki/helm-chart.toml
@@ -1,7 +1,8 @@
 [holomapping]
 holosource = "loki"
-root = "charts/loki"
+root = "production/helm/loki"
 files = [
-  "**",
-  "!templates/tests/**"
+  "*.yaml",
+  "src/**",
+  "templates/**"
 ]
diff --git a/.holo/sources/loki.toml b/.holo/sources/loki.toml
index 281cec5..cc6f9d0 100644
--- a/.holo/sources/loki.toml
+++ b/.holo/sources/loki.toml
@@ -1,3 +1,3 @@
 [holosource]
-url = "https://github.com/grafana/helm-charts.git"
-ref = "refs/tags/loki-2.16.0"
+url = "https://github.com/grafana/loki"
+ref = "refs/tags/helm-loki-3.2.1"
diff --git a/k8s-common/.holo/lenses/loki.toml b/k8s-common/.holo/lenses/loki.toml
index 0166097..a4d7ccd 100644
--- a/k8s-common/.holo/lenses/loki.toml
+++ b/k8s-common/.holo/lenses/loki.toml
@@ -12,6 +12,7 @@ merge = "replace"
 [hololens.helm]
 namespace = "loki"
 release_name = "loki"
+namespace_fill = true
 
 chart_path = "helm-chart"
 value_files = [
diff --git a/k8s-common/loki/default-values.yaml b/k8s-common/loki/default-values.yaml
index 70c5515..e7c17bb 100644
--- a/k8s-common/loki/default-values.yaml
+++ b/k8s-common/loki/default-values.yaml
@@ -1 +1,6 @@
 # These values as applied first as template-provided defaults
+loki:
+  commonConfig:
+    replication_factor: 1
+  storage:
+    type: 'filesystem'
diff --git a/k8s-common/loki/release-values.yaml b/k8s-common/loki/release-values.yaml
index 6351c35..c772dd2 100644
--- a/k8s-common/loki/release-values.yaml
+++ b/k8s-common/loki/release-values.yaml
@@ -1,2 +1,2 @@
 # These values as applied last as downstream overrides
-# See https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml
+# See https://github.com/grafana/loki/blob/main/production/helm/loki/values.yaml