From 1bfefb404e573a59554b603f398448f493c27077 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@zohomail.com>
Date: Wed, 22 Feb 2023 22:21:46 +0100
Subject: [PATCH] Try with templates

---
 badhouseplants/helmfile.yaml            |  3 ---
 badhouseplants/values/values.gitea.yaml |  9 +--------
 releases.yaml                           | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml
index f4bf7b7..11f4e86 100644
--- a/badhouseplants/helmfile.yaml
+++ b/badhouseplants/helmfile.yaml
@@ -36,9 +36,6 @@ releases:
     installed: true
     namespace: gitea-service
     createNamespace: false
-    dependencies:
-      - chart: bedag/raw
-        version: 2.0.0
 
   - <<: *funkwhale
     installed: true
diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml
index 37a73c5..f152ad8 100644
--- a/badhouseplants/values/values.gitea.yaml
+++ b/badhouseplants/values/values.gitea.yaml
@@ -1,12 +1,5 @@
-raw:
+istio:
   enabled: true
-  global:
-    imageRegistry: "company-registry/"
-
-# Consider this Image tag Mainly. But considers global imageRegistry, if set by parent chart.
-  image:
-    registry: docker.io
-    repository: bitnami/apache
   hostname: git.badhouseplants.net
   templates:
     - |
diff --git a/releases.yaml b/releases.yaml
index b543ec7..15e8b2a 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -1,5 +1,8 @@
 ---
 templates:
+  # ---------------------------
+  # -- Hooks
+  # ---------------------------
   crd-management-hook:
     hooks: 
       - events: ["preapply"]
@@ -20,6 +23,9 @@ templates:
         args: 
           - -c 
           - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -"
+  # ----------------------------
+  # -- Configs
+  # ----------------------------
   default-env-values: 
     values: 
       - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
@@ -27,6 +33,14 @@ templates:
     secrets: 
       - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml"
   # ----------------------------
+  # -- Extensions
+  # ----------------------------
+  istio-resource:
+    dependencies:
+      - chart: bedag/raw
+        version: 2.0.0
+        alias: istio
+  # ----------------------------
   # -- Releases
   # ----------------------------
   # -- System
@@ -142,6 +156,7 @@ templates:
     inherit: 
       - template: default-env-values
       - template: default-env-secrets
+      - template: istio-resource
 
   funkwhale: &funkwhale
     name: funkwhale