- Aded volume from applicastions for grafana and sabnzbd

- Rancher replicas bumped to 2
LarryGF · Oct 22, 2023 · bf0f5fd · bf0f5fd
1 parent 69b1d8f
commit bf0f5fd
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 20 deletions.
diff --git a/argocd/grafana/values.common.yaml b/argocd/grafana/values.common.yaml
@@ -29,7 +29,3 @@ grafana:
       org_role: Admin
     panels:
       disable_sanitize_html: true
-
-  persistence:
-    enabled: true
-    existingClaim: grafana-config
diff --git a/argocd/home-assistant/values.common.yaml b/argocd/home-assistant/values.common.yaml
@@ -39,19 +39,7 @@ home-assistant:
   hostNetwork: true
   dnsPolicy: ClusterFirstWithHostNet
 
-  persistence:
-    config:
-      enabled: true
-      existingClaim: ha-config
-    config-custom:
-      enabled: true
-      type: configMap
-      name: config-file
-    # usb:
-    #   enabled: true
-    #   type: hostPath
-    #   hostPath: /dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_DE2434151-if00
-    #   mountPath: /dev/ttyUSB0
+
 
 
 

diff --git a/docs/TODO.md b/docs/TODO.md
@@ -18,4 +18,5 @@
 - explain authelia and elastic mail setup
 - Nextcloud docs, apps:
   - deck
-  - auditing/loging
+  - auditing/loging
+- Explain which apps are getting volumes from applications.yaml
diff --git a/terraform/applications.yaml b/terraform/applications.yaml
@@ -176,6 +176,12 @@ sabnzbd:
       size: 200Mi
       access_modes:
         - ReadWriteOnce
+    downloads:
+      name: media
+    downloads-radarr:
+      name: media-radarr
+      mountPath: /downloads/radarr
+      subpath: radarr
   override:
     timezone: ${timezone}
     domain: ${domain}

diff --git a/terraform/modules/argocd_application/applications/grafana/values.yaml b/terraform/modules/argocd_application/applications/grafana/values.yaml
@@ -206,6 +206,13 @@ grafana:
       sizeLimit: {}
 
 
+  # persistence:
+  #   enabled: true
+  #   existingClaim: grafana-config
+
+  # Generating persistence config from applications.yaml
+  ${indent(2,yamlencode({persistence: { for key, value in storage: key => {"enabled":true,"existingClaim":value.name,"mountPath": try(value.mountPath,null),"subpath": try(value.subpath,null)}}}))}
+
 loki-mixin:
   fullnameOverride: loki-mixin
   grafana:

diff --git a/terraform/modules/argocd_application/applications/home-assistant/values.yaml b/terraform/modules/argocd_application/applications/home-assistant/values.yaml
@@ -61,3 +61,18 @@ home-assistant:
       volumeMounts:
       - name: config
         mountPath: /config
+
+  persistence:
+    config:
+      enabled: true
+      existingClaim: ha-config
+    config-custom:
+      enabled: true
+      type: configMap
+      name: config-file
+    # usb:
+    #   enabled: true
+    #   type: hostPath
+    #   hostPath: /dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_DE2434151-if00
+    #   mountPath: /dev/ttyUSB0
+
diff --git a/terraform/modules/argocd_application/applications/rancher/values.yaml b/terraform/modules/argocd_application/applications/rancher/values.yaml
@@ -3,7 +3,7 @@ rancher:
   # extraEnv:
   # - name: CATTLE_TLS_MIN_VERSION
   #   value: "1.0"
-  replicas: 1
+  replicas: 2
   # Fully qualified name to reach your Rancher server
   hostname: "rancher.${domain}"
 

diff --git a/terraform/modules/argocd_application/applications/sabnzbd/values.yaml b/terraform/modules/argocd_application/applications/sabnzbd/values.yaml
@@ -38,4 +38,8 @@ sabnzbd:
       enabled: true
       existingClaim: media-radarr
       mountPath: /downloads/radarr
-      subpath: radarr
+      subpath: radarr
+
+
+  # Generating persistence config from applications.yaml
+  ${indent(2,yamlencode({persistence: { for key, value in storage: key => {"enabled":true,"existingClaim":value.name,"mountPath": try(value.mountPath,null),"subpath": try(value.subpath,null)}}}))}