From 093ca6bb1c70c41417feaafecf34a709b45fe40d Mon Sep 17 00:00:00 2001
From: LarryGF <larrywtf609@gmail.com>
Date: Tue, 15 Aug 2023 20:06:18 +0200
Subject: [PATCH] Properly splitting the config

---
 argocd/home-assistant/values.common.yaml      | 48 -----------
 .../applications/home-assistant/values.yaml   | 79 +++++++++++--------
 2 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/argocd/home-assistant/values.common.yaml b/argocd/home-assistant/values.common.yaml
index 25ad6ce4..f0b3b30a 100644
--- a/argocd/home-assistant/values.common.yaml
+++ b/argocd/home-assistant/values.common.yaml
@@ -35,21 +35,6 @@ home-assistant:
     #   securityContext:
     #     runAsUser: 0
 
-  ingress:
-    main:
-      ingressClassName: traefik
-      annotations:
-        cert-manager.io/cluster-issuer: letsencrypt
-        traefik.ingress.kubernetes.io/router.entrypoints: websecure
-      enabled: true
-      hosts:
-        - host: "ha.${duckdns_domain}.duckdns.org"
-          paths:
-          - path: /
-      tls:
-        - hosts:
-            - "ha.${duckdns_domain}.duckdns.org"
-          secretName: tls-ha-ingress
 
   hostNetwork: true
   dnsPolicy: ClusterFirstWithHostNet
@@ -68,41 +53,8 @@ home-assistant:
     #   hostPath: /dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_DE2434151-if00
     #   mountPath: /dev/ttyUSB0
 
-  nodeSelector:
-    # kubernetes.io/hostname: ${master_hostname}
-    kubernetes.io/arch : amd64
 
 
   securityContext:
     privileged: true
 
-  addons:
-    codeserver:
-      image:
-        repository: codercom/code-server
-        tag: 4.11.0
-      enabled: true
-      ingress:
-        enabled: true
-        annotations:
-          cert-manager.io/issuer: letsencrypt
-        hosts:
-        - host: code.ha.${duckdns_domain}.duckdns.org
-          paths:
-            - path: /
-        tls:
-        - secretName: tls-code-ha-ingress
-          hosts:
-            - code.ha.${duckdns_domain}.duckdns.org
-
-      args:
-      - --auth
-      - none
-      - --user-data-dir
-      - "/config/.vscode"
-      
-      workingDir: "/config"
-
-      volumeMounts:
-      - name: config
-        mountPath: /config
diff --git a/terraform/modules/argocd_application/applications/home-assistant/values.yaml b/terraform/modules/argocd_application/applications/home-assistant/values.yaml
index ce8b5030..559d513f 100644
--- a/terraform/modules/argocd_application/applications/home-assistant/values.yaml
+++ b/terraform/modules/argocd_application/applications/home-assistant/values.yaml
@@ -1,35 +1,50 @@
-grafana:
-  datasources:
-    datasources.yaml:
-      apiVersion: 1
-      datasources:
-      - name: Prometheus
-        type: prometheus
-        url: http://prometheus-prometheus:9090
-        access: proxy
-        isDefault: true
-      - name: Alertmanager
-        type: alertmanager
-        url: http://prometheus-alertmanager:9093
-        access: proxy
-        jsonData:
-          implementation: prometheus
-          handleGrafanaManagedAlerts: false
-      - name: Loki
-        type: loki
-        access: proxy
-        url: http://loki-gateway
-        jsonData:
-          maxLines: 1000
+home-assistant:
+  ingress:
+    main:
+      ingressClassName: traefik
+      annotations:
+        cert-manager.io/cluster-issuer: letsencrypt
+        traefik.ingress.kubernetes.io/router.entrypoints: websecure
+      enabled: true
+      hosts:
+        - host: "ha.${duckdns_domain}.duckdns.org"
+          paths:
+          - path: /
+      tls:
+        - hosts:
+            - "ha.${duckdns_domain}.duckdns.org"
+          secretName: tls-ha-ingress
+
+  nodeSelector:
+    kubernetes.io/hostname: ${master_hostname}
 
-  grafana.ini:
-    auth.anonymous:
+  addons:
+    codeserver:
+      image:
+        repository: codercom/code-server
+        tag: 4.11.0
       enabled: true
-      org_name: Main Org.
-      org_role: Admin
-    panels:
-      disable_sanitize_html: true
+      ingress:
+        enabled: true
+        annotations:
+          cert-manager.io/issuer: letsencrypt
+        hosts:
+        - host: code.ha.${duckdns_domain}.duckdns.org
+          paths:
+            - path: /
+        tls:
+        - secretName: tls-code-ha-ingress
+          hosts:
+            - code.ha.${duckdns_domain}.duckdns.org
+
+      args:
+      - --auth
+      - none
+      - --user-data-dir
+      - "/config/.vscode"
+      
+      workingDir: "/config"
 
-  persistence:
-    enabled: true
-    existingClaim: grafana-config
\ No newline at end of file
+      volumeMounts:
+      - name: config
+        mountPath: /config