Better handling of pool_id

Author: noggi

charts/datahub-executor-worker/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: datahub-executor-worker
 description: A Helm chart for datahub-executor-worker
 type: application
-version: 0.0.16
+version: 0.0.17
 appVersion: 0.3.8.2
 maintainers:
   - name: DataHub

charts/datahub-executor-worker/templates/workload.yaml

@@ -134,8 +134,12 @@ spec:
                   key: {{ ((.Values.global.datahub).gms).secretKey }}
             - name: DATAHUB_EXECUTOR_MODE
               value: "worker"
+{{- if hasKey .Values.global.datahub.executor "pool_id" }}
             - name: DATAHUB_EXECUTOR_POOL_ID
-              value: {{ .Values.global.datahub.executor.pool_id | quote }}
+{{- else }}
+            - name: DATAHUB_EXECUTOR_WORKER_ID
+{{- end }}
+              value: {{ (.Values.global.datahub.executor).pool_id | default (.Values.global.datahub.executor).worker_id  | quote }}
             - name: DATAHUB_EXECUTOR_INGESTION_MAX_WORKERS
               value: {{ .Values.global.datahub.executor.ingestions.max_workers | quote }}
             - name: DATAHUB_EXECUTOR_INGESTION_SIGNAL_POLL_INTERVAL

charts/datahub-executor-worker/values.yaml

@@ -5,6 +5,7 @@ global:
       secretKey: datahub-access-token-secret-key
       url: https://datahub.acryl.io/gms
     executor:
+      #worker_id: "DEPRECATED: use pool_id instead"
       pool_id: "remote"
       ingestions:
         max_workers: 4