Push helm update mef-sog-uc1-wl

glaciation-heu · Jul 18, 2024 · db10fa0 · db10fa0
1 parent 1581a3d
commit db10fa0
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 33 deletions.
diff --git a/charts/uc1-workload/Chart.yaml b/charts/uc1-workload/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0.0"
 description: A Helm chart for UC1 Workload
 name: mef-sog-uc1-wl
-version: 1.0.4
+version: 1.0.5
diff --git a/charts/uc1-workload/templates/deployment.yaml b/charts/uc1-workload/templates/deployment.yaml
@@ -18,36 +18,36 @@ spec:
           image: {{ .Values.scheduledClient.image }}
           resources:
             requests:
-              memory: '2Gi'
-              cpu: '1'
+              memory: '{{ .Values.scheduledClient.resources.requests.memory }}'
+              cpu: '{{ .Values.scheduledClient.resources.requests.cpu }}'
             limits:
-              memory: '2Gi'
-              cpu: '1'
+              memory: '{{ .Values.scheduledClient.resources.limits.memory }}'
+              cpu: '{{ .Values.scheduledClient.resources.limits.cpu }}'
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
               containerPort: 8080
               protocol: TCP
           env:
             - name: SPRING_KAFKA_ENABLED
-              value: 'true'
+              value: '{{ .Values.scheduledClient.kafkaEnabled }}'
             - name: SPRING_KAFKA_PRODUCER_BOOTSTRAP-SERVERS
               value: {{ .Values.kafka.bootstrapServers }}
             - name: SPRING_KAFKA_PRODUCER_TOPIC
               value: {{ .Values.kafka.topic }}
             - name: SPRING_SERVLET_MULTIPART_MAX-FILE-SIZE
-              value: '500MB'
+              value: '{{ .Values.scheduledClient.multipartMaxFileSize }}'
             - name: PATH_TIMESTAMPS
-              value: '/MEF/file/timbrature'
+              value: '{{ .Values.volume.path.timbrature }}'
             - name: PATH_TIMESTAMPS_TO-BE-ELABORATED
-              value: '/MEF/file/to-be-elaborated'
+              value: '{{ .Values.volume.path.toBeElaborated }}'
             - name: FIXEDRATE_WATCHING_FOLDER_SECONDS
-              value: '1'
+              value: '{{ .Values.scheduledClient.watchingFolderSeconds }}'
             - name: TZ
-              value: 'Europe/Rome'
+              value: '{{ .Values.timeZone }}'
           volumeMounts:
             - name: data-mef
-              mountPath: /MEF/
+              mountPath: '{{ .Values.volume.mountPath }}'
       volumes:
         - name: data-mef
           persistentVolumeClaim:
@@ -74,46 +74,46 @@ spec:
           image: {{ .Values.elaborationTimbMs.image }}
           resources:
             requests:
-              memory: '2Gi'
-              cpu: '1'
+              memory: '{{ .Values.elaborationTimbMs.resources.requests.memory }}'
+              cpu: '{{ .Values.elaborationTimbMs.resources.requests.cpu }}'
             limits:
-              memory: '2Gi'
-              cpu: '1'
+              memory: '{{ .Values.elaborationTimbMs.resources.limits.memory }}'
+              cpu: '{{ .Values.elaborationTimbMs.resources.limits.cpu }}'
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
           env:
             - name: H2_CONSOLE
-              value: 'false'
+              value: '{{ .Values.elaborationTimbMs.h2Console }}'
             - name: LOG_LEVEL_JPA
-              value: 'false'
+              value: '{{ .Values.elaborationTimbMs.logLevelJpa }}'
             - name: SPRING_KAFKA_CONSUMER_BOOTSTRAP-SERVERS
               value: {{ .Values.kafka.bootstrapServers }}
             - name: SPRING_KAFKA_LISTENER_TOPIC
               value: {{ .Values.kafka.topic }}
             - name: PATH_TIMESTAMPS_ELABORATED
-              value: '/MEF/file/elaborated'
+              value: '{{ .Values.volume.path.elaborated }}'
             - name: PATH_TIMESTAMPS_ACQUIRED
-              value: '/MEF/file/completed'
+              value: '{{ .Values.volume.path.acquired }}'
             - name: PATH_TIMESTAMPS_DISCARDED
-              value: '/MEF/file/discarded'
+              value: '{{ .Values.volume.path.discarded }}'
             - name: PATH_METRICS
-              value: '/MEF/metrics'
+              value: '{{ .Values.volume.path.metrics }}'
+            - name: SPRING_KAFKA_CONSUMER_GROUP-ID
+              value: '{{ .Values.kafka.consumerGroup }}'
             - name: SPRING_KAFKA_LISTENER_PARTITIONS
-              value: '12'
-#              value: '{{ .Values.kafka.listenerPartitions }}'
+              value: '{{ .Values.kafka.listener.partitions }}'
             - name: SPRING_KAFKA_LISTENER_CONCURRENCY
-              value: '12'
-#              value: '{{ .Values.kafka.listenerConcurrency }}'
+              value: '{{ .Values.kafka.listener.concurrency }}'
             - name: SPRING_KAFKA_CONSUMER_MAX-POLL-RECORDS
-              value: '1'
+              value: '{{ .Values.kafka.consumer.maxPollRecords }}'
+            - name: SPRING_KAFKA_CONSUMER_MAX-POLL-INTERVAL-MS
+              value: '{{ .Values.kafka.consumer.maxPollIntervalMs }}'
             - name: TZ
-              value: 'Europe/Rome'
-#            - name: SPRING_KAFKA_CONSUMER_MAX-POLL-INTERVAL-MS
-#              value: '30000'
+              value: '{{ .Values.timeZone }}'
           volumeMounts:
             - name: data-mef
-              mountPath: /MEF/
+              mountPath: '{{ .Values.volume.mountPath }}'
       volumes:
         - name: data-mef
           persistentVolumeClaim:

diff --git a/charts/uc1-workload/values.yaml b/charts/uc1-workload/values.yaml
@@ -1,4 +1,5 @@
 namespace: mef-sog-uc1-wl
+timeZone: 'Europe/Rome'
 
 persistentVolumeClaim:
   storage: 5Gi
@@ -8,16 +9,49 @@ kafka:
   bootstrapServers: 'kafka.kafka.svc.cluster.local:9092'
   consumerGroup: 'mef-sog-uc1-wl'
   topic: test
-  listenerPartitions: 12
-  listenerConcurrency: 12
+  listener:
+    partitions: 12
+    concurrency: 12
+  consumer:
+    maxPollRecords: 1
+    maxPollIntervalMs: 300000
 
 scheduledClient:
+  kafkaEnabled: 'true'
   image: 'ghcr.io/glaciation-heu/mef-sog-uc1/scheduled-client:1.1.0'
+  multipartMaxFileSize: '500MB'
+  watchingFolderSeconds: 1
   service:
     type: NodePort
     port: 8080
     targetPort: http
     nodePort: 30001
+  resources:
+    requests:
+      memory: '2Gi'
+      cpu: '1'
+    limits:
+      memory: '2Gi'
+      cpu: '1'
 
 elaborationTimbMs:
   image: 'ghcr.io/glaciation-heu/mef-sog-uc1/elaboration-timb-ms:1.0.0'
+  logLevelJpa: false
+  h2Console: false
+  resources:
+    requests:
+      memory: '2Gi'
+      cpu: '1'
+    limits:
+      memory: '2Gi'
+      cpu: '1'
+
+volume:
+  mountPath: '/MEF/'
+  path:
+    timbrature: '/MEF/file/timbrature'
+    toBeElaborated: '/MEF/file/to-be-elaborated'
+    elaborated: '/MEF/file/elaborated'
+    acquired: '/MEF/file/completed'
+    discarded: '/MEF/file/discarded'
+    metrics: '/MEF/metrics'