refactor(helm): Standardize template formatting across deployments:

tools/deployment/package-helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: "v2"
 name: "clp"
-version: "0.1.2-dev.11"
+version: "0.1.2-dev.14"
 description: "A Helm chart for CLP's (Compressed Log Processor) package deployment"
 type: "application"
 appVersion: "0.7.1-dev"

tools/deployment/package-helm/templates/configmap.yaml

@@ -7,7 +7,7 @@ metadata:
 data:
   clp-config.yaml: |
     archive_output:
-      compression_level: {{ .Values.clpConfig.archive_output.compression_level }}
+      compression_level: {{ .Values.clpConfig.archive_output.compression_level | int }}
       storage:
         directory: "/var/data/archives"
         type: "fs"
@@ -27,7 +27,7 @@ data:
       jobs_poll_delay: {{ .Values.clpConfig.compression_scheduler.jobs_poll_delay }}
       logging_level: {{ .Values.clpConfig.compression_scheduler.logging_level | quote }}
       max_concurrent_tasks_per_job: {{
-        .Values.clpConfig.compression_scheduler.max_concurrent_tasks_per_job }}
+        .Values.clpConfig.compression_scheduler.max_concurrent_tasks_per_job | int }}
     compression_worker:
       logging_level: {{ .Values.clpConfig.compression_worker.logging_level | quote }}
     data_directory: "/var/data"
@@ -39,7 +39,7 @@ data:
     database:
       auto_commit: false
       compress: true
-      host: {{ include "clp.fullname" . }}-database
+      host: "{{ include "clp.fullname" . }}-database"
       names:
         clp: {{ .Values.clpConfig.database.names.clp | quote }}
       port: 3306
@@ -53,30 +53,30 @@ data:
       query_engine: {{ .Values.clpConfig.package.query_engine | quote }}
       storage_engine: {{ .Values.clpConfig.package.storage_engine | quote }}
     query_scheduler:
-      host: {{ include "clp.fullname" . }}-query-scheduler
+      host: "{{ include "clp.fullname" . }}-query-scheduler"
       jobs_poll_delay: {{ .Values.clpConfig.query_scheduler.jobs_poll_delay }}
       logging_level: {{ .Values.clpConfig.query_scheduler.logging_level | quote }}
       num_archives_to_search_per_sub_job: {{
-        .Values.clpConfig.query_scheduler.num_archives_to_search_per_sub_job }}
+        .Values.clpConfig.query_scheduler.num_archives_to_search_per_sub_job | int }}
       port: 7000
     query_worker:
       logging_level: {{ .Values.clpConfig.query_worker.logging_level | quote }}
     queue:
-      host: {{ include "clp.fullname" . }}-queue
+      host: "{{ include "clp.fullname" . }}-queue"
       port: 5672
     redis:
-      compression_backend_database: {{ .Values.clpConfig.redis.compression_backend_database }}
-      host: {{ include "clp.fullname" . }}-redis
+      compression_backend_database: {{ .Values.clpConfig.redis.compression_backend_database | int }}
+      host: "{{ include "clp.fullname" . }}-redis"
       port: 6379
-      query_backend_database: {{ .Values.clpConfig.redis.query_backend_database }}
+      query_backend_database: {{ .Values.clpConfig.redis.query_backend_database | int }}
     reducer:
       base_port: 14009
-      host: {{ include "clp.fullname" . }}-reducer
+      host: "{{ include "clp.fullname" . }}-reducer"
       logging_level: {{ .Values.clpConfig.reducer.logging_level | quote }}
-      upsert_interval: {{ .Values.clpConfig.reducer.upsert_interval }}
+      upsert_interval: {{ .Values.clpConfig.reducer.upsert_interval | int }}
     results_cache:
       db_name: {{ .Values.clpConfig.results_cache.db_name | quote }}
-      host: {{ include "clp.fullname" . }}-results-cache
+      host: "{{ include "clp.fullname" . }}-results-cache"
       port: 27017
       {{- if .Values.clpConfig.results_cache.retention_period }}
       retention_period: {{ .Values.clpConfig.results_cache.retention_period | int }}
@@ -93,7 +93,7 @@ data:
     webui:
       host: "localhost"
       port: 4000
-      rate_limit: {{ .Values.clpConfig.webui.rate_limit }}
+      rate_limit: {{ .Values.clpConfig.webui.rate_limit | int }}
       results_metadata_collection_name: {{ .Values.clpConfig.webui.results_metadata_collection_name
         | quote }}
 
@@ -163,7 +163,7 @@ data:
       "StreamFilesS3Region": null,
       "StreamFilesS3PathPrefix": null,
       "StreamFilesS3Profile": null,
-      "ArchiveOutputCompressionLevel": {{ .Values.clpConfig.archive_output.compression_level }},
+      "ArchiveOutputCompressionLevel": {{ .Values.clpConfig.archive_output.compression_level | int }},
       "ArchiveOutputTargetArchiveSize":
         {{ .Values.clpConfig.archive_output.target_archive_size | int }},
       "ArchiveOutputTargetDictionariesSize":

tools/deployment/package-helm/templates/query-scheduler-deployment.yaml

@@ -73,20 +73,20 @@ spec:
           readinessProbe:
             {{- include "clp.readinessProbeTimings" . | nindent 12 }}
             tcpSocket: &query-scheduler-health-check
-              port: 7000
+              port: "query-scheduler"
           livenessProbe:
             {{- include "clp.livenessProbeTimings" . | nindent 12 }}
             tcpSocket: *query-scheduler-health-check
           volumeMounts:
-            - name: "config"
-              mountPath: "/etc/clp-config.yaml"
-              subPath: "clp-config.yaml"
-              readOnly: true
             - name: {{ include "clp.volumeName" (dict
                 "component_category" "query-scheduler"
                 "name" "logs"
               ) | quote }}
               mountPath: "/var/log/query_scheduler"
+            - name: "config"
+              mountPath: "/etc/clp-config.yaml"
+              subPath: "clp-config.yaml"
+              readOnly: true
           command: [
             "python3", "-u",
             "-m", "job_orchestration.scheduler.query.query_scheduler",

tools/deployment/package-helm/templates/reducer-deployment.yaml

@@ -50,15 +50,15 @@ spec:
             - name: "PYTHONPATH"
               value: "/opt/clp/lib/python3/site-packages"
           volumeMounts:
-            - name: "config"
-              mountPath: "/etc/clp-config.yaml"
-              subPath: "clp-config.yaml"
-              readOnly: true
             - name: {{ include "clp.volumeName" (dict
                 "component_category" "reducer"
                 "name" "logs"
               ) | quote }}
               mountPath: "/var/log/reducer"
+            - name: "config"
+              mountPath: "/etc/clp-config.yaml"
+              subPath: "clp-config.yaml"
+              readOnly: true
           command: [
             "python3", "-u",
             "-m", "job_orchestration.reducer.reducer",

tools/deployment/package-helm/templates/webui-deployment.yaml

@@ -84,7 +84,7 @@ spec:
           readinessProbe:
             {{- include "clp.readinessProbeTimings" . | nindent 12 }}
             tcpSocket: &webui-health-check
-              port: 4000
+              port: "webui"
           livenessProbe:
             {{- include "clp.livenessProbeTimings" . | nindent 12 }}
             tcpSocket: *webui-health-check