chore: merge main

xiangyisss · xiangyisss · commit 89d6829df43f · 2025-05-21T13:08:44.000+02:00
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ deploy-nfs-chart:
         --debug \
         --timeout $(HELM_TIMEOUT) \
         --set persistence.enabled=true \
-        --set persistence.size=5Gi \
+        --set persistence.size=20Gi \
         --set storageClass.name=$(NFS_STORAGE_CLASS) \
         --set storageClass.allowVolumeExpansion=true \
         --set 'storageClass.mountOptions[0]=nfsvers=4.2' \
@@ -65,7 +65,7 @@ install-python-deps:
 test:
 	@echo "Running tests..."
 	@python3 test/test.py --hostname $(INGRESS_HOSTNAME) --ip $$(minikube ip)
-        
+
 # Lint Helm chart
 lint:
 	@helm lint charts/exivity
diff --git a/charts/exivity/templates/chronos/persistentvolumeclaim.yaml b/charts/exivity/templates/chronos/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.config.chronos }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
@@ -28,7 +28,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.chronos }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/edify/persistentvolumeclaim.yaml b/charts/exivity/templates/edify/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.edify }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/executor/persistentvolumeclaim.yaml b/charts/exivity/templates/executor/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.executor }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/glass/persistentvolumeclaim.yaml b/charts/exivity/templates/glass/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.glass }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/griffon/persistentvolumeclaim.yaml b/charts/exivity/templates/griffon/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.config.griffon }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
@@ -29,7 +29,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.griffon }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/horizon/persistentvolumeclaim.yaml b/charts/exivity/templates/horizon/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.horizon }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/persistentvolumeclaim.yaml b/charts/exivity/templates/persistentvolumeclaim.yaml
@@ -13,7 +13,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.config.etl }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
@@ -34,7 +34,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.data.exported }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
@@ -55,7 +55,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.data.extracted }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
@@ -76,7 +76,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.data.import }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
@@ -97,7 +97,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.data.report }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/pigeon/persistentvolumeclaim.yaml b/charts/exivity/templates/pigeon/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.pigeon }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
@@ -121,13 +121,17 @@ spec:
               mountPath: /exivity/home/system/report
             - name:      exivity-lock
               mountPath: /exivity/program
+          env:
+            - name: EXIVITY_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "exivity.fullname" $ -}}-licence-key
+                  key:                                     license.key
           envFrom:
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-jwt-secret
-            - secretRef:
-                name: {{ include "exivity.fullname" $ -}}-licence-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-smtp-secret
             - configMapRef:
diff --git a/charts/exivity/templates/proximity/api.persistentvolumeclaim.yaml b/charts/exivity/templates/proximity/api.persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.proximityApi }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/proximity/api.secret.yaml b/charts/exivity/templates/proximity/api.secret.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
   {{- if (and .Release.IsUpgrade (not .Values.licence)) }}
-  EXIVITY_LICENSE_KEY: {{ index (lookup "v1" "Secret" .Release.Namespace (printf "%s-licence-key" (include "exivity.fullname" $))).data "EXIVITY_LICENSE_KEY" }}
+  license.key: {{ index (lookup "v1" "Secret" .Release.Namespace (printf "%s-licence-key" (include "exivity.fullname" $))).data "license.key" }}
   {{- else }}
-  EXIVITY_LICENSE_KEY: {{ .Values.licence | required "A licence is required to be set on initial install" | b64enc }}
-  {{- end }}
+  license.key: {{ .Values.licence | required "A licence is required to be set on initial install" | b64enc }}
+  {{- end }}
diff --git a/charts/exivity/templates/proximity/cli.persistentvolumeclaim.yaml b/charts/exivity/templates/proximity/cli.persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.proximityCli }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/transcript/persistentvolumeclaim.yaml b/charts/exivity/templates/transcript/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.transcript }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/templates/use/persistentvolumeclaim.yaml b/charts/exivity/templates/use/persistentvolumeclaim.yaml
@@ -10,7 +10,7 @@ spec:
     - {{ .Values.storage.sharedVolumeAccessMode }}
   resources:
     requests:
-      storage: 1Gi
+      storage: {{ .Values.storage.pvcSizes.log.use }}
 {{- if .Values.storage.storageClass }}
   storageClassName: {{ .Values.storage.storageClass }}
 {{ end }}
diff --git a/charts/exivity/values.schema.json b/charts/exivity/values.schema.json
@@ -2999,6 +2999,45 @@
           }
         }
       ]
+    },
+    "pvcSizes": {
+      "type": "object",
+      "title": "The pvcSizes Schema",
+      "properties": {
+        "log": {
+          "type": "object",
+          "properties": {
+            "chronos": { "type": "string" },
+            "edify": { "type": "string" },
+            "executor": { "type": "string" },
+            "glass": { "type": "string" },
+            "griffon": { "type": "string" },
+            "horizon": { "type": "string" },
+            "pigeon": { "type": "string" },
+            "proximityApi": { "type": "string" },
+            "proximityCli": { "type": "string" },
+            "transcript": { "type": "string" },
+            "use": { "type": "string" }
+          }
+        },
+        "config": {
+          "type": "object",
+          "properties": {
+            "etl": { "type": "string" },
+            "griffon": { "type": "string" },
+            "chronos": { "type": "string" }
+          }
+        },
+        "data": {
+          "type": "object",
+          "properties": {
+            "exported": { "type": "string" },
+            "extracted": { "type": "string" },
+            "import": { "type": "string" },
+            "report": { "type": "string" }
+          }
+        }
+      }
     }
   },
   "examples": [
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
@@ -39,6 +39,45 @@ storage:
   helmResourcePolicyKeep: true # Ensures that storage resources are retained after a Helm release is deleted.
   sharedVolumeAccessMode: ReadWriteMany # Defines the access mode for shared volumes; 'ReadWriteMany' allows multiple nodes to read/write simultaneously.
 
+  # PVC storage sizes organized by type and component
+  # Specify the storage size for each PVC as a string (e.g., "1Gi", "500Mi", etc.).
+  # The sizes are grouped by their purpose (log, config, data) and component for better clarity.
+  #
+  # When the NFS server provisioner (https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner)
+  # is used as the storage provider, the configured PVC sizes will not be enforced.
+  # In this case, each PVC may consume up to the total available space on the NFS server, regardless of the size specified here.
+  # Therefore, the default values for PVC sizes should not be changed when NFS is used, to ensure compatibility with existing deployments and to avoid unexpected behavior.
+  #
+  # When an alternative CSI storage provider (such as Longhorn) is used, the specified PVC sizes will be enforced by the storage backend.
+  # In such cases, it is recommended that the PVC sizes for data and log volumes be increased according to the requirements of the production workload, as the default values may be insufficient.
+  pvcSizes:
+    # Log PVCs
+    log:
+      chronos: 1Gi
+      edify: 1Gi
+      executor: 1Gi
+      glass: 1Gi
+      griffon: 1Gi
+      horizon: 1Gi
+      pigeon: 1Gi
+      proximityApi: 1Gi
+      proximityCli: 1Gi
+      transcript: 1Gi
+      use: 1Gi
+
+    # Config PVCs
+    config:
+      etl: 1Gi
+      griffon: 1Gi
+      chronos: 1Gi
+
+    # Data PVCs
+    data:
+      exported: 1Gi
+      extracted: 1Gi
+      import: 1Gi
+      report: 1Gi
+
 smtpConfig:
   mail:
     driver: "smtp"           # Mail driver to use (e.g. smtp)
