CDCgov · ndduc01 · May 8, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025
diff --git a/charts/data-processing-service/templates/deployment.yaml b/charts/data-processing-service/templates/deployment.yaml
@@ -20,6 +20,15 @@ spec:
       labels:
         {{- include "data-processing-service.selectorLabels" . | nindent 8 }}
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/name: {{ include "data-processing-service.name" . }}
+                topologyKey: "kubernetes.io/hostname"
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -91,6 +100,24 @@ spec:
               value: {{ .Values.features.modernizedMatching.enabled | default false | quote }}
             - name: MODERNIZED_MATCHING_URL
               value: {{ .Values.features.modernizedMatching.url | default "" }}
+            - name: THREAD_FLAG
+              value: {{ .Values.thread.enabled  | quote}}
+            - name: THREAD_POOL_SIZE
+              value: "{{ .Values.thread.size }}"
+            - name: THREAD_BATCH_SIZE
+              value: "{{ .Values.thread.batchSize }}"
+            - name: PROCESSOR_DELAY
+              value: "{{ .Values.thread.processorDelay }}"
+            - name: HIKARI_POOL_SIZE
+              value: "{{ .Values.hikari.poolSize }}"
+            - name: HIKARI_MINIMUM_IDLE
+              value: "{{ .Values.hikari.minIdle }}"
+            - name: HIKARI_CON_TIMEOUT
+              value: "{{ .Values.hikari.conTimeout }}"
+            - name: HIKARI_MAX_LIFETIME
+              value: "{{ .Values.hikari.maxLifeTime }}"
+            - name: LEAK_DETECTION_THRESHOLD
+              value: "{{ .Values.hikari.leakDetectThresHold }}"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/data-processing-service/values-dts1.yaml b/charts/data-processing-service/values-dts1.yaml
@@ -92,8 +92,21 @@ probes:
 
 kafkaThread: "1"
 
+thread:
+  enabled: false
+  size: "5"
+  batchSize: "50"
+  processorDelay: "30000"
+
+
 features:
   modernizedMatching:
     enabled: false
     url: ""
 
+hikari:
+  poolSize: "20"
+  minIdle: "5"
+  conTimeout: "30000"
+  maxLifeTime: "5000"
+  leakDetectThresHold: "10000"
diff --git a/charts/data-processing-service/values-feature.yaml b/charts/data-processing-service/values-feature.yaml
@@ -5,7 +5,7 @@ env: "feature"
 image:
   repository: ""
   pullPolicy: IfNotPresent
-  tag: 1.0.1-SNAPSHOT.3998b71
+  tag: 1.0.1-SNAPSHOT.28f097e
 
 imagePullSecrets: []
 nameOverride: ""
@@ -40,20 +40,24 @@ ingress:
 
 # Kubernetes resource limits
 resources:
-  limits:
-    memory: "800Mi"  
-    cpu: "1000m"      
   requests:
-    memory: "600Mi"  
-    cpu: "500m"    
+    memory: "1Gi"  
+    cpu: "800m"
+  limits:
+    memory: "1Gi"  
+    cpu: "1500m"      
+  # requests:
+  #   memory: "512Mi"  
+  #   cpu: "250m"
 
 autoscaling:
   enabled: false
   minReplicas: 1
   maxReplicas: 100
   targetCPUUtilizationPercentage: 80
 
-nodeSelector: {}
+nodeSelector: 
+  nodegroup: high-cpu
 
 tolerations: []
 
@@ -98,3 +102,17 @@ features:
     enabled: false
     url: ""
 
+
+thread:
+  enabled: true
+  size: "5"
+  batchSize: "50"
+  processorDelay: "10000"
+
+
+hikari:
+  poolSize: "20"
+  minIdle: "5"
+  conTimeout: "30000"
+  maxLifeTime: "5000"
+  leakDetectThresHold: "10000"
diff --git a/charts/data-processing-service/values-int1.yaml b/charts/data-processing-service/values-int1.yaml
@@ -97,3 +97,10 @@ features:
   modernizedMatching:
     enabled: true
     url: "http://deduplication-api.default.svc.cluster.local:8083/nbs/api/deduplication/"
+
+hikari:
+  poolSize: "20"
+  minIdle: "5"
+  conTimeout: "30000"
+  maxLifeTime: "5000"
+  leakDetectThresHold: "10000"
diff --git a/charts/data-processing-service/values-test2.yaml b/charts/data-processing-service/values-test2.yaml
@@ -93,6 +93,13 @@ probes:
 
 kafkaThread: "1"
 
+thread:
+  enabled: false
+  size: "5"
+  batchSize: "50"
+  processorDelay: "30000"
+
+
 features:
   modernizedMatching:
     enabled: false

diff --git a/charts/data-processing-service/values.yaml b/charts/data-processing-service/values.yaml
@@ -97,3 +97,18 @@ features:
   modernizedMatching:
     enabled: false
     url: ""
+
+thread:
+  enabled: false
+  size: "5"
+  batchSize: "50"
+  processorDelay: "30000"
+
+
+hikari:
+  poolSize: "20"
+  minIdle: "5"
+  conTimeout: "30000"
+  maxLifeTime: "5000"
+  leakDetectThresHold: "10000"
+
diff --git a/charts/dataingestion-service/values-feature.yaml b/charts/dataingestion-service/values-feature.yaml
@@ -5,7 +5,7 @@ env: "feature"
 image:
   repository: ""
   pullPolicy: IfNotPresent
-  tag: 1.0.1-SNAPSHOT.3998b71
+  tag: 1.0.1-SNAPSHOT-05212025-DI-1.f5a77f8
 
 imagePullSecrets: []
 nameOverride: ""
@@ -76,7 +76,13 @@ compare:
   port: 8085
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/elasticsearch-efs/values-feature.yaml b/charts/elasticsearch-efs/values-feature.yaml
@@ -33,9 +33,13 @@ ingress:
   annotations: {}
   tls: []
 
-resources: 
+resources:
   limits:
-    memory: "3Gi"
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/investigation-reporting-service/values-feature.yaml b/charts/investigation-reporting-service/values-feature.yaml
@@ -40,7 +40,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/kafka-connect-sink/values-feature.yaml b/charts/kafka-connect-sink/values-feature.yaml
@@ -81,7 +81,13 @@ customEnv: { }
 SQL_SERVER_CONNECTOR_CONFIG: /etc/sqlServerConnector.json
 JDBC_CONNECTOR_CONFIG: /etc/jdbcConnector.sh
 
-resources: { }
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following

diff --git a/charts/ldfdata-reporting-service/values-feature.yaml b/charts/ldfdata-reporting-service/values-feature.yaml
@@ -40,7 +40,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/liquibase/values-feature.yaml b/charts/liquibase/values-feature.yaml
@@ -41,7 +41,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/modernization-api/values-feature.yaml b/charts/modernization-api/values-feature.yaml
@@ -63,7 +63,11 @@ nbsExternalName: app-classic.feature.nbspreview.com
 
 resources:
   limits:
-    memory: "2Gi"
+    memory: "1Gi"
+    cpu: "500m"
+  requests:
+    memory: "512Mi"
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/nbs-gateway/values-feature.yaml b/charts/nbs-gateway/values-feature.yaml
@@ -35,8 +35,13 @@ pageBuilder:
         enabled: "true"
       edit:
         enabled: "true"
-
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 nbsExternalName: app-classic.feature.nbspreview.com
 

diff --git a/charts/nifi-efs/values-feature.yaml b/charts/nifi-efs/values-feature.yaml
@@ -48,9 +48,13 @@ ingress:
             port:
               number: 8443
 
-resources: 
+resources:
   limits:
-    memory: "3Gi"
+    memory: "2Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "1Gi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/nnd-service/values-feature.yaml b/charts/nnd-service/values-feature.yaml
@@ -30,8 +30,13 @@ service:
   port: 8081
   httpsPort: 443
 
-# Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/observation-reporting-service/values-feature.yaml b/charts/observation-reporting-service/values-feature.yaml
@@ -40,7 +40,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/organization-reporting-service/values-feature.yaml b/charts/organization-reporting-service/values-feature.yaml
@@ -40,7 +40,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/page-builder-api/values-feature.yaml b/charts/page-builder-api/values-feature.yaml
@@ -60,7 +60,11 @@ istioGatewayIngress:
 # Kubernetes resource limits
 resources:
   limits:
-    memory: "2Gi"
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/person-reporting-service/values-feature.yaml b/charts/person-reporting-service/values-feature.yaml
@@ -40,7 +40,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false

diff --git a/charts/post-processing-reporting-service/values-feature.yaml b/charts/post-processing-reporting-service/values-feature.yaml
@@ -43,7 +43,13 @@ ingress:
     - app.feature.nbspreview.com
 
 # Kubernetes resource limits
-resources: {}
+resources:
+  limits:
+    memory: "1Gi"  
+    cpu: "500m"      
+  requests:
+    memory: "512Mi"  
+    cpu: "250m"
 
 autoscaling:
   enabled: false