fix: move jobDefinitions outside from env (#21)

MapColonies · Oct 21, 2024 · ca27efb · ca27efb
1 parent 53d4355
commit ca27efb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/helm/templates/_tplValues.tpl b/helm/templates/_tplValues.tpl
@@ -63,5 +63,5 @@ Custom definitions
 {{- end -}}
 
 {{- define "common.jobDefinitions.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.env.jobDefinitions .Values.global.jobDefinitions ) "context" . ) }}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.jobDefinitions .Values.global.jobDefinitions ) "context" . ) }}
 {{- end -}}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -103,23 +103,7 @@ metrics:
   prometheus:
     scrape: false
 
-env:
-  port: 8080
-  targetPort: 8080
-  protocol: TCP
-  logLevel: info
-  logPrettyPrintEnabled: false
-  logPinoCallerEnabled: false
-  responseCompressionEnabled: true
-  requestPayloadLimit: 1mb
-
-  httpRetry:
-    attempts: 5
-    delay: exponential
-    resetTimeout: 30000
-  disableHttpClientLogs: true
-
-  jobDefinitions:
+jobDefinitions:
     jobs:
      new:
        type: ""
@@ -142,6 +126,22 @@ env:
       heartBeat:
         intervalMs: 3000  
 
+env:
+  port: 8080
+  targetPort: 8080
+  protocol: TCP
+  logLevel: info
+  logPrettyPrintEnabled: false
+  logPinoCallerEnabled: false
+  responseCompressionEnabled: true
+  requestPayloadLimit: 1mb
+
+  httpRetry:
+    attempts: 5
+    delay: exponential
+    resetTimeout: 30000
+  disableHttpClientLogs: true
+
 resources:
   enabled: true
   value: