feat(paralus): cleanup

Signed-off-by: Nicolas Lamirault <[email protected]>
portefaix · Feb 6, 2024 · 6c6bce6 · 6c6bce6
1 parent 3ac43ea
commit 6c6bce6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/gitops/argocd/charts/zerotrust/paralus/templates/ingress.yaml b/gitops/argocd/charts/zerotrust/paralus/templates/ingress.yaml
@@ -25,11 +25,11 @@ metadata:
   {{- toYaml . | nindent 4 -}}
   {{- end }}
   labels:
-    app: paralus
     {{- include "ztka.labels" (index $.Subcharts "ztka") | nindent 4 }}
     {{- with $ingress.labels }}
     {{- toYaml . | nindent 4 -}}
     {{- end }}
+    app: paralus
     portefaix.xyz/version: v0.52.0
   name: {{ $ingress.name }}
   namespace: {{ $.Release.Namespace }}

diff --git a/gitops/argocd/charts/zerotrust/paralus/values-k3s-homelab.yaml b/gitops/argocd/charts/zerotrust/paralus/values-k3s-homelab.yaml
@@ -43,6 +43,22 @@ ingress:
     labels:
       external-dns.io/provider: cloudflare
 
+cloudnativepg:
+  name: paralus
+  image: ghcr.io/cloudnative-pg/postgresql:15
+  storage:
+    storageClass: nfs-client
+    size: 2Gi
+    walSize: 2Gi
+  backup:
+    enabled: false
+  resources:
+    limits:
+      memory: "1Gi"
+    requests:
+      memory: "300Mi"
+      cpu: "100m"
+
 ztka:
   ingress:
     enabled: true
@@ -61,7 +77,7 @@ ztka:
       memory: 500Mi
 
   fqdn:
-    domain: palarus.home.portefaix.xyz
+    domain: paralus.home.portefaix.xyz
     hostname: console
     coreConnectorSubdomain: "*.core-connector"
     userSubdomain: "*.user"
@@ -74,14 +90,10 @@ ztka:
       enable: false
 
     postgresql:
-      enable: true
-      address:
-      username: paralus
-      password: paralus
-      database: paralus
+      enable: false
 
     filebeat:
-      enable: false
+      enable: true
 
     fluentbit:
       enable: true
@@ -90,4 +102,11 @@ ztka:
       enable: false
 
   fluent-bit:
-    existingConfigMap: "palarus-fluentbit"
+    existingConfigMap: paralus-fluentbit
+
+  postgresql:
+    auth:
+      existingSecret: paralus-database
+      # database: "paralus"
+      # username: "paralus"
+      # password: "admindbpassword"