Merge pull request #9 from iosifnicolae2/main

various improvements

Author: iosifnicolae2

components/postgresql_instance/main.py

@@ -27,15 +27,13 @@ class S3BackupConfig(TypedDict, total=False):
         region: S3 region
         access_key: S3 access key
         secret_key: S3 secret key
-        path: Path within the bucket (optional)
     """
     enabled: bool
     endpoint: str
     bucket: str
     region: str
     access_key: str
     secret_key: str
-    path: Optional[str]
 
 
 class S3BootstrapConfig(TypedDict, total=False):
@@ -49,15 +47,13 @@ class S3BootstrapConfig(TypedDict, total=False):
         region: S3 region
         access_key: S3 access key
         secret_key: S3 secret key
-        path: Path within the bucket
     """
     enabled: bool
     endpoint: str
     bucket: str
     region: str
     access_key: str
     secret_key: str
-    path: str
 
 
 def create_postgres_instance(
@@ -338,7 +334,6 @@ def create_postgres_instance(
 
                         # Add S3 backup configuration if enabled
                         **({
-                            "repo2-path": s3_backup["path"],
                             "repo2-s3-uri-style": "path",
                             "repo2-s3-key": s3_backup["access_key"],
                             "repo2-s3-key-secret": s3_backup["secret_key"],
@@ -350,7 +345,6 @@ def create_postgres_instance(
 
                         # Add S3 bootstrap configuration if enabled
                         **({
-                            "repo3-path": s3_bootstrap["path"],
                             "repo3-s3-uri-style": "path",
                             "repo3-s3-key": s3_bootstrap["access_key"],
                             "repo3-s3-key-secret": s3_bootstrap["secret_key"],

components/whatsapp_waha/charts/whatsapp-waha/templates/deployment.yaml

@@ -14,6 +14,8 @@ spec:
     metadata:
       labels:
         {{- include "whatsapp-waha.selectorLabels" . | nindent 8 }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -37,6 +39,17 @@ spec:
                 name: {{ include "whatsapp-waha.fullname" . }}-env
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if or .Values.persistence.sessions.enabled .Values.persistence.media.enabled }}
+          volumeMounts:
+            {{- if .Values.persistence.sessions.enabled }}
+            - name: {{ include "whatsapp-waha.fullname" . }}-sessions
+              mountPath: /app/.sessions
+            {{- end }}
+            {{- if .Values.persistence.media.enabled }}
+            - name: {{ include "whatsapp-waha.fullname" . }}-media
+              mountPath: /app/.media
+            {{- end }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -49,3 +62,16 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if or .Values.persistence.sessions.enabled .Values.persistence.media.enabled }}
+      volumes:
+        {{- if .Values.persistence.sessions.enabled }}
+        - name: {{ include "whatsapp-waha.fullname" . }}-sessions
+          persistentVolumeClaim:
+            claimName: {{ include "whatsapp-waha.fullname" . }}-sessions-pvc
+        {{- end }}
+        {{- if .Values.persistence.media.enabled }}
+        - name: {{ include "whatsapp-waha.fullname" . }}-media
+          persistentVolumeClaim:
+            claimName: {{ include "whatsapp-waha.fullname" . }}-media-pvc
+        {{- end }}
+      {{- end }}

components/whatsapp_waha/charts/whatsapp-waha/templates/pvc.yaml

@@ -0,0 +1,42 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "whatsapp-waha.fullname" . }}-sessions-pvc
+  labels:
+    {{- include "whatsapp-waha.labels" . | nindent 4 }}
+  namespace: {{ include "whatsapp-waha.namespace" . }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.sessions.size }}
+  {{- if .Values.persistence.sessions.storageClass }}
+  {{- if (eq "-" .Values.persistence.sessions.storageClass) }}
+  storageClassName: ""
+  {{- else }}
+  storageClassName: {{ .Values.persistence.sessions.storageClass }}
+  {{- end }}
+  {{- end }}
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "whatsapp-waha.fullname" . }}-media-pvc
+  labels:
+    {{- include "whatsapp-waha.labels" . | nindent 4 }}
+  namespace: {{ include "whatsapp-waha.namespace" . }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.media.size }}
+  {{- if .Values.persistence.media.storageClass }}
+  {{- if (eq "-" .Values.persistence.media.storageClass) }}
+  storageClassName: ""
+  {{- else }}
+  storageClassName: {{ .Values.persistence.media.storageClass }}
+  {{- end }}
+  {{- end }}

components/whatsapp_waha/charts/whatsapp-waha/values.yaml

@@ -76,3 +76,16 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+# Persistence configuration for WhatsApp sessions and media
+persistence:
+  # Sessions volume configuration
+  sessions:
+    enabled: true
+    size: "1Gi"
+    storageClass: ""
+  # Media volume configuration
+  media:
+    enabled: true
+    size: "10Gi"
+    storageClass: ""

components/whatsapp_waha/main.py

@@ -50,6 +50,10 @@ def create_whatsapp_waha(
     username: Optional[str] = None,
     password: Optional[str] = None,
     basic_auth_realm: str = "Authentication Required",
+    persistence_enabled: bool = True,
+    sessions_volume_size: str = "10Gi",
+    media_volume_size: str = "20Gi",
+    storage_class: str = "",
     depends_on: Optional[List[Component]] = None
 ) -> Component:
     """
@@ -72,6 +76,10 @@ def create_whatsapp_waha(
         username: Username for basic auth (required if basic_auth_enabled is True)
         password: Password for basic auth (required if basic_auth_enabled is True)
         basic_auth_realm: Realm for basic auth
+        persistence_enabled: Whether to enable persistent volumes for sessions and media
+        sessions_volume_size: Size of the sessions volume (e.g., "1Gi")
+        media_volume_size: Size of the media volume (e.g., "10Gi")
+        storage_class: Storage class to use for persistent volumes
         depends_on: List of dependencies for Fleet
         
     Returns:
@@ -146,6 +154,18 @@ def create_whatsapp_waha(
             "enabled": basic_auth_enabled,
             "secretName": basic_auth_secret,
             "realm": basic_auth_realm
+        },
+        "persistence": {
+            "sessions": {
+                "enabled": persistence_enabled,
+                "size": sessions_volume_size,
+                "storageClass": storage_class
+            },
+            "media": {
+                "enabled": persistence_enabled,
+                "size": media_volume_size,
+                "storageClass": storage_class
+            }
         }
     }
 

environments/sample_environment/secrets/config_env.yaml.example

@@ -79,7 +79,6 @@ components:
         region: us-east-1
         key: your-access-key
         key_secret: your-secret-key
-        repo_path: /path/to/backup
     # Optional S3 storage configuration for WhatsApp data
     s3_storage:
       bucket: your-whatsapp-data-bucket